diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2001-12-18 04:06:44 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2001-12-18 04:06:44 +0000 |
| commit | 30f51ae067379c2b3573c06b707d25a9704df7be (patch) | |
| tree | 401d75d291724d0d3a47be29d4d3512dcdb66a5a /src/mesa/tnl/t_vb_texmat.c | |
| parent | 645ced29552da1af5c759d0497d98c8f55b72935 (diff) | |
Replace old matrix stacks with new code based on struct matrix_stack.
Moved vertex program hash table into shared context state.
Implemented reference counting for vertex programs.
Replaced tnl "ProjectedClip" with "Ndc" (normalized device coordinates).
Diffstat (limited to 'src/mesa/tnl/t_vb_texmat.c')
| -rw-r--r-- | src/mesa/tnl/t_vb_texmat.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mesa/tnl/t_vb_texmat.c b/src/mesa/tnl/t_vb_texmat.c index a0ed3e5899..8cff96a74a 100644 --- a/src/mesa/tnl/t_vb_texmat.c +++ b/src/mesa/tnl/t_vb_texmat.c @@ -1,4 +1,4 @@ -/* $Id: t_vb_texmat.c,v 1.6 2001/12/14 02:51:45 brianp Exp $ */ +/* $Id: t_vb_texmat.c,v 1.7 2001/12/18 04:06:46 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -86,7 +86,8 @@ static GLboolean run_texmat_stage( GLcontext *ctx, for (i = 0 ; i < ctx->Const.MaxTextureUnits ; i++) if (ctx->Texture._TexMatEnabled & ENABLE_TEXMAT(i)) { if (stage->changed_inputs & VERT_TEX(i)) - (void) TransformRaw( &store->texcoord[i], &ctx->TextureMatrix[i], + (void) TransformRaw( &store->texcoord[i], + ctx->TextureMatrixStack[i].Top, VB->TexCoordPtr[i]); VB->TexCoordPtr[i] = &store->texcoord[i]; |