diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2001-05-21 18:13:43 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2001-05-21 18:13:43 +0000 |
| commit | 6b1e4ea5a54ea852a904440cd9fa50251f63f64c (patch) | |
| tree | 304c1948cf57fdd14f0e4b6102edae369873ab8a /src/mesa/swrast/s_aaline.c | |
| parent | 300e1056f5ef56da8e7df8a689e5e66f57af3c3a (diff) | |
fixed a number of multi-texture line bugs
Diffstat (limited to 'src/mesa/swrast/s_aaline.c')
| -rw-r--r-- | src/mesa/swrast/s_aaline.c | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/src/mesa/swrast/s_aaline.c b/src/mesa/swrast/s_aaline.c index 34a026e1e7..395ad3f941 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.10 2001/05/17 09:32:17 keithw Exp $ */ +/* $Id: s_aaline.c,v 1.11 2001/05/21 18:13:43 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -488,6 +488,13 @@ segment(GLcontext *ctx, #define DO_Z #define DO_RGBA #define DO_MULTITEX +#include "s_aalinetemp.h" + + +#define NAME(x) aa_multitex_spec_##x +#define DO_Z +#define DO_RGBA +#define DO_MULTITEX #define DO_SPEC #include "s_aalinetemp.h" @@ -503,13 +510,17 @@ _swrast_choose_aa_line_function(GLcontext *ctx) if (ctx->Visual.rgbMode) { /* RGBA */ if (ctx->Texture._ReallyEnabled) { - if (ctx->Texture._ReallyEnabled > TEXTURE0_ANY || - ctx->Light.Model.ColorControl==GL_SEPARATE_SPECULAR_COLOR || - ctx->Fog.ColorSumEnabled) + if (ctx->Texture._ReallyEnabled > TEXTURE0_ANY) { /* Multitextured! */ - swrast->Line = aa_multitex_rgba_line; - else + if (ctx->Light.Model.ColorControl==GL_SEPARATE_SPECULAR_COLOR || + ctx->Fog.ColorSumEnabled) + swrast->Line = aa_multitex_spec_line; + else + swrast->Line = aa_multitex_rgba_line; + } + else { swrast->Line = aa_tex_rgba_line; + } } else { swrast->Line = aa_rgba_line; |