diff options
| author | Brian Paul <brianp@vmware.com> | 2012-03-11 18:31:32 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2012-03-12 11:40:43 -0600 |
| commit | d710bbcd7458f6d48cf86586865f91e47c30feb2 (patch) | |
| tree | 989ed5d6ca504cf2aef796de485287c6371fa191 | |
| parent | d269b1f3107ed569663b96bfd6832c177df0050e (diff) | |
mesa: remove unused DD_FLATSHADE
Reviewed-by: José Fonseca <jfonseca@vmware.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
| -rw-r--r-- | src/mesa/main/debug.c | 3 | ||||
| -rw-r--r-- | src/mesa/main/light.c | 4 | ||||
| -rw-r--r-- | src/mesa/main/mtypes.h | 1 | ||||
| -rw-r--r-- | src/mesa/main/state.c | 2 |
4 files changed, 1 insertions, 9 deletions
diff --git a/src/mesa/main/debug.c b/src/mesa/main/debug.c index cfa2f933d9..facba91a0f 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%s%s%s\n", + "%s: (0x%x) %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_UNFILLED) ? "tri-unfilled, " : "", diff --git a/src/mesa/main/light.c b/src/mesa/main/light.c index 962a3e6893..7bc22e2fa5 100644 --- a/src/mesa/main/light.c +++ b/src/mesa/main/light.c @@ -54,10 +54,6 @@ _mesa_ShadeModel( GLenum mode ) FLUSH_VERTICES(ctx, _NEW_LIGHT); ctx->Light.ShadeModel = mode; - if (mode == GL_FLAT) - ctx->_TriangleCaps |= DD_FLATSHADE; - else - ctx->_TriangleCaps &= ~DD_FLATSHADE; if (ctx->Driver.ShadeModel) ctx->Driver.ShadeModel( ctx, mode ); diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 3dcfc94fc7..df8dd631ea 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -3071,7 +3071,6 @@ struct gl_matrix_stack * Set in the __struct gl_contextRec::_TriangleCaps bitfield. */ /*@{*/ -#define DD_FLATSHADE 0x1 #define DD_SEPARATE_SPECULAR 0x2 #define DD_TRI_CULL_FRONT_BACK 0x4 /* special case on some hw */ #define DD_TRI_LIGHT_TWOSIDE 0x8 diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c index 8924860017..f4156769f6 100644 --- a/src/mesa/main/state.c +++ b/src/mesa/main/state.c @@ -445,8 +445,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 (ctx->Light.ShadeModel == GL_FLAT) - ctx->_TriangleCaps |= DD_FLATSHADE; if (_mesa_need_secondary_color(ctx)) ctx->_TriangleCaps |= DD_SEPARATE_SPECULAR; } |