diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2003-09-18 23:21:08 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2003-09-18 23:21:08 +0000 |
| commit | 29b4076f9acff96a867760fc885f5eaeb7586977 (patch) | |
| tree | 8257664555bea58b6f9f2ebc4e3d0f2ddce719c3 /src/mesa/swrast_setup/ss_vb.c | |
| 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/swrast_setup/ss_vb.c')
| -rw-r--r-- | src/mesa/swrast_setup/ss_vb.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/mesa/swrast_setup/ss_vb.c b/src/mesa/swrast_setup/ss_vb.c index fa4993434a..29bad8eefe 100644 --- a/src/mesa/swrast_setup/ss_vb.c +++ b/src/mesa/swrast_setup/ss_vb.c @@ -392,7 +392,7 @@ _swsetup_choose_rastersetup_func(GLcontext *ctx) else if (ctx->Texture._EnabledCoordUnits == 1) funcindex |= TEX0; /* only unit 0 is enabled */ - if (ctx->_TriangleCaps & DD_SEPARATE_SPECULAR) + if (NEED_SECONDARY_COLOR(ctx)) funcindex |= SPEC; } else { @@ -418,7 +418,9 @@ _swsetup_choose_rastersetup_func(GLcontext *ctx) swsetup->SetupIndex = funcindex; tnl->Driver.Render.BuildVertices = setup_tab[funcindex]; - if (ctx->_TriangleCaps & (DD_TRI_LIGHT_TWOSIDE|DD_TRI_UNFILLED)) { + if (NEED_TWO_SIDED_LIGHTING(ctx) || + ctx->Polygon.FrontMode != GL_FILL || + ctx->Polygon.BackMode != GL_FILL) { tnl->Driver.Render.Interp = interp_extras; tnl->Driver.Render.CopyPV = copy_pv_extras; } |