diff options
| author | Benno Schulenberg <bensberg@justemail.net> | 2007-11-09 08:54:21 -0700 |
|---|---|---|
| committer | Brian <brian.paul@tungstengraphics.com> | 2007-11-09 08:56:05 -0700 |
| commit | 4e91ad8c0ec277d9df48ccdd8500bfb156073adc (patch) | |
| tree | 056bf9c9765c78b763899a0d3b707b3f9cfee34a /src/mesa/drivers/dri/unichrome | |
| parent | d540e8e9dfc18063f98a31cb3d078d183cf8fce6 (diff) | |
| download | external_mesa3d-4e91ad8c0ec277d9df48ccdd8500bfb156073adc.zip external_mesa3d-4e91ad8c0ec277d9df48ccdd8500bfb156073adc.tar.gz external_mesa3d-4e91ad8c0ec277d9df48ccdd8500bfb156073adc.tar.bz2 | |
code clean-ups, reformatting
Diffstat (limited to 'src/mesa/drivers/dri/unichrome')
| -rw-r--r-- | src/mesa/drivers/dri/unichrome/via_tris.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/src/mesa/drivers/dri/unichrome/via_tris.c b/src/mesa/drivers/dri/unichrome/via_tris.c index 73e6626..b97dacd 100644 --- a/src/mesa/drivers/dri/unichrome/via_tris.c +++ b/src/mesa/drivers/dri/unichrome/via_tris.c @@ -625,13 +625,12 @@ static void viaFastRenderClippedPoly(GLcontext *ctx, const GLuint *elts, } } + /**********************************************************************/ /* Choose render functions */ /**********************************************************************/ - - #define _VIA_NEW_VERTEX (_NEW_TEXTURE | \ _DD_NEW_SEPARATE_SPECULAR | \ _DD_NEW_TRI_UNFILLED | \ @@ -665,16 +664,17 @@ static void viaChooseRenderState(GLcontext *ctx) vmesa->drawTri = via_draw_triangle; } - if (flags & (ANY_FALLBACK_FLAGS|ANY_RASTER_FLAGS)) { + if (flags & (ANY_FALLBACK_FLAGS | ANY_RASTER_FLAGS)) { if (ctx->Light.Enabled && ctx->Light.Model.TwoSide) index |= VIA_TWOSIDE_BIT; - if (flags & DD_TRI_OFFSET) index |= VIA_OFFSET_BIT; if (ctx->Polygon.FrontMode != GL_FILL || ctx->Polygon.BackMode != GL_FILL) index |= VIA_UNFILLED_BIT; - if (flags & ANY_FALLBACK_FLAGS) index |= VIA_FALLBACK_BIT; + if (flags & DD_TRI_OFFSET) + index |= VIA_OFFSET_BIT; + if (flags & ANY_FALLBACK_FLAGS) + index |= VIA_FALLBACK_BIT; - /* Hook in fallbacks for specific primitives. - */ + /* Hook in fallbacks for specific primitives. */ if (flags & POINT_FALLBACK) vmesa->drawPoint = via_fallback_point; @@ -685,11 +685,8 @@ static void viaChooseRenderState(GLcontext *ctx) vmesa->drawTri = via_fallback_tri; } - - if ((flags & DD_SEPARATE_SPECULAR) && - ctx->Light.ShadeModel == GL_FLAT) { + if ((flags & DD_SEPARATE_SPECULAR) && ctx->Light.ShadeModel == GL_FLAT) index = VIA_MAX_TRIFUNC; /* flat specular */ - } if (vmesa->renderIndex != index) { vmesa->renderIndex = index; |