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.

diff --git a/src/gallium/auxiliary/draw/draw_pt_varray.c b/src/gallium/auxiliary/draw/draw_pt_varray.c
index 022098a314f9a8a6ba1dd0e61379fbe0e1451332..c85d8ded50cf4cea47e2ca15d74e04ce6fec6215 100644 (file)
--- 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 b3133359e06a4325a0977679b7fa07f64e12a399..2f9775814f53dfdaa502099ec9c9f7a0b5c7218f 100644 (file)
--- 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