draw: fix typo checking for unfilled polygons

[mesa.git] / src / gallium / auxiliary / draw / draw_pipe_cull.c

diff --git a/src/gallium/auxiliary/draw/draw_pipe_cull.c b/src/gallium/auxiliary/draw/draw_pipe_cull.c
index dc66c65a56c2ab78bb65005df1492bf761b79637..bf84ce30ed1cf3aabeaf45b497a8909cea7525e5 100644 (file)
--- a/src/gallium/auxiliary/draw/draw_pipe_cull.c
+++ b/src/gallium/auxiliary/draw/draw_pipe_cull.c
@@ -40,7 +40,8 @@
 
 struct cull_stage {
    struct draw_stage stage;
-   unsigned winding;  /**< which winding(s) to cull (one of PIPE_WINDING_x) */
+   unsigned cull_face;  /**< which face(s) to cull (one of PIPE_FACE_x) */
+   unsigned front_ccw;
 };
 
 
@@ -73,9 +74,12 @@ static void cull_tri( struct draw_stage *stage,
       /* if det < 0 then Z points toward the camera and the triangle is 
        * counter-clockwise winding.
        */
-      unsigned winding = (header->det < 0) ? PIPE_WINDING_CCW : PIPE_WINDING_CW;
+      unsigned ccw = (header->det < 0);
+      unsigned face = ((ccw == cull_stage(stage)->front_ccw) ?
+                       PIPE_FACE_FRONT :
+                       PIPE_FACE_BACK);
 
-      if ((winding & cull_stage(stage)->winding) == 0) {
+      if ((face & cull_stage(stage)->cull_face) == 0) {
          /* triangle is not culled, pass to next stage */
         stage->next->tri( stage->next, header );
       }
@@ -88,7 +92,8 @@ static void cull_first_tri( struct draw_stage *stage,
 {
    struct cull_stage *cull = cull_stage(stage);
 
-   cull->winding = stage->draw->rasterizer->cull_mode;
+   cull->cull_face = stage->draw->rasterizer->cull_face;
+   cull->front_ccw = stage->draw->rasterizer->front_ccw;
 
    stage->tri = cull_tri;
    stage->tri( stage, header );