summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2000-12-09 22:09:50 +0000
committerBrian Paul <[email protected]>2000-12-09 22:09:50 +0000
commit8aa019d2efcf0295beae51989fe4b419ca50ca17 (patch)
tree25f0fdfc9583b748a21a02cac19a87405996ad00
parentab6e78f3a0abac7becbd8a58ed2c89f860cc6b0b (diff)
_MultiTextureEnabled was being computed incorrectly
-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 6192adb2638..00177849477 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.6 2000/11/22 07:32:18 joukj Exp $ */
+/* $Id: s_context.c,v 1.7 2000/12/09 22:09:50 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 &
- ~ENABLE_TEX0);
+ swrast->_MultiTextureEnabled =
+ (ctx->Texture._ReallyEnabled > ENABLE_TEX0);
if (swrast->NewState & _NEW_POLYGON)
_swrast_update_polygon( ctx );