diff options
| author | Brian Paul <[email protected]> | 2006-07-20 16:49:57 +0000 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2006-07-20 16:49:57 +0000 |
| commit | 122629f27925a9dc50029bebc5079f87f416a7e1 (patch) | |
| tree | f8800f9e5f4fff6bbd6c6496d5c74f8685b63372 /src/mesa/tnl/t_vp_build.c | |
| parent | 459db7bd72131e63ed7687956819c4d0520972dd (diff) | |
Some structure renaming. Prefix vertex/fragment-related structs with
"gl_" to match other structs.
Diffstat (limited to 'src/mesa/tnl/t_vp_build.c')
| -rw-r--r-- | src/mesa/tnl/t_vp_build.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/mesa/tnl/t_vp_build.c b/src/mesa/tnl/t_vp_build.c index 4387e066fcd..3a66a54715e 100644 --- a/src/mesa/tnl/t_vp_build.c +++ b/src/mesa/tnl/t_vp_build.c @@ -115,7 +115,7 @@ static struct state_key *make_state_key( GLcontext *ctx ) { TNLcontext *tnl = TNL_CONTEXT(ctx); struct vertex_buffer *VB = &tnl->vb; - const struct fragment_program *fp = ctx->FragmentProgram._Current; + const struct gl_fragment_program *fp = ctx->FragmentProgram._Current; struct state_key *key = CALLOC_STRUCT(state_key); GLuint i; @@ -257,7 +257,7 @@ struct ureg { struct tnl_program { const struct state_key *state; - struct vertex_program *program; + struct gl_vertex_program *program; GLuint temp_in_use; GLuint temp_reserved; @@ -1388,7 +1388,7 @@ static void build_tnl_program( struct tnl_program *p ) static void create_new_program( const struct state_key *key, - struct vertex_program *program, + struct gl_vertex_program *program, GLuint max_temps) { struct tnl_program p; @@ -1493,7 +1493,7 @@ void _tnl_UpdateFixedFunctionProgram( GLcontext *ctx ) TNLcontext *tnl = TNL_CONTEXT(ctx); struct state_key *key; GLuint hash; - const struct vertex_program *prev = ctx->VertexProgram._Current; + const struct gl_vertex_program *prev = ctx->VertexProgram._Current; if (ctx->VertexProgram._Enabled == GL_FALSE) { /* Grab all the relevent state and put it in a single structure: @@ -1503,7 +1503,7 @@ void _tnl_UpdateFixedFunctionProgram( GLcontext *ctx ) /* Look for an already-prepared program for this state: */ - ctx->_TnlProgram = (struct vertex_program *) + ctx->_TnlProgram = (struct gl_vertex_program *) search_cache( tnl->vp_cache, hash, key, sizeof(*key) ); /* OK, we'll have to build a new one: @@ -1512,7 +1512,7 @@ void _tnl_UpdateFixedFunctionProgram( GLcontext *ctx ) if (0) _mesa_printf("Build new TNL program\n"); - ctx->_TnlProgram = (struct vertex_program *) + ctx->_TnlProgram = (struct gl_vertex_program *) ctx->Driver.NewProgram(ctx, GL_VERTEX_PROGRAM_ARB, 0); create_new_program( key, ctx->_TnlProgram, @@ -1540,8 +1540,8 @@ void _tnl_UpdateFixedFunctionProgram( GLcontext *ctx ) */ if (ctx->VertexProgram._Current != prev && ctx->Driver.BindProgram) - ctx->Driver.BindProgram(ctx, GL_VERTEX_PROGRAM_ARB, (struct program *) - ctx->VertexProgram._Current); + ctx->Driver.BindProgram(ctx, GL_VERTEX_PROGRAM_ARB, + (struct gl_program *) ctx->VertexProgram._Current); } void _tnl_ProgramCacheInit( GLcontext *ctx ) |