From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Mon, 29 Jan 2001 21:47:13 +0000 (+0000)
Subject: fixed computation of _MultiTextureEnabled (again)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=407b487017a5c5a213f399ec1667fe2aa7ed340d;p=mesa.git

fixed computation of _MultiTextureEnabled (again)
---

diff --git a/src/mesa/swrast/s_context.c b/src/mesa/swrast/s_context.c
index ca7cbfd8458..55966a95a86 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 );