[Mesa-dev] [PATCH 6/9] mesa: remove unused DD_TRI_TWOSTENCIL
Brian Paul
brianp at vmware.com
Sun Mar 11 17:34:43 PDT 2012
---
src/mesa/main/debug.c | 3 +--
src/mesa/main/enable.c | 2 --
src/mesa/main/mtypes.h | 1 -
src/mesa/main/state.c | 6 ------
4 files changed, 1 insertions(+), 11 deletions(-)
diff --git a/src/mesa/main/debug.c b/src/mesa/main/debug.c
index 71d7f1a..cfa2f93 100644
--- 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 2f0216b..f6d37fe 100644
--- 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 b04a829..3dcfc94 100644
--- 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 0334f6f..8924860 100644
--- 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
--
1.7.3.4
More information about the mesa-dev
mailing list