Rearrange VERT_* flags to support 4 texture units.

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 26ef3c43dde102e02dee7e5d5d9b836225d91015..998ebeeb05872848d678af657a615fa87f5d2c77 100644 (file)
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -1,4 +1,4 @@
-/* $Id: context.c,v 1.100 2000/10/30 16:32:43 brianp Exp $ */
+/* $Id: context.c,v 1.101 2000/10/30 18:50:42 keithw Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -904,9 +904,10 @@ init_attrib_groups( GLcontext *ctx )
                         VERT_SPEC_RGB |
                         VERT_FOG_COORD |
                         VERT_EDGE |
-                        VERT_TEX0_1 |
-                        VERT_TEX1_1 |
-                        VERT_TEX2_1 | /* XXX fix for MAX_TEXTURE_UNITS > 3 */
+                        VERT_TEX0_12 |
+                        VERT_TEX1_12 |
+                        VERT_TEX2_12 |
+                        VERT_TEX3_12 |
                         VERT_MATERIAL);
 
    init_fallback_arrays( ctx );

diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c
index c4fc24d09e0b11c2f54790728a0684753a789103..96b15c27f071a6b1708799dab0070c08ba158347 100644 (file)
--- a/src/mesa/main/varray.c
+++ b/src/mesa/main/varray.c
@@ -1,4 +1,4 @@
-/* $Id: varray.c,v 1.28 2000/10/30 16:30:56 keithw Exp $ */
+/* $Id: varray.c,v 1.29 2000/10/30 18:50:42 keithw Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -408,7 +408,7 @@ _mesa_TexCoordPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr
 
    ctx->Array.TexCoordFunc[texUnit] = gl_trans_4f_tab[size][TYPE_IDX(type)];
    ctx->Array.TexCoordEltFunc[texUnit] = gl_trans_elt_4f_tab[size][TYPE_IDX(type)];
-   ctx->Array.NewArrayState |= PIPE_TEX(texUnit);
+   ctx->Array.NewArrayState |= VERT_TEX_ANY(texUnit);
    ctx->NewState |= _NEW_ARRAY;
 }
 
@@ -1349,7 +1349,7 @@ void gl_update_client_state( GLcontext *ctx )
    };
    static const GLuint tc_flags[5] = {
       0, 
-      VERT_TEX0_1,
+      VERT_TEX0_12, 
       VERT_TEX0_12, 
       VERT_TEX0_123, 
       VERT_TEX0_1234