From b48c575983dcd6bbffa3925565d45cadbb95fae2 Mon Sep 17 00:00:00 2001 From: Keith Whitwell Date: Wed, 31 Mar 2004 06:36:30 +0000 Subject: dynfn --> _tnl_dynfn --- src/mesa/tnl/t_context.h | 20 ++++++++++---------- src/mesa/tnl/t_vtx_api.c | 12 ++++++------ src/mesa/tnl/t_vtx_api.h | 2 +- src/mesa/tnl/t_vtx_x86.c | 22 +++++++++++----------- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/mesa/tnl/t_context.h b/src/mesa/tnl/t_context.h index ec5675faf91..d20f126c5d5 100644 --- a/src/mesa/tnl/t_context.h +++ b/src/mesa/tnl/t_context.h @@ -251,20 +251,20 @@ struct tnl_copied_vtx { typedef void (*attrfv_func)( const GLfloat * ); -struct dynfn { - struct dynfn *next, *prev; +struct _tnl_dynfn { + struct _tnl_dynfn *next, *prev; int key; char *code; }; -struct dynfn_lists { - struct dynfn Vertex[4]; - struct dynfn Attribute[4]; +struct _tnl_dynfn_lists { + struct _tnl_dynfn Vertex[4]; + struct _tnl_dynfn Attribute[4]; }; -struct dynfn_generators { - struct dynfn *(*Vertex[4])( GLcontext *ctx, int key ); - struct dynfn *(*Attribute[4])( GLcontext *ctx, int key ); +struct _tnl_dynfn_generators { + struct _tnl_dynfn *(*Vertex[4])( GLcontext *ctx, int key ); + struct _tnl_dynfn *(*Attribute[4])( GLcontext *ctx, int key ); }; #define _TNL_MAX_ATTR_CODEGEN 16 @@ -290,8 +290,8 @@ struct tnl_vtx { attrfv_func tabfv[_TNL_MAX_ATTR_CODEGEN+1][4]; /* plus 1 for ERROR_ATTRIB */ - struct dynfn_lists cache; - struct dynfn_generators gen; + struct _tnl_dynfn_lists cache; + struct _tnl_dynfn_generators gen; struct tnl_eval eval; GLboolean *edgeflag_tmp; diff --git a/src/mesa/tnl/t_vtx_api.c b/src/mesa/tnl/t_vtx_api.c index 1756617f5c8..6dcd8b43a0b 100644 --- a/src/mesa/tnl/t_vtx_api.c +++ b/src/mesa/tnl/t_vtx_api.c @@ -330,9 +330,9 @@ static void _tnl_fixup_vertex( GLcontext *ctx, GLuint attr, GLuint sz ) } -static struct dynfn *lookup( struct dynfn *l, GLuint key ) +static struct _tnl_dynfn *lookup( struct _tnl_dynfn *l, GLuint key ) { - struct dynfn *f; + struct _tnl_dynfn *f; foreach( f, l ) { if (f->key == key) @@ -346,7 +346,7 @@ static struct dynfn *lookup( struct dynfn *l, GLuint key ) static attrfv_func do_codegen( GLcontext *ctx, GLuint attr, GLuint sz ) { TNLcontext *tnl = TNL_CONTEXT(ctx); - struct dynfn *dfn = 0; + struct _tnl_dynfn *dfn = 0; if (attr == 0) { GLuint key = tnl->vtx.vertex_size; @@ -846,7 +846,7 @@ static void _tnl_current_init( GLcontext *ctx ) tnl->vtx.current[_TNL_ATTRIB_INDEX] = &ctx->Current.Index; } -static struct dynfn *no_codegen( GLcontext *ctx, int key ) +static struct _tnl_dynfn *no_codegen( GLcontext *ctx, int key ) { return 0; } @@ -913,9 +913,9 @@ void _tnl_vtx_init( GLcontext *ctx ) tnl->vtx.have_materials = 0; } -static void free_funcs( struct dynfn *l ) +static void free_funcs( struct _tnl_dynfn *l ) { - struct dynfn *f, *tmp; + struct _tnl_dynfn *f, *tmp; foreach_s (f, tmp, l) { remove_from_list( f ); ALIGN_FREE( f->code ); diff --git a/src/mesa/tnl/t_vtx_api.h b/src/mesa/tnl/t_vtx_api.h index 5e4ab71a08b..85cc33f0718 100644 --- a/src/mesa/tnl/t_vtx_api.h +++ b/src/mesa/tnl/t_vtx_api.h @@ -76,7 +76,7 @@ extern void _tnl_generic_attr_table_init( attrfv_func (*tab)[4] ); /* t_vtx_x86.c: */ -extern void _tnl_InitX86Codegen( struct dynfn_generators *gen ); +extern void _tnl_InitX86Codegen( struct _tnl_dynfn_generators *gen ); diff --git a/src/mesa/tnl/t_vtx_x86.c b/src/mesa/tnl/t_vtx_x86.c index 90a6bd06d4e..d082ef82bb5 100644 --- a/src/mesa/tnl/t_vtx_x86.c +++ b/src/mesa/tnl/t_vtx_x86.c @@ -79,7 +79,7 @@ static void notify( void ) #define DFN( FUNC, CACHE, KEY ) \ - struct dynfn *dfn = MALLOC_STRUCT( dynfn ); \ + struct _tnl_dynfn *dfn = MALLOC_STRUCT( _tnl_dynfn ); \ char *start = (char *)&FUNC; \ char *end = (char *)&FUNC##_end; \ int offset = 0; \ @@ -114,7 +114,7 @@ do { \ * the current state. Generic x86 versions. */ -static struct dynfn *makeX86Vertex1fv( GLcontext *ctx, int vertex_size ) +static struct _tnl_dynfn *makeX86Vertex1fv( GLcontext *ctx, int vertex_size ) { TNLcontext *tnl = TNL_CONTEXT(ctx); DFN ( _x86_Vertex1fv, tnl->vtx.cache.Vertex[1-1], vertex_size ); @@ -130,7 +130,7 @@ static struct dynfn *makeX86Vertex1fv( GLcontext *ctx, int vertex_size ) return dfn; } -static struct dynfn *makeX86Vertex2fv( GLcontext *ctx, int vertex_size ) +static struct _tnl_dynfn *makeX86Vertex2fv( GLcontext *ctx, int vertex_size ) { TNLcontext *tnl = TNL_CONTEXT(ctx); DFN ( _x86_Vertex2fv, tnl->vtx.cache.Vertex[2-1], vertex_size ); @@ -146,7 +146,7 @@ static struct dynfn *makeX86Vertex2fv( GLcontext *ctx, int vertex_size ) return dfn; } -static struct dynfn *makeX86Vertex3fv( GLcontext *ctx, int vertex_size ) +static struct _tnl_dynfn *makeX86Vertex3fv( GLcontext *ctx, int vertex_size ) { TNLcontext *tnl = TNL_CONTEXT(ctx); DFN ( _x86_Vertex3fv, tnl->vtx.cache.Vertex[3-1], vertex_size ); @@ -161,7 +161,7 @@ static struct dynfn *makeX86Vertex3fv( GLcontext *ctx, int vertex_size ) return dfn; } -static struct dynfn *makeX86Vertex4fv( GLcontext *ctx, int vertex_size ) +static struct _tnl_dynfn *makeX86Vertex4fv( GLcontext *ctx, int vertex_size ) { TNLcontext *tnl = TNL_CONTEXT(ctx); DFN ( _x86_Vertex4fv, tnl->vtx.cache.Vertex[4-1], vertex_size ); @@ -178,7 +178,7 @@ static struct dynfn *makeX86Vertex4fv( GLcontext *ctx, int vertex_size ) } -static struct dynfn *makeX86Attribute1fv( GLcontext *ctx, int dest ) +static struct _tnl_dynfn *makeX86Attribute1fv( GLcontext *ctx, int dest ) { TNLcontext *tnl = TNL_CONTEXT(ctx); DFN ( _x86_Attribute1fv, tnl->vtx.cache.Attribute[1-1], dest ); @@ -188,7 +188,7 @@ static struct dynfn *makeX86Attribute1fv( GLcontext *ctx, int dest ) return dfn; } -static struct dynfn *makeX86Attribute2fv( GLcontext *ctx, int dest ) +static struct _tnl_dynfn *makeX86Attribute2fv( GLcontext *ctx, int dest ) { TNLcontext *tnl = TNL_CONTEXT(ctx); DFN ( _x86_Attribute2fv, tnl->vtx.cache.Attribute[2-1], dest ); @@ -199,7 +199,7 @@ static struct dynfn *makeX86Attribute2fv( GLcontext *ctx, int dest ) return dfn; } -static struct dynfn *makeX86Attribute3fv( GLcontext *ctx, int dest ) +static struct _tnl_dynfn *makeX86Attribute3fv( GLcontext *ctx, int dest ) { TNLcontext *tnl = TNL_CONTEXT(ctx); DFN ( _x86_Attribute3fv, tnl->vtx.cache.Attribute[3-1], dest ); @@ -211,7 +211,7 @@ static struct dynfn *makeX86Attribute3fv( GLcontext *ctx, int dest ) return dfn; } -static struct dynfn *makeX86Attribute4fv( GLcontext *ctx, int dest ) +static struct _tnl_dynfn *makeX86Attribute4fv( GLcontext *ctx, int dest ) { TNLcontext *tnl = TNL_CONTEXT(ctx); DFN ( _x86_Attribute4fv, tnl->vtx.cache.Attribute[4-1], dest ); @@ -225,7 +225,7 @@ static struct dynfn *makeX86Attribute4fv( GLcontext *ctx, int dest ) } -void _tnl_InitX86Codegen( struct dynfn_generators *gen ) +void _tnl_InitX86Codegen( struct _tnl_dynfn_generators *gen ) { gen->Vertex[0] = makeX86Vertex1fv; gen->Vertex[1] = makeX86Vertex2fv; @@ -243,7 +243,7 @@ void _do_choose( void ) #else -void _tnl_InitX86Codegen( struct dynfn_generators *gen ) +void _tnl_InitX86Codegen( struct _tnl_dynfn_generators *gen ) { (void) gen; } -- cgit v1.2.3