[965] Clean up whitespace and dead code from do_unfilled change.
authorEric Anholt <eric@anholt.net>
Tue, 25 Mar 2008 17:22:50 +0000 (10:22 -0700)
committerEric Anholt <eric@anholt.net>
Wed, 26 Mar 2008 19:59:17 +0000 (12:59 -0700)
src/mesa/drivers/dri/i965/brw_clip.c

index 24b0288f887500e3828bf0400b344e067cd5d191..ce34da165cbf076c8e06c8a0cccd9aa4b8b502b7 100644 (file)
@@ -168,12 +168,10 @@ static void upload_clip_prog( struct brw_context *brw )
               offset_front = 0;
               break;
            case GL_LINE:
-              key.do_unfilled = 1;
               fill_front = CLIP_LINE;
               offset_front = brw->attribs.Polygon->OffsetLine;
               break;
            case GL_POINT:
-              key.do_unfilled = 1;
               fill_front = CLIP_POINT;
               offset_front = brw->attribs.Polygon->OffsetPoint;
               break;
@@ -188,26 +186,23 @@ static void upload_clip_prog( struct brw_context *brw )
               offset_back = 0;
               break;
            case GL_LINE:
-              key.do_unfilled = 1;
               fill_back = CLIP_LINE;
               offset_back = brw->attribs.Polygon->OffsetLine;
               break;
            case GL_POINT:
-              key.do_unfilled = 1;
               fill_back = CLIP_POINT;
               offset_back = brw->attribs.Polygon->OffsetPoint;
               break;
            }
         }
 
-    if (brw->attribs.Polygon->BackMode != GL_FILL ||
-        brw->attribs.Polygon->FrontMode != GL_FILL)
-        key.do_unfilled = 1;
+        if (brw->attribs.Polygon->BackMode != GL_FILL ||
+            brw->attribs.Polygon->FrontMode != GL_FILL) {
+           key.do_unfilled = 1;
 
-        /* Most cases the fixed function units will handle.  Cases where
-         * one or more polygon faces are unfilled will require help:
-         */
-        if (key.do_unfilled) {
+           /* Most cases the fixed function units will handle.  Cases where
+            * one or more polygon faces are unfilled will require help:
+            */
            key.clip_mode = BRW_CLIPMODE_CLIP_NON_REJECTED;
 
            if (offset_back || offset_front) {