diff options
| author | Brian Paul <[email protected]> | 2003-09-18 23:21:08 +0000 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2003-09-18 23:21:08 +0000 |
| commit | 29b4076f9acff96a867760fc885f5eaeb7586977 (patch) | |
| tree | 8257664555bea58b6f9f2ebc4e3d0f2ddce719c3 /src/mesa/tnl | |
| parent | 1a8ebb8c2f939609004a13b75d2b85236e709716 (diff) | |
Move away from using the ctx->_TriangleCaps bitfield.
New macros in context.h for testing state: NEED_SECONDARY_COLOR
and NEED_TWO_SIDED_LIGHTING.
Diffstat (limited to 'src/mesa/tnl')
| -rw-r--r-- | src/mesa/tnl/t_vb_render.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/tnl/t_vb_render.c b/src/mesa/tnl/t_vb_render.c index 28dd1412167..dd06874304b 100644 --- a/src/mesa/tnl/t_vb_render.c +++ b/src/mesa/tnl/t_vb_render.c @@ -72,7 +72,7 @@ /* Clip and render whole begin/end objects */ /**********************************************************************/ -#define NEED_EDGEFLAG_SETUP (ctx->_TriangleCaps & DD_TRI_UNFILLED) +#define NEED_EDGEFLAG_SETUP (ctx->Polygon.FrontMode != GL_FILL || ctx->Polygon.BackMode != GL_FILL) #define EDGEFLAG_GET(idx) VB->EdgeFlag[idx] #define EDGEFLAG_SET(idx, val) VB->EdgeFlag[idx] = val @@ -184,7 +184,7 @@ static void clip_elt_triangles( GLcontext *ctx, /* Render whole begin/end objects */ /**********************************************************************/ -#define NEED_EDGEFLAG_SETUP (ctx->_TriangleCaps & DD_TRI_UNFILLED) +#define NEED_EDGEFLAG_SETUP (ctx->Polygon.FrontMode != GL_FILL || ctx->Polygon.BackMode != GL_FILL) #define EDGEFLAG_GET(idx) VB->EdgeFlag[idx] #define EDGEFLAG_SET(idx, val) VB->EdgeFlag[idx] = val @@ -348,7 +348,7 @@ static void check_render( GLcontext *ctx, struct gl_pipeline_stage *stage ) if (ctx->Visual.rgbMode) { inputs |= VERT_BIT_COLOR0; - if (ctx->_TriangleCaps & DD_SEPARATE_SPECULAR) + if (NEED_SECONDARY_COLOR(ctx)) inputs |= VERT_BIT_COLOR1; if (ctx->Texture._EnabledCoordUnits) { @@ -370,7 +370,7 @@ static void check_render( GLcontext *ctx, struct gl_pipeline_stage *stage ) if (ctx->Fog.Enabled) inputs |= VERT_BIT_FOG; - if (ctx->_TriangleCaps & DD_TRI_UNFILLED) + if (ctx->Polygon.FrontMode != GL_FILL || ctx->Polygon.BackMode != GL_FILL) inputs |= VERT_BIT_EDGEFLAG; if (ctx->RenderMode==GL_FEEDBACK) |