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_vb_texmat.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_vb_texmat.c')
| -rw-r--r-- | src/mesa/tnl/t_vb_texmat.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/mesa/tnl/t_vb_texmat.c b/src/mesa/tnl/t_vb_texmat.c index b92eaae53f2..3d5c43dd637 100644 --- a/src/mesa/tnl/t_vb_texmat.c +++ b/src/mesa/tnl/t_vb_texmat.c @@ -1,10 +1,8 @@ -/* $Id: t_vb_texmat.c,v 1.12 2003/03/01 01:50:28 brianp Exp $ */ - /* * Mesa 3-D graphics library * Version: 5.1 * - * Copyright (C) 1999-2002 Brian Paul All Rights Reserved. + * Copyright (C) 1999-2003 Brian Paul All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -62,7 +60,7 @@ static void check_texmat( GLcontext *ctx, struct gl_pipeline_stage *stage ) if (ctx->Texture._TexMatEnabled && !ctx->VertexProgram.Enabled) { GLuint flags = 0; - for (i = 0 ; i < ctx->Const.MaxTextureUnits ; i++) + for (i = 0 ; i < ctx->Const.MaxTextureCoordUnits ; i++) if (ctx->Texture._TexMatEnabled & ENABLE_TEXMAT(i)) flags |= VERT_BIT_TEX(i); @@ -82,7 +80,7 @@ static GLboolean run_texmat_stage( GLcontext *ctx, /* ENABLE_TEXMAT implies that the texture matrix is not the * identity, so we don't have to check that here. */ - for (i = 0 ; i < ctx->Const.MaxTextureUnits ; i++) + for (i = 0 ; i < ctx->Const.MaxTextureCoordUnits ; i++) if (ctx->Texture._TexMatEnabled & ENABLE_TEXMAT(i)) { if (stage->changed_inputs & VERT_BIT_TEX(i)) (void) TransformRaw( &store->texcoord[i], @@ -109,7 +107,7 @@ static GLboolean alloc_texmat_data( GLcontext *ctx, if (!store) return GL_FALSE; - for (i = 0 ; i < ctx->Const.MaxTextureUnits ; i++) + for (i = 0 ; i < ctx->Const.MaxTextureCoordUnits ; i++) _mesa_vector4f_alloc( &store->texcoord[i], 0, VB->Size, 32 ); /* Now run the stage. |