diff options
| -rw-r--r-- | src/mesa/main/mtypes.h | 5 | ||||
| -rw-r--r-- | src/mesa/main/state.c | 14 | ||||
| -rw-r--r-- | src/mesa/swrast_setup/ss_triangle.c | 6 |
3 files changed, 12 insertions, 13 deletions
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 3509be79877..5a7eb53125d 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -1,4 +1,4 @@ -/* $Id: mtypes.h,v 1.89 2002/09/27 02:45:37 brianp Exp $ */ +/* $Id: mtypes.h,v 1.90 2002/10/02 21:44:08 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -692,7 +692,7 @@ struct gl_polygon_attrib { GLenum FrontFace; /* Either GL_CW or GL_CCW */ GLenum FrontMode; /* Either GL_POINT, GL_LINE or GL_FILL */ GLenum BackMode; /* Either GL_POINT, GL_LINE or GL_FILL */ - GLboolean _FrontBit; /* */ + GLboolean _FrontBit; /* 0=GL_CCW, 1=GL_CW */ GLboolean CullFlag; /* Culling on/off flag */ GLboolean SmoothFlag; /* True if GL_POLYGON_SMOOTH is enabled */ GLboolean StippleFlag; /* True if GL_POLYGON_STIPPLE is enabled */ @@ -703,7 +703,6 @@ struct gl_polygon_attrib { GLboolean OffsetPoint; /* Offset in GL_POINT mode */ GLboolean OffsetLine; /* Offset in GL_LINE mode */ GLboolean OffsetFill; /* Offset in GL_FILL mode */ - GLboolean _OffsetAny; }; diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c index 24e127a93fc..a5c5deafa46 100644 --- a/src/mesa/main/state.c +++ b/src/mesa/main/state.c @@ -1,4 +1,4 @@ -/* $Id: state.c,v 1.92 2002/09/27 02:45:38 brianp Exp $ */ +/* $Id: state.c,v 1.93 2002/10/02 21:44:08 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -80,7 +80,7 @@ static int generic_noop(void) { #ifdef DEBUG - _mesa_problem(NULL, "undefined function dispatch"); + _mesa_problem(NULL, "User called no-op dispatch function"); #endif return 0; } @@ -542,23 +542,21 @@ update_polygon( GLcontext *ctx ) ctx->_TriangleCaps |= DD_TRI_CULL_FRONT_BACK; /* Any Polygon offsets enabled? */ - ctx->Polygon._OffsetAny = GL_FALSE; if (ctx->Polygon.OffsetPoint || ctx->Polygon.OffsetLine || ctx->Polygon.OffsetFill) { ctx->_TriangleCaps |= DD_TRI_OFFSET; - ctx->Polygon._OffsetAny = GL_TRUE; } } static void calculate_model_project_matrix( GLcontext *ctx ) { - _math_matrix_mul_matrix( &ctx->_ModelProjectMatrix, - ctx->ProjectionMatrixStack.Top, - ctx->ModelviewMatrixStack.Top ); + _math_matrix_mul_matrix( &ctx->_ModelProjectMatrix, + ctx->ProjectionMatrixStack.Top, + ctx->ModelviewMatrixStack.Top ); - _math_matrix_analyse( &ctx->_ModelProjectMatrix ); + _math_matrix_analyse( &ctx->_ModelProjectMatrix ); } static void diff --git a/src/mesa/swrast_setup/ss_triangle.c b/src/mesa/swrast_setup/ss_triangle.c index 7612a64d06f..159dc799efc 100644 --- a/src/mesa/swrast_setup/ss_triangle.c +++ b/src/mesa/swrast_setup/ss_triangle.c @@ -1,4 +1,4 @@ -/* $Id: ss_triangle.c,v 1.15 2001/07/17 19:39:32 keithw Exp $ */ +/* $Id: ss_triangle.c,v 1.16 2002/10/02 21:44:08 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -265,7 +265,9 @@ void _swsetup_choose_trifuncs( GLcontext *ctx ) TNLcontext *tnl = TNL_CONTEXT(ctx); GLuint ind = 0; - if (ctx->Polygon._OffsetAny) + if (ctx->Polygon.OffsetPoint || + ctx->Polygon.OffsetLine || + ctx->Polygon.OffsetFill) ind |= SS_OFFSET_BIT; if (ctx->Light.Enabled && ctx->Light.Model.TwoSide) |