diff options
Diffstat (limited to 'src/mesa/tnl/t_vb_texmat.c')
| -rw-r--r-- | src/mesa/tnl/t_vb_texmat.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/mesa/tnl/t_vb_texmat.c b/src/mesa/tnl/t_vb_texmat.c index 49fb2e1753e..6fd08d480bc 100644 --- a/src/mesa/tnl/t_vb_texmat.c +++ b/src/mesa/tnl/t_vb_texmat.c @@ -1,10 +1,10 @@ -/* $Id: t_vb_texmat.c,v 1.3 2001/03/07 05:06:13 brianp Exp $ */ +/* $Id: t_vb_texmat.c,v 1.4 2001/03/12 00:48:44 gareth Exp $ */ /* * Mesa 3-D graphics library * Version: 3.5 * - * Copyright (C) 1999-2000 Brian Paul All Rights Reserved. + * Copyright (C) 1999-2001 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,7 +23,7 @@ * 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: + * Authors: * Keith Whitwell <keithw@valinux.com> */ @@ -44,7 +44,7 @@ /* 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. @@ -63,27 +63,27 @@ static void check_texmat( GLcontext *ctx, struct gl_pipeline_stage *stage ) if (ctx->_Enabled & ENABLE_TEXMAT_ANY) { GLuint flags = 0; - for (i = 0 ; i < ctx->Const.MaxTextureUnits ; i++) - if (ctx->_Enabled & ENABLE_TEXMAT(i)) + for (i = 0 ; i < ctx->Const.MaxTextureUnits ; i++) + if (ctx->_Enabled & ENABLE_TEXMAT(i)) flags |= VERT_TEX(i); - + stage->active = 1; stage->inputs = flags; stage->outputs = flags; } } -static GLboolean run_texmat_stage( GLcontext *ctx, +static GLboolean run_texmat_stage( GLcontext *ctx, struct gl_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++) + 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], @@ -97,10 +97,10 @@ static GLboolean run_texmat_stage( GLcontext *ctx, /* Called the first time stage->run() is invoked. */ -static GLboolean alloc_texmat_data( GLcontext *ctx, +static GLboolean alloc_texmat_data( GLcontext *ctx, struct gl_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; @@ -132,11 +132,11 @@ static void free_texmat_data( struct gl_pipeline_stage *stage ) stage->privatePtr = 0; } } - -const struct gl_pipeline_stage _tnl_texture_transform_stage = -{ + +const struct gl_pipeline_stage _tnl_texture_transform_stage = +{ "texture transform", _NEW_TEXTURE|_NEW_TEXTURE_MATRIX, _NEW_TEXTURE|_NEW_TEXTURE_MATRIX, |