mesa: remove unused DD_TRI_TWOSTENCIL

Reviewed-by: José Fonseca <jfonseca@vmware.com>
Reviewed-by: Eric Anholt <eric@anholt.net>

diff --git a/src/mesa/main/debug.c b/src/mesa/main/debug.c
index 71d7f1ac640acde6fc82d8b737ada9891cc9e2ec..cfa2f933d96c214eea8d815d566537bdaf04d71c 100644 (file)
--- a/src/mesa/main/debug.c
+++ b/src/mesa/main/debug.c
@@ -100,13 +100,12 @@ void
 _mesa_print_tri_caps( const char *name, GLuint flags )
 {
    _mesa_debug(NULL,
-          "%s: (0x%x) %s%s%s%s%s%s%s%s%s%s%s%s%s\n",
+          "%s: (0x%x) %s%s%s%s%s%s%s%s%s%s%s%s\n",
           name,
           flags,
           (flags & DD_FLATSHADE)           ? "flat-shade, " : "",
           (flags & DD_SEPARATE_SPECULAR)   ? "separate-specular, " : "",
           (flags & DD_TRI_LIGHT_TWOSIDE)   ? "tri-light-twoside, " : "",
-          (flags & DD_TRI_TWOSTENCIL)      ? "tri-twostencil, " : "",
           (flags & DD_TRI_UNFILLED)        ? "tri-unfilled, " : "",
           (flags & DD_TRI_STIPPLE)         ? "tri-stipple, " : "",
           (flags & DD_TRI_OFFSET)          ? "tri-offset, " : "",

diff --git a/src/mesa/main/enable.c b/src/mesa/main/enable.c
index 2f0216b018488ae251f2a7546d0b9201c4891b20..f6d37feae9e43d6439a174fe6dff489bc2c2980f 100644 (file)
--- a/src/mesa/main/enable.c
+++ b/src/mesa/main/enable.c
@@ -822,10 +822,8 @@ _mesa_set_enable(struct gl_context *ctx, GLenum cap, GLboolean state)
          ctx->Stencil.TestTwoSide = state;
          if (state) {
             ctx->Stencil._BackFace = 2;
-            ctx->_TriangleCaps |= DD_TRI_TWOSTENCIL;
          } else {
             ctx->Stencil._BackFace = 1;
-            ctx->_TriangleCaps &= ~DD_TRI_TWOSTENCIL;
          }
          break;
 

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index b04a829d1940c653e9d7a0fe44606b1f7a2eecc1..3dcfc94fc7272594a45dec98846258a0d7b8c6ba 100644 (file)
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -3083,7 +3083,6 @@ struct gl_matrix_stack
 #define DD_LINE_STIPPLE             0x200
 #define DD_POINT_SMOOTH             0x400
 #define DD_POINT_ATTEN              0x800
-#define DD_TRI_TWOSTENCIL           0x1000
 /*@}*/
 
 

diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index 0334f6f5aae2bd41d62613099df83bdf7f8d9e0f..89248600177fc4e1949c0a1187dbd691a3d3ab7a 100644 (file)
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -449,12 +449,6 @@ update_tricaps(struct gl_context *ctx, GLbitfield new_state)
       ctx->_TriangleCaps |= DD_FLATSHADE;
    if (_mesa_need_secondary_color(ctx))
       ctx->_TriangleCaps |= DD_SEPARATE_SPECULAR;
-
-   /*
-    * Stencil
-    */
-   if (ctx->Stencil._TestTwoSide)
-      ctx->_TriangleCaps |= DD_TRI_TWOSTENCIL;
 }
 #endif