Rename the various function types in t_context.h to include a tnl_ prefix.

5 files changed, 18 insertions, 18 deletions

diff --git a/src/mesa/drivers/dri/unichrome/via_dmatmp.h b/src/mesa/drivers/dri/unichrome/via_dmatmp.h
index 5808b505f3..0253d7b57f 100644
--- a/src/mesa/drivers/dri/unichrome/via_dmatmp.h
+++ b/src/mesa/drivers/dri/unichrome/via_dmatmp.h
@@ -579,7 +579,7 @@ static void TAG(render_noop)(GLcontext *ctx,
 }
 
 
-static render_func TAG(render_tab_verts)[GL_POLYGON + 2] =
+static tnl_render_func TAG(render_tab_verts)[GL_POLYGON + 2] =
 {
     TAG(render_points_verts),
     TAG(render_lines_verts),
diff --git a/src/mesa/drivers/dri/unichrome/via_render.c b/src/mesa/drivers/dri/unichrome/via_render.c
index 9f87533e3d..210248ff4b 100644
--- a/src/mesa/drivers/dri/unichrome/via_render.c
+++ b/src/mesa/drivers/dri/unichrome/via_render.c
@@ -321,9 +321,9 @@ const struct tnl_pipeline_stage _via_fastrender_stage =
     const GLuint * const elt = VB->Elts;				\
     const GLubyte *mask = VB->ClipMask;					\
     const GLuint sz = VB->ClipPtr->size;				\
-    const line_func LineFunc = tnl->Driver.Render.Line;			\
-    const triangle_func TriangleFunc = tnl->Driver.Render.Triangle;	\
-    const quad_func QuadFunc = tnl->Driver.Render.Quad;			\
+    const tnl_line_func LineFunc = tnl->Driver.Render.Line;			\
+    const tnl_triangle_func TriangleFunc = tnl->Driver.Render.Triangle;	\
+    const tnl_quad_func QuadFunc = tnl->Driver.Render.Quad;			\
     const GLboolean stipple = ctx->Line.StippleFlag;			\
     (void) (LineFunc && TriangleFunc && QuadFunc);			\
     (void) elt; (void) mask; (void) sz; (void) stipple;
@@ -355,7 +355,7 @@ static void clip_elt_triangles(GLcontext *ctx,
 			       GLuint flags)
 {
     TNLcontext *tnl = TNL_CONTEXT(ctx);
-    render_func render_tris = tnl->Driver.Render.PrimTabElts[GL_TRIANGLES];
+    tnl_render_func render_tris = tnl->Driver.Render.PrimTabElts[GL_TRIANGLES];
     struct vertex_buffer *VB = &tnl->vb;
     const GLuint * const elt = VB->Elts;
     GLubyte *mask = VB->ClipMask;
@@ -423,7 +423,7 @@ static GLboolean via_run_render(GLcontext *ctx,
     GLuint newInputs = stage->changed_inputs;
     /*GLuint newInputs = stage->inputs;*/
     
-    render_func *tab;
+    tnl_render_func *tab;
     GLuint pass = 0;
     
 #ifdef DEBUG
diff --git a/src/mesa/drivers/dri/unichrome/via_tris.c b/src/mesa/drivers/dri/unichrome/via_tris.c
index 61f80ae970..423b1372a7 100644
--- a/src/mesa/drivers/dri/unichrome/via_tris.c
+++ b/src/mesa/drivers/dri/unichrome/via_tris.c
@@ -229,10 +229,10 @@ static __inline__ void via_draw_line(viaContextPtr vmesa,
 
 
 static struct {
-    points_func          points;
-    line_func            line;
-    triangle_func        triangle;
-    quad_func            quad;
+    tnl_points_func          points;
+    tnl_line_func            line;
+    tnl_triangle_func        triangle;
+    tnl_quad_func            quad;
 } rast_tab[VIA_MAX_TRIFUNC];
 
 
@@ -551,9 +551,9 @@ via_fallback_point(viaContextPtr vmesa,
     TNLcontext *tnl = TNL_CONTEXT(ctx);					\
     struct vertex_buffer *VB = &tnl->vb;				\
     const GLuint * const elt = VB->Elts;				\
-    const line_func LineFunc = tnl->Driver.Render.Line;			\
-    const triangle_func TriangleFunc = tnl->Driver.Render.Triangle;	\
-    const quad_func QuadFunc = tnl->Driver.Render.Quad;			\
+    const tnl_line_func LineFunc = tnl->Driver.Render.Line;			\
+    const tnl_triangle_func TriangleFunc = tnl->Driver.Render.Triangle;	\
+    const tnl_quad_func QuadFunc = tnl->Driver.Render.Quad;			\
     const GLboolean stipple = ctx->Line.StippleFlag;			\
     (void) (LineFunc && TriangleFunc && QuadFunc);			\
     (void) elt; (void) stipple;
diff --git a/src/mesa/drivers/dri/unichrome/via_vb.c b/src/mesa/drivers/dri/unichrome/via_vb.c
index 6e8a537181..f0a0edfbd1 100644
--- a/src/mesa/drivers/dri/unichrome/via_vb.c
+++ b/src/mesa/drivers/dri/unichrome/via_vb.c
@@ -39,8 +39,8 @@
 
 static struct {
     void                (*emit)(GLcontext *, GLuint, GLuint, void *, GLuint);
-    interp_func          interp;
-    copy_pv_func         copyPv;
+    tnl_interp_func          interp;
+    tnl_copy_pv_func         copyPv;
     GLboolean           (*check_tex_sizes)(GLcontext *ctx);
     GLuint               vertexSize;
     GLuint               vertexStrideShift;
diff --git a/src/mesa/drivers/dri/unichrome/via_vb_cliptmp.h b/src/mesa/drivers/dri/unichrome/via_vb_cliptmp.h
index 99f90003e1..fd9f39a058 100644
--- a/src/mesa/drivers/dri/unichrome/via_vb_cliptmp.h
+++ b/src/mesa/drivers/dri/unichrome/via_vb_cliptmp.h
@@ -119,7 +119,7 @@ TAG(clip_line)(GLcontext *ctx, GLuint i, GLuint j, GLubyte mask)
 {
     TNLcontext *tnl = TNL_CONTEXT(ctx);
     struct vertex_buffer *VB = &tnl->vb;
-    interp_func interp = tnl->Driver.Render.Interp;
+    tnl_interp_func interp = tnl->Driver.Render.Interp;
     GLfloat (*coord)[4] = VB->ClipPtr->data;
     GLuint ii = i, jj = j, p;
 #ifdef DEBUG    
@@ -168,7 +168,7 @@ TAG(clip_tri)(GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2, GLubyte mask)
 {
     TNLcontext *tnl = TNL_CONTEXT(ctx);
     struct vertex_buffer *VB = &tnl->vb;
-    interp_func interp = tnl->Driver.Render.Interp;
+    tnl_interp_func interp = tnl->Driver.Render.Interp;
     GLfloat (*coord)[4] = VB->ClipPtr->data;
     GLuint pv = v2;
     GLuint vlist[2][MAX_CLIPPED_VERTICES];
@@ -224,7 +224,7 @@ TAG(clip_quad)(GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint v3,
 {
     TNLcontext *tnl = TNL_CONTEXT(ctx);
     struct vertex_buffer *VB = &tnl->vb;
-    interp_func interp = tnl->Driver.Render.Interp;
+    tnl_interp_func interp = tnl->Driver.Render.Interp;
     GLfloat (*coord)[4] = VB->ClipPtr->data;
     GLuint pv = v3;
     GLuint vlist[2][MAX_CLIPPED_VERTICES];