summaryrefslogtreecommitdiff
path: root/src/mesa/swrast
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2001-01-29 21:47:13 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2001-01-29 21:47:13 +0000
commit407b487017a5c5a213f399ec1667fe2aa7ed340d (patch)
treefe3f3bb3007607ca32dc2599041c8afab1d98dc1 /src/mesa/swrast
parentd98fdad3bfc7018740cf781e00fa53ad9a4479cd (diff)
fixed computation of _MultiTextureEnabled (again)
Diffstat (limited to 'src/mesa/swrast')
-rw-r--r--src/mesa/swrast/s_context.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/swrast/s_context.c b/src/mesa/swrast/s_context.c
index ca7cbfd845..55966a95a8 100644
--- a/src/mesa/swrast/s_context.c
+++ b/src/mesa/swrast/s_context.c
@@ -1,4 +1,4 @@
-/* $Id: s_context.c,v 1.11 2001/01/23 23:39:37 brianp Exp $ */
+/* $Id: s_context.c,v 1.12 2001/01/29 21:47:13 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -326,8 +326,8 @@ _swrast_validate_derived( GLcontext *ctx )
_swrast_update_rasterflags( ctx );
if (swrast->NewState & _NEW_TEXTURE)
- swrast->_MultiTextureEnabled = (ctx->Texture._ReallyEnabled &
- ~TEXTURE0_ANY);
+ swrast->_MultiTextureEnabled =
+ ctx->Texture._ReallyEnabled > TEXTURE0_ANY;
if (swrast->NewState & _NEW_POLYGON)
_swrast_update_polygon( ctx );