diff options
| author | Keith Whitwell <[email protected]> | 2000-11-13 20:02:56 +0000 |
|---|---|---|
| committer | Keith Whitwell <[email protected]> | 2000-11-13 20:02:56 +0000 |
| commit | 1e1aac034c986a08248861363c0baa27dc2ae2d5 (patch) | |
| tree | d6aa2dd575eae913007d089928d765be8c867126 /src/mesa/swrast/s_aaline.c | |
| parent | 6b8ae62d6b6a3b06c51628123fc30634cacf9c7c (diff) | |
Cleanup of derived state calculation prior to seperating software T&L
into a new directory. Specifically the handling of changes to lighting
lighting space (light in model vs. light in eye) have been revamped.
Moved several derived values used only by swrast into that directory.
Removed direct calls to swrast_flush() from vbrender.c -- pushed into
ctx->Driver.RenderFinish.
Optimized flat-shading case in swrast_setup.
Diffstat (limited to 'src/mesa/swrast/s_aaline.c')
| -rw-r--r-- | src/mesa/swrast/s_aaline.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/swrast/s_aaline.c b/src/mesa/swrast/s_aaline.c index 377e6072c72..48bb2f61094 100644 --- a/src/mesa/swrast/s_aaline.c +++ b/src/mesa/swrast/s_aaline.c @@ -1,4 +1,4 @@ -/* $Id: s_aaline.c,v 1.1 2000/11/05 23:15:16 brianp Exp $ */ +/* $Id: s_aaline.c,v 1.2 2000/11/13 20:02:57 keithw Exp $ */ /* * Mesa 3-D graphics library @@ -489,7 +489,7 @@ _swrast_choose_aa_line_function(GLcontext *ctx) if (ctx->Visual.RGBAflag) { /* RGBA */ if (ctx->Texture._ReallyEnabled) { - if (ctx->Texture._MultiTextureEnabled + if (swrast->_MultiTextureEnabled || ctx->Light.Model.ColorControl==GL_SEPARATE_SPECULAR_COLOR || ctx->Fog.ColorSumEnabled) /* Multitextured! */ |