X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Ftnl%2Ft_vb_texmat.c;h=00330b689aebb9aa8abfe3a9df15ce5856ed6468;hb=5a382001224df9aad6137c825fbfc2d058b220b1;hp=49fb2e1753eb12fca46594625233284d3962224f;hpb=b51b0a847d7e7daaea69f77ab569086ef81c24a2;p=mesa.git diff --git a/src/mesa/tnl/t_vb_texmat.c b/src/mesa/tnl/t_vb_texmat.c index 49fb2e1753e..00330b689ae 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.3 2001/03/07 05:06:13 brianp Exp $ */ - /* * Mesa 3-D graphics library - * Version: 3.5 + * Version: 6.1 * - * Copyright (C) 1999-2000 Brian Paul All Rights Reserved. + * Copyright (C) 1999-2004 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"), @@ -23,8 +21,8 @@ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * - * Author: - * Keith Whitwell + * Authors: + * Keith Whitwell */ @@ -32,8 +30,7 @@ #include "colormac.h" #include "context.h" #include "macros.h" -#include "mem.h" -#include "mmath.h" +#include "imports.h" #include "mtypes.h" #include "math/m_xform.h" @@ -44,52 +41,54 @@ /* Is there any real benefit seperating texmat from texgen? It means * we need two lots of intermediate storage. Any changes to * _NEW_TEXTURE will invalidate both sets -- it's only on changes to - * *only* _NEW_TEXTURE_MATRIX that texgen survives but texmat doesn't. + * *only* _NEW_TEXTURE_MATRIX that texgen survives but texmat doesn't. * * However, the seperation of this code from the complex texgen stuff * is very appealing. */ struct texmat_stage_data { - GLvector4f texcoord[MAX_TEXTURE_UNITS]; + GLvector4f texcoord[MAX_TEXTURE_COORD_UNITS]; }; #define TEXMAT_STAGE_DATA(stage) ((struct texmat_stage_data *)stage->privatePtr) -static void check_texmat( GLcontext *ctx, struct gl_pipeline_stage *stage ) +static void check_texmat( GLcontext *ctx, struct tnl_pipeline_stage *stage ) { GLuint i; stage->active = 0; - if (ctx->_Enabled & ENABLE_TEXMAT_ANY) { + if (ctx->Texture._TexMatEnabled && !ctx->VertexProgram._Enabled) { GLuint flags = 0; - for (i = 0 ; i < ctx->Const.MaxTextureUnits ; i++) - if (ctx->_Enabled & ENABLE_TEXMAT(i)) - flags |= VERT_TEX(i); - + for (i = 0 ; i < ctx->Const.MaxTextureCoordUnits ; i++) + if (ctx->Texture._TexMatEnabled & ENABLE_TEXMAT(i)) + flags |= _TNL_BIT_TEX(i); + stage->active = 1; stage->inputs = flags; stage->outputs = flags; } } -static GLboolean run_texmat_stage( GLcontext *ctx, - struct gl_pipeline_stage *stage ) +static GLboolean run_texmat_stage( GLcontext *ctx, + struct tnl_pipeline_stage *stage ) { struct texmat_stage_data *store = TEXMAT_STAGE_DATA(stage); - struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb; + struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb; GLuint i; /* 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++) - if (ctx->_Enabled & ENABLE_TEXMAT(i)) { - if (stage->changed_inputs & VERT_TEX(i)) - (void) TransformRaw( &store->texcoord[i], &ctx->TextureMatrix[i], + for (i = 0 ; i < ctx->Const.MaxTextureCoordUnits ; i++) + if (ctx->Texture._TexMatEnabled & ENABLE_TEXMAT(i)) { + if (stage->changed_inputs & _TNL_BIT_TEX(i)) + (void) TransformRaw( &store->texcoord[i], + ctx->TextureMatrixStack[i].Top, VB->TexCoordPtr[i]); - VB->TexCoordPtr[i] = &store->texcoord[i]; + VB->AttribPtr[VERT_ATTRIB_TEX0+i] = + VB->TexCoordPtr[i] = &store->texcoord[i]; } return GL_TRUE; } @@ -97,10 +96,10 @@ static GLboolean run_texmat_stage( GLcontext *ctx, /* Called the first time stage->run() is invoked. */ -static GLboolean alloc_texmat_data( GLcontext *ctx, - struct gl_pipeline_stage *stage ) +static GLboolean alloc_texmat_data( GLcontext *ctx, + struct tnl_pipeline_stage *stage ) { - struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb; + struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb; struct texmat_stage_data *store; GLuint i; @@ -109,7 +108,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. @@ -119,30 +118,33 @@ static GLboolean alloc_texmat_data( GLcontext *ctx, } -static void free_texmat_data( struct gl_pipeline_stage *stage ) +static void free_texmat_data( struct tnl_pipeline_stage *stage ) { struct texmat_stage_data *store = TEXMAT_STAGE_DATA(stage); GLuint i; if (store) { - for (i = 0 ; i < MAX_TEXTURE_UNITS ; i++) + for (i = 0; i < MAX_TEXTURE_COORD_UNITS; i++) if (store->texcoord[i].data) _mesa_vector4f_free( &store->texcoord[i] ); FREE( store ); - stage->privatePtr = 0; + stage->privatePtr = NULL; } } - - - -const struct gl_pipeline_stage _tnl_texture_transform_stage = -{ - "texture transform", - _NEW_TEXTURE|_NEW_TEXTURE_MATRIX, - _NEW_TEXTURE|_NEW_TEXTURE_MATRIX, - 0,0,0, /* active, inputs, outputs */ - 0,0, /* changed_inputs, private */ - free_texmat_data, /* destructor */ - check_texmat, /* check */ - alloc_texmat_data, /* run -- initially set to init */ + + + +const struct tnl_pipeline_stage _tnl_texture_transform_stage = +{ + "texture transform", /* name */ + _NEW_TEXTURE|_NEW_TEXTURE_MATRIX|_NEW_PROGRAM, /* check_state */ + _NEW_TEXTURE|_NEW_TEXTURE_MATRIX, /* run_state */ + GL_FALSE, /* active? */ + 0, /* inputs */ + 0, /* outputs */ + 0, /* changed_inputs */ + NULL, /* private data */ + free_texmat_data, /* destructor */ + check_texmat, /* check */ + alloc_texmat_data, /* run -- initially set to init */ };