diff options
| author | Brian Paul <[email protected]> | 2003-05-01 22:44:02 +0000 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2003-05-01 22:44:02 +0000 |
| commit | 92f9785c727ea10ff5f8dc9770f0e8f388fcea70 (patch) | |
| tree | 10335899a8205128723f6b459d827e918bbc2d86 /src/mesa/tnl/t_imm_exec.c | |
| parent | 09b00c5ded8e6211c9c79be600bb8c8ecad0d8fc (diff) | |
Use ctx->Const.MaxTextureImageUnits and MaxTextureCoordUnits in more places.
Misc vertex array / vertex program changes.
Diffstat (limited to 'src/mesa/tnl/t_imm_exec.c')
| -rw-r--r-- | src/mesa/tnl/t_imm_exec.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/mesa/tnl/t_imm_exec.c b/src/mesa/tnl/t_imm_exec.c index a50922330f0..4cf95bb896a 100644 --- a/src/mesa/tnl/t_imm_exec.c +++ b/src/mesa/tnl/t_imm_exec.c @@ -1,5 +1,3 @@ -/* $Id: t_imm_exec.c,v 1.46 2003/04/08 02:27:20 brianp Exp $ */ - /* * Mesa 3-D graphics library * Version: 5.1 @@ -166,7 +164,7 @@ void _tnl_copy_to_current( GLcontext *ctx, struct immediate *IM, if (flag & VERT_BITS_TEX_ANY) { GLuint i; - for (i = 0 ; i < ctx->Const.MaxTextureUnits ; i++) { + for (i = 0 ; i < ctx->Const.MaxTextureCoordUnits ; i++) { if (flag & VERT_BIT_TEX(i)) { COPY_4FV( ctx->Current.Attrib[VERT_ATTRIB_TEX0 + i], IM->Attrib[VERT_ATTRIB_TEX0 + i][count]); @@ -344,7 +342,7 @@ static void _tnl_vb_bind_immediate( GLcontext *ctx, struct immediate *IM ) if (inputs & VERT_BITS_TEX_ANY) { GLuint i; - for (i = 0; i < ctx->Const.MaxTextureUnits; i++) { + for (i = 0; i < ctx->Const.MaxTextureCoordUnits; i++) { VB->TexCoordPtr[i] = NULL; if (inputs & VERT_BIT_TEX(i)) { tmp->TexCoord[i].count = count; @@ -569,7 +567,7 @@ void _tnl_imm_init( GLcontext *ctx ) _mesa_vector1ui_init( &tmp->Index, 0, 0 ); _mesa_vector1ub_init( &tmp->EdgeFlag, 0, 0 ); - for (i = 0; i < ctx->Const.MaxTextureUnits; i++) + for (i = 0; i < ctx->Const.MaxTextureCoordUnits; i++) _mesa_vector4f_init( &tmp->TexCoord[i], 0, 0); /* Install the first immediate. Intially outside begin/end. |