diff options
| author | Brian Paul <[email protected]> | 2013-04-16 19:06:22 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2013-04-17 11:59:41 -0600 |
| commit | c9bb052e31b7952272e60d28969e90eafb6b3e1f (patch) | |
| tree | a30c87f75f8019051f6ccb9085309028e2f29f40 /src/mesa/main | |
| parent | 56dc53ed5bae2751eeadbfc1d163dfec72e8cfc8 (diff) | |
mesa: remove DD_TRI_UNFILLED flag
Use alternate code in intel, r200, radeon drivers.
v2: use conditional operator instead of bit shifting
Reviewed-by: Eric Anholt <[email protected]>
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/debug.c | 5 | ||||
| -rw-r--r-- | src/mesa/main/mtypes.h | 1 | ||||
| -rw-r--r-- | src/mesa/main/polygon.c | 5 | ||||
| -rw-r--r-- | src/mesa/main/state.c | 9 |
4 files changed, 2 insertions, 18 deletions
diff --git a/src/mesa/main/debug.c b/src/mesa/main/debug.c index 418f0e2e6b5..e8d850dff86 100644 --- a/src/mesa/main/debug.c +++ b/src/mesa/main/debug.c @@ -100,11 +100,10 @@ void _mesa_print_tri_caps( const char *name, GLuint flags ) { _mesa_debug(NULL, - "%s: (0x%x) %s%s\n", + "%s: (0x%x) %s\n", name, flags, - (flags & DD_TRI_LIGHT_TWOSIDE) ? "tri-light-twoside, " : "", - (flags & DD_TRI_UNFILLED) ? "tri-unfilled, " : "" + (flags & DD_TRI_LIGHT_TWOSIDE) ? "tri-light-twoside, " : "" ); } diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 0463689587b..d6c2b35c6cc 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -3168,7 +3168,6 @@ struct gl_matrix_stack */ /*@{*/ #define DD_TRI_LIGHT_TWOSIDE (1 << 1) -#define DD_TRI_UNFILLED (1 << 2) /*@}*/ diff --git a/src/mesa/main/polygon.c b/src/mesa/main/polygon.c index cdef01a2fe2..e1fd0ffaf69 100644 --- a/src/mesa/main/polygon.c +++ b/src/mesa/main/polygon.c @@ -172,11 +172,6 @@ _mesa_PolygonMode( GLenum face, GLenum mode ) return; } - if (ctx->Polygon.FrontMode == GL_FILL && ctx->Polygon.BackMode == GL_FILL) - ctx->_TriangleCaps &= ~DD_TRI_UNFILLED; - else - ctx->_TriangleCaps |= DD_TRI_UNFILLED; - if (ctx->Driver.PolygonMode) ctx->Driver.PolygonMode(ctx, face, mode); } diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c index f7248647beb..da7f713489d 100644 --- a/src/mesa/main/state.c +++ b/src/mesa/main/state.c @@ -327,15 +327,6 @@ update_tricaps(struct gl_context *ctx, GLbitfield new_state) ctx->_TriangleCaps = 0; /* - * Polygons - */ - if (1/*new_state & _NEW_POLYGON*/) { - if (ctx->Polygon.FrontMode != GL_FILL - || ctx->Polygon.BackMode != GL_FILL) - ctx->_TriangleCaps |= DD_TRI_UNFILLED; - } - - /* * Lighting and shading */ if (ctx->Light.Enabled && ctx->Light.Model.TwoSide) |