diff options
| author | Brian Paul <brianp@vmware.com> | 2013-04-16 19:06:22 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2013-04-17 11:59:39 -0600 |
| commit | 55b2033f0a4896a7930469711a052083c15edd3f (patch) | |
| tree | 9442f593f4252c6d9791d8ea18eebcb73d1a5f76 /src/mesa/main | |
| parent | c1c5d689c5a8cc3ae72b81391be30f5296cc2993 (diff) | |
mesa: remove DD_SEPARATE_SPECULAR flag
Reviewed-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/debug.c | 3 | ||||
| -rw-r--r-- | src/mesa/main/mtypes.h | 1 | ||||
| -rw-r--r-- | src/mesa/main/state.c | 15 |
3 files changed, 1 insertions, 18 deletions
diff --git a/src/mesa/main/debug.c b/src/mesa/main/debug.c index 4f3d3f64a38..7dd108c25d5 100644 --- a/src/mesa/main/debug.c +++ b/src/mesa/main/debug.c @@ -100,10 +100,9 @@ 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\n", + "%s: (0x%x) %s%s%s%s%s%s%s%s\n", name, flags, - (flags & DD_SEPARATE_SPECULAR) ? "separate-specular, " : "", (flags & DD_TRI_LIGHT_TWOSIDE) ? "tri-light-twoside, " : "", (flags & DD_TRI_UNFILLED) ? "tri-unfilled, " : "", (flags & DD_TRI_STIPPLE) ? "tri-stipple, " : "", diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index c97f90709dc..6aa3ab15cb7 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -3167,7 +3167,6 @@ struct gl_matrix_stack * Set in the __struct gl_contextRec::_TriangleCaps bitfield. */ /*@{*/ -#define DD_SEPARATE_SPECULAR (1 << 0) #define DD_TRI_LIGHT_TWOSIDE (1 << 1) #define DD_TRI_UNFILLED (1 << 2) #define DD_TRI_SMOOTH (1 << 3) diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c index f33bf08efea..e5e98dc5ee5 100644 --- a/src/mesa/main/state.c +++ b/src/mesa/main/state.c @@ -54,16 +54,6 @@ #include "blend.h" -static void -update_separate_specular(struct gl_context *ctx) -{ - if (_mesa_need_secondary_color(ctx)) - ctx->_TriangleCaps |= DD_SEPARATE_SPECULAR; - else - ctx->_TriangleCaps &= ~DD_SEPARATE_SPECULAR; -} - - /** * Update the following fields: * ctx->VertexProgram._Enabled @@ -392,8 +382,6 @@ update_tricaps(struct gl_context *ctx, GLbitfield new_state) */ if (ctx->Light.Enabled && ctx->Light.Model.TwoSide) ctx->_TriangleCaps |= DD_TRI_LIGHT_TWOSIDE; - if (_mesa_need_secondary_color(ctx)) - ctx->_TriangleCaps |= DD_SEPARATE_SPECULAR; } #endif @@ -471,9 +459,6 @@ _mesa_update_state_locked( struct gl_context *ctx ) if (new_state & _NEW_PIXEL) _mesa_update_pixel( ctx, new_state ); - if (new_state & _MESA_NEW_SEPARATE_SPECULAR) - update_separate_specular( ctx ); - if (new_state & (_NEW_BUFFERS | _NEW_VIEWPORT)) update_viewport_matrix(ctx); |