summaryrefslogtreecommitdiffstats
path: root/src/mesa/swrast/s_aaline.c
diff options
context:
space:
mode:
authorKeith Whitwell <[email protected]>2001-05-17 09:32:17 +0000
committerKeith Whitwell <[email protected]>2001-05-17 09:32:17 +0000
commit89dae684aa1d74b06a4f70cb76b33671d0cef9e6 (patch)
tree9b42d5eb082a5f37920af04048cd6b8a7f20749c /src/mesa/swrast/s_aaline.c
parent47cf442c1164b6b406117fccfb8b564602741ee3 (diff)
Fix order of decomposition of quad.
Remove 'swrast->_MultiTexEnabled' derived value.
Diffstat (limited to 'src/mesa/swrast/s_aaline.c')
-rw-r--r--src/mesa/swrast/s_aaline.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/swrast/s_aaline.c b/src/mesa/swrast/s_aaline.c
index 7ce0d6b7080..34a026e1e7b 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.9 2001/05/10 17:41:41 brianp Exp $ */
+/* $Id: s_aaline.c,v 1.10 2001/05/17 09:32:17 keithw Exp $ */
/*
* Mesa 3-D graphics library
@@ -503,9 +503,9 @@ _swrast_choose_aa_line_function(GLcontext *ctx)
if (ctx->Visual.rgbMode) {
/* RGBA */
if (ctx->Texture._ReallyEnabled) {
- if (swrast->_MultiTextureEnabled
- || ctx->Light.Model.ColorControl==GL_SEPARATE_SPECULAR_COLOR
- || ctx->Fog.ColorSumEnabled)
+ if (ctx->Texture._ReallyEnabled > TEXTURE0_ANY ||
+ ctx->Light.Model.ColorControl==GL_SEPARATE_SPECULAR_COLOR ||
+ ctx->Fog.ColorSumEnabled)
/* Multitextured! */
swrast->Line = aa_multitex_rgba_line;
else