diff options
| -rw-r--r-- | src/mesa/main/debug.c | 5 | ||||
| -rw-r--r-- | src/mesa/main/mtypes.h | 1 | ||||
| -rw-r--r-- | src/mesa/main/state.c | 10 |
3 files changed, 4 insertions, 12 deletions
diff --git a/src/mesa/main/debug.c b/src/mesa/main/debug.c index facba91a0fe..f7b1f71f42c 100644 --- a/src/mesa/main/debug.c +++ b/src/mesa/main/debug.c @@ -100,7 +100,7 @@ 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\n", + "%s: (0x%x) %s%s%s%s%s%s%s%s%s%s\n", name, flags, (flags & DD_SEPARATE_SPECULAR) ? "separate-specular, " : "", @@ -112,8 +112,7 @@ _mesa_print_tri_caps( const char *name, GLuint flags ) (flags & DD_LINE_SMOOTH) ? "line-smooth, " : "", (flags & DD_LINE_STIPPLE) ? "line-stipple, " : "", (flags & DD_POINT_SMOOTH) ? "point-smooth, " : "", - (flags & DD_POINT_ATTEN) ? "point-atten, " : "", - (flags & DD_TRI_CULL_FRONT_BACK) ? "cull-all, " : "" + (flags & DD_POINT_ATTEN) ? "point-atten, " : "" ); } diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index df8dd631eaa..0575af6b733 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -3072,7 +3072,6 @@ struct gl_matrix_stack */ /*@{*/ #define DD_SEPARATE_SPECULAR 0x2 -#define DD_TRI_CULL_FRONT_BACK 0x4 /* special case on some hw */ #define DD_TRI_LIGHT_TWOSIDE 0x8 #define DD_TRI_UNFILLED 0x10 #define DD_TRI_SMOOTH 0x20 diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c index f4156769f6f..b01926622ad 100644 --- a/src/mesa/main/state.c +++ b/src/mesa/main/state.c @@ -370,16 +370,13 @@ update_twoside(struct gl_context *ctx) /* - * Check polygon state and set DD_TRI_CULL_FRONT_BACK and/or DD_TRI_OFFSET + * Check polygon state and set DD_TRI_OFFSET * in ctx->_TriangleCaps if needed. */ static void update_polygon(struct gl_context *ctx) { - ctx->_TriangleCaps &= ~(DD_TRI_CULL_FRONT_BACK | DD_TRI_OFFSET); - - if (ctx->Polygon.CullFlag && ctx->Polygon.CullFaceMode == GL_FRONT_AND_BACK) - ctx->_TriangleCaps |= DD_TRI_CULL_FRONT_BACK; + ctx->_TriangleCaps &= ~DD_TRI_OFFSET; if ( ctx->Polygon.OffsetPoint || ctx->Polygon.OffsetLine @@ -431,9 +428,6 @@ update_tricaps(struct gl_context *ctx, GLbitfield new_state) if (ctx->Polygon.FrontMode != GL_FILL || ctx->Polygon.BackMode != GL_FILL) ctx->_TriangleCaps |= DD_TRI_UNFILLED; - if (ctx->Polygon.CullFlag - && ctx->Polygon.CullFaceMode == GL_FRONT_AND_BACK) - ctx->_TriangleCaps |= DD_TRI_CULL_FRONT_BACK; if (ctx->Polygon.OffsetPoint || ctx->Polygon.OffsetLine || ctx->Polygon.OffsetFill) |