mesa/glsl: set num_textures per stage directly in shader_info

[mesa.git] / src / mesa / main / texenv.c

diff --git a/src/mesa/main/texenv.c b/src/mesa/main/texenv.c
index 1aa0d6c410a2687670d02897279989a6cc35742f..de49566ec42cb66f44b13fda5d0c72c0d3ce3942 100644 (file)
--- a/src/mesa/main/texenv.c
+++ b/src/mesa/main/texenv.c
@@ -464,13 +464,13 @@ _mesa_TexEnvfv( GLenum target, GLenum pname, const GLfloat *param )
           * but that's what the spec calls for.
           */
          if (iparam0 == GL_TRUE) {
-            if (ctx->Point.CoordReplaceBits & (1u << ctx->Texture.CurrentUnit))
+            if (ctx->Point.CoordReplace & (1u << ctx->Texture.CurrentUnit))
                return;
-            ctx->Point.CoordReplaceBits |= (1u << ctx->Texture.CurrentUnit);
+            ctx->Point.CoordReplace |= (1u << ctx->Texture.CurrentUnit);
          } else if (iparam0 == GL_FALSE) {
-            if (~(ctx->Point.CoordReplaceBits) & (1u << ctx->Texture.CurrentUnit))
+            if (~(ctx->Point.CoordReplace) & (1u << ctx->Texture.CurrentUnit))
                return;
-            ctx->Point.CoordReplaceBits &= ~(1u << ctx->Texture.CurrentUnit);
+            ctx->Point.CoordReplace &= ~(1u << ctx->Texture.CurrentUnit);
          } else {
             _mesa_error( ctx, GL_INVALID_VALUE, "glTexEnv(param=0x%x)", iparam0);
             return;
@@ -677,7 +677,7 @@ _mesa_GetTexEnvfv( GLenum target, GLenum pname, GLfloat *params )
          return;
       }
       if (pname == GL_COORD_REPLACE_NV) {
-         if (ctx->Point.CoordReplaceBits & (1u << ctx->Texture.CurrentUnit))
+         if (ctx->Point.CoordReplace & (1u << ctx->Texture.CurrentUnit))
             *params = 1.0f;
          else
             *params = 0.0f;
@@ -741,7 +741,7 @@ _mesa_GetTexEnviv( GLenum target, GLenum pname, GLint *params )
          return;
       }
       if (pname == GL_COORD_REPLACE_NV) {
-         if (ctx->Point.CoordReplaceBits & (1u << ctx->Texture.CurrentUnit))
+         if (ctx->Point.CoordReplace & (1u << ctx->Texture.CurrentUnit))
             *params = GL_TRUE;
          else
             *params = GL_FALSE;