diff options
author | Keith Whitwell <keith@tungstengraphics.com> | 2005-04-22 12:51:19 +0000 |
---|---|---|
committer | Keith Whitwell <keith@tungstengraphics.com> | 2005-04-22 12:51:19 +0000 |
commit | 6f973f33679e034b7cb63806f1ddfabdbdd70123 (patch) | |
tree | 31580bc32d1b87a3dddd8f7c8bc5f404b407c637 /src/mesa/tnl/t_vb_texmat.c | |
parent | 6a13c7da4c79f7e811fbddc68f59441070ff0cc8 (diff) |
Simplify the pipeline_stage structure
- remove input/output fields, input tracking removed.
- remove state fields, the validate function now called
on every statechange.
- add an explicit 'create' function.
Add in code to build vertex program to implement current t&l state. Still
disabled, but turn on with a #define in t_vp_build.h.
Diffstat (limited to 'src/mesa/tnl/t_vb_texmat.c')
-rw-r--r-- | src/mesa/tnl/t_vb_texmat.c | 46 |
1 files changed, 13 insertions, 33 deletions
diff --git a/src/mesa/tnl/t_vb_texmat.c b/src/mesa/tnl/t_vb_texmat.c index 00330b689a..2347530385 100644 --- a/src/mesa/tnl/t_vb_texmat.c +++ b/src/mesa/tnl/t_vb_texmat.c @@ -52,23 +52,7 @@ struct texmat_stage_data { #define TEXMAT_STAGE_DATA(stage) ((struct texmat_stage_data *)stage->privatePtr) -static void check_texmat( GLcontext *ctx, struct tnl_pipeline_stage *stage ) -{ - GLuint i; - stage->active = 0; - - if (ctx->Texture._TexMatEnabled && !ctx->VertexProgram._Enabled) { - GLuint flags = 0; - 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 tnl_pipeline_stage *stage ) @@ -77,19 +61,23 @@ static GLboolean run_texmat_stage( GLcontext *ctx, struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb; GLuint i; + if (!ctx->Texture._TexMatEnabled || ctx->VertexProgram._Enabled) + return GL_TRUE; + /* 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.MaxTextureCoordUnits ; 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]); + (void) TransformRaw( &store->texcoord[i], + ctx->TextureMatrixStack[i].Top, + VB->TexCoordPtr[i]); VB->AttribPtr[VERT_ATTRIB_TEX0+i] = VB->TexCoordPtr[i] = &store->texcoord[i]; } + } + return GL_TRUE; } @@ -111,10 +99,7 @@ static GLboolean alloc_texmat_data( GLcontext *ctx, for (i = 0 ; i < ctx->Const.MaxTextureCoordUnits ; i++) _mesa_vector4f_alloc( &store->texcoord[i], 0, VB->Size, 32 ); - /* Now run the stage. - */ - stage->run = run_texmat_stage; - return stage->run( ctx, stage ); + return GL_TRUE; } @@ -137,14 +122,9 @@ static void free_texmat_data( struct tnl_pipeline_stage *stage ) 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 */ + alloc_texmat_data, free_texmat_data, /* destructor */ - check_texmat, /* check */ - alloc_texmat_data, /* run -- initially set to init */ + NULL, + run_texmat_stage, }; |