summaryrefslogtreecommitdiff
path: root/src/mesa/main
diff options
context:
space:
mode:
authorKeith Whitwell <keith@tungstengraphics.com>2000-10-30 18:50:42 +0000
committerKeith Whitwell <keith@tungstengraphics.com>2000-10-30 18:50:42 +0000
commit365dc68c3978de3c28e61d4c7151aece219694d7 (patch)
tree340a9ea569fe7ab8a8270ee460f1a858c9912f68 /src/mesa/main
parent9499e017b7e05411a32b3e4fa94885eaec0d7277 (diff)
Rearrange VERT_* flags to support 4 texture units.
Diffstat (limited to 'src/mesa/main')
-rw-r--r--src/mesa/main/context.c9
-rw-r--r--src/mesa/main/varray.c6
2 files changed, 8 insertions, 7 deletions
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 26ef3c43dd..998ebeeb05 100644
--- 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 c4fc24d09e..96b15c27f0 100644
--- 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