summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Whitwell <keith@tungstengraphics.com>2008-04-25 16:16:06 +0100
committerKeith Whitwell <keith@tungstengraphics.com>2008-04-25 16:16:14 +0100
commit1aedbf9efe4d1cf45be3c27fc3a0eb4a69a1b1b9 (patch)
tree4e05ccb2d59ebdcb2c139efe203e34e2c0380160
parent3c0dc8242b64518d5635263ba65b39afa919dd86 (diff)
draw: emit extra flags whenever pipeline is active
The assert was in fact over-sensitive, but emitting the extra flags is pretty trivial & we may as well just do it whenever we know the pipeline is running.
-rw-r--r--src/gallium/auxiliary/draw/draw_pt_varray.c9
-rw-r--r--src/gallium/auxiliary/draw/draw_pt_vcache.c6
2 files changed, 5 insertions, 10 deletions
diff --git a/src/gallium/auxiliary/draw/draw_pt_varray.c b/src/gallium/auxiliary/draw/draw_pt_varray.c
index 022098a314..c85d8ded50 100644
--- a/src/gallium/auxiliary/draw/draw_pt_varray.c
+++ b/src/gallium/auxiliary/draw/draw_pt_varray.c
@@ -202,13 +202,12 @@ static void varray_prepare(struct draw_pt_front_end *frontend,
struct varray_frontend *varray = (struct varray_frontend *)frontend;
const struct pipe_rasterizer_state *rasterizer = varray->draw->rasterizer;
- if (rasterizer->fill_cw != PIPE_POLYGON_MODE_FILL ||
- rasterizer->fill_ccw != PIPE_POLYGON_MODE_FILL ||
- rasterizer->line_stipple_enable)
+ if (opt & PT_PIPELINE)
{
- assert(opt & PT_PIPELINE);
varray->base.run = varray_run_extras;
- } else {
+ }
+ else
+ {
varray->base.run = varray_run;
}
diff --git a/src/gallium/auxiliary/draw/draw_pt_vcache.c b/src/gallium/auxiliary/draw/draw_pt_vcache.c
index b3133359e0..2f9775814f 100644
--- a/src/gallium/auxiliary/draw/draw_pt_vcache.c
+++ b/src/gallium/auxiliary/draw/draw_pt_vcache.c
@@ -227,12 +227,8 @@ static void vcache_prepare( struct draw_pt_front_end *frontend,
struct vcache_frontend *vcache = (struct vcache_frontend *)frontend;
const struct pipe_rasterizer_state *rasterizer = vcache->draw->rasterizer;
-
- if (rasterizer->fill_cw != PIPE_POLYGON_MODE_FILL ||
- rasterizer->fill_ccw != PIPE_POLYGON_MODE_FILL ||
- rasterizer->line_stipple_enable)
+ if (opt & PT_PIPELINE)
{
- assert(opt & PT_PIPELINE);
vcache->base.run = vcache_run_extras;
}
else