replaced 0xf and 0xf0 with TEXTURE0_ANY and TEXTURE1_ANY

diff --git a/src/mesa/drivers/glide/fxvb.c b/src/mesa/drivers/glide/fxvb.c
index 2af5e26a018ecf64b2ab5ed6e60d976f987c7215..4983d5f12b4df1dac3ec821cea97c3ee32d54bb4 100644 (file)
--- a/src/mesa/drivers/glide/fxvb.c
+++ b/src/mesa/drivers/glide/fxvb.c
@@ -1,4 +1,4 @@
-/* $Id: fxvb.c,v 1.11 2001/09/23 16:50:01 brianp Exp $ */
+/* $Id: fxvb.c,v 1.12 2002/06/06 16:19:25 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -342,8 +342,8 @@ void fxChooseVertexState( GLcontext *ctx )
    fxMesa->tmu_source[0] = 0;
    fxMesa->tmu_source[1] = 1;
 
-   if (ctx->Texture._ReallyEnabled & 0xf0) {
-      if (ctx->Texture._ReallyEnabled & 0xf) {
+   if (ctx->Texture._ReallyEnabled & TEXTURE1_ANY) {
+      if (ctx->Texture._ReallyEnabled & TEXTURE0_ANY) {
         ind |= SETUP_TMU1|SETUP_TMU0;
       }
       else {
@@ -352,7 +352,7 @@ void fxChooseVertexState( GLcontext *ctx )
         ind |= SETUP_TMU0;
       }
    }
-   else if (ctx->Texture._ReallyEnabled & 0xf) {
+   else if (ctx->Texture._ReallyEnabled & TETURE0_ANY) {
       ind |= SETUP_TMU0;
    }
    

diff --git a/src/mesa/swrast_setup/ss_vb.c b/src/mesa/swrast_setup/ss_vb.c
index f071216801ead83553994b7b4370b53fe109aacc..811c3e70d925919e6ce0635d7a0a04c0e6494b5a 100644 (file)
--- a/src/mesa/swrast_setup/ss_vb.c
+++ b/src/mesa/swrast_setup/ss_vb.c
@@ -1,4 +1,4 @@
-/* $Id: ss_vb.c,v 1.15 2002/01/06 20:39:03 brianp Exp $ */
+/* $Id: ss_vb.c,v 1.16 2002/06/06 16:19:25 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -386,9 +386,9 @@ _swsetup_choose_rastersetup_func(GLcontext *ctx)
       if (ctx->Visual.rgbMode) {
          funcindex = COLOR;
 
-         if (ctx->Texture._ReallyEnabled & ~0xf)
+         if (ctx->Texture._ReallyEnabled & ~TEXTURE0_ANY)
             funcindex |= MULTITEX;
-         else if (ctx->Texture._ReallyEnabled & 0xf)
+         else if (ctx->Texture._ReallyEnabled & TEXTURE0_ANY)
             funcindex |= TEX0;
 
          if (ctx->_TriangleCaps & DD_SEPARATE_SPECULAR)