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_triangle.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_triangle.c')
| -rw-r--r-- | src/mesa/swrast_setup/ss_triangle.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/mesa/swrast_setup/ss_triangle.c b/src/mesa/swrast_setup/ss_triangle.c index b041c32ef5..d106d4c317 100644 --- a/src/mesa/swrast_setup/ss_triangle.c +++ b/src/mesa/swrast_setup/ss_triangle.c @@ -69,7 +69,7 @@ static void _swsetup_render_line_tri( GLcontext *ctx, return; } - if (ctx->_TriangleCaps & DD_FLATSHADE) { + if (ctx->Light.ShadeModel == GL_FLAT) { COPY_CHAN4(c[0], v0->color); COPY_CHAN4(c[1], v1->color); COPY_CHAN4(s[0], v0->specular); @@ -95,7 +95,7 @@ static void _swsetup_render_line_tri( GLcontext *ctx, if (ef[e2]) _swrast_Line( ctx, v2, v0 ); } - if (ctx->_TriangleCaps & DD_FLATSHADE) { + if (ctx->Light.ShadeModel == GL_FLAT) { COPY_CHAN4(v0->color, c[0]); COPY_CHAN4(v1->color, c[1]); COPY_CHAN4(v0->specular, s[0]); @@ -128,7 +128,8 @@ static void _swsetup_render_point_tri( GLcontext *ctx, return; } - if (ctx->_TriangleCaps & DD_FLATSHADE) { + if (ctx->Light.ShadeModel == GL_FLAT) { + /* save colors/indexes for v0, v1 vertices */ COPY_CHAN4(c[0], v0->color); COPY_CHAN4(c[1], v1->color); COPY_CHAN4(s[0], v0->specular); @@ -136,6 +137,7 @@ static void _swsetup_render_point_tri( GLcontext *ctx, i[0] = v0->index; i[1] = v1->index; + /* copy v2 color/indexes to v0, v1 indexes */ COPY_CHAN4(v0->color, v2->color); COPY_CHAN4(v1->color, v2->color); COPY_CHAN4(v0->specular, v2->specular); @@ -148,7 +150,8 @@ static void _swsetup_render_point_tri( GLcontext *ctx, if (ef[e1]) _swrast_Point( ctx, v1 ); if (ef[e2]) _swrast_Point( ctx, v2 ); - if (ctx->_TriangleCaps & DD_FLATSHADE) { + if (ctx->Light.ShadeModel == GL_FLAT) { + /* restore v0, v1 colores/indexes */ COPY_CHAN4(v0->color, c[0]); COPY_CHAN4(v1->color, c[1]); COPY_CHAN4(v0->specular, s[0]); @@ -294,7 +297,8 @@ void _swsetup_choose_trifuncs( GLcontext *ctx ) /* We piggyback the two-sided stencil front/back determination on the * unfilled triangle path. */ - if ((ctx->_TriangleCaps & DD_TRI_UNFILLED) || + if (ctx->Polygon.FrontMode != GL_FILL || + ctx->Polygon.BackMode != GL_FILL || (ctx->Stencil.Enabled && ctx->Stencil.TestTwoSide)) ind |= SS_UNFILLED_BIT; |