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

36 files changed, 142 insertions, 142 deletions

diff --git a/src/mesa/drivers/dri/ffb/ffb_tris.c b/src/mesa/drivers/dri/ffb/ffb_tris.c
index 62c74247b07..ca0e514dc0e 100644
--- a/src/mesa/drivers/dri/ffb/ffb_tris.c
+++ b/src/mesa/drivers/dri/ffb/ffb_tris.c
@@ -306,8 +306,8 @@ static void ffbRasterPrimitive(GLcontext *ctx, GLenum rprim);
 #define FFB_MAX_TRIFUNC 	0x08
 
 static struct {
-	triangle_func triangle;
-	quad_func quad;
+	tnl_triangle_func triangle;
+	tnl_quad_func quad;
 } rast_tab[FFB_MAX_TRIFUNC];
 
 #define DO_OFFSET   (IND & FFB_OFFSET_BIT)
@@ -549,13 +549,13 @@ static void init_render_tab(void)
 		render_tab_flat_alpha_tricull_elt;
 
 	for (i = 0; i < MAX_FFB_RENDER_FUNCS; i++) {
-		render_func *rf = render_tabs[i];
-		render_func *rfe = render_tabs_elt[i];
+		tnl_render_func *rf = render_tabs[i];
+		tnl_render_func *rfe = render_tabs_elt[i];
 
 		if (i & FFB_TRI_CULL_BIT) {
 			int from_idx = (i & ~FFB_TRI_CULL_BIT);
-			render_func *rf_from = render_tabs[from_idx];
-			render_func *rfe_from = render_tabs_elt[from_idx];
+			tnl_render_func *rf_from = render_tabs[from_idx];
+			tnl_render_func *rfe_from = render_tabs_elt[from_idx];
 			int j;
 
 			for (j = GL_POINTS; j < GL_TRIANGLES; j++) {
diff --git a/src/mesa/drivers/dri/ffb/ffb_vb.c b/src/mesa/drivers/dri/ffb/ffb_vb.c
index 5b8e5923a5f..6ba1eabbf24 100644
--- a/src/mesa/drivers/dri/ffb/ffb_vb.c
+++ b/src/mesa/drivers/dri/ffb/ffb_vb.c
@@ -78,7 +78,7 @@ typedef void (*ffb_emit_func)(GLcontext *, GLuint, GLuint);
 
 static struct {
  	ffb_emit_func	emit;
-	interp_func	interp;
+	tnl_interp_func	interp;
 } setup_tab[FFB_VB_MAX];
 
 
diff --git a/src/mesa/drivers/dri/gamma/gamma_render.c b/src/mesa/drivers/dri/gamma/gamma_render.c
index 6454bb97803..ce8b83934c9 100644
--- a/src/mesa/drivers/dri/gamma/gamma_render.c
+++ b/src/mesa/drivers/dri/gamma/gamma_render.c
@@ -177,7 +177,7 @@ static GLboolean gamma_run_render( GLcontext *ctx,
    TNLcontext *tnl = TNL_CONTEXT(ctx);
    struct vertex_buffer *VB = &tnl->vb;
    GLuint i;
-   render_func *tab;
+   tnl_render_func *tab;
 
 				/* GH: THIS IS A HACK!!! */
    if (VB->ClipOrMask || gmesa->RenderIndex != 0)
diff --git a/src/mesa/drivers/dri/gamma/gamma_tris.c b/src/mesa/drivers/dri/gamma/gamma_tris.c
index da7ae5e247a..83bf56a141a 100644
--- a/src/mesa/drivers/dri/gamma/gamma_tris.c
+++ b/src/mesa/drivers/dri/gamma/gamma_tris.c
@@ -275,10 +275,10 @@ do {						\
 
 
 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[GAMMA_MAX_TRIFUNC];
 
 
diff --git a/src/mesa/drivers/dri/gamma/gamma_vb.c b/src/mesa/drivers/dri/gamma/gamma_vb.c
index f2dd0d8de00..80d35cba9e9 100644
--- a/src/mesa/drivers/dri/gamma/gamma_vb.c
+++ b/src/mesa/drivers/dri/gamma/gamma_vb.c
@@ -51,8 +51,8 @@
 
 static struct {
    void                (*emit)( GLcontext *, GLuint, GLuint, void *, GLuint );
-   interp_func		interp;
-   copy_pv_func	        copy_pv;
+   tnl_interp_func		interp;
+   tnl_copy_pv_func	        copy_pv;
    GLboolean           (*check_tex_sizes)( GLcontext *ctx );
    GLuint               vertex_size;
    GLuint               vertex_format;
diff --git a/src/mesa/drivers/dri/i810/i810tris.c b/src/mesa/drivers/dri/i810/i810tris.c
index b035b9beb02..5b2ea018e1e 100644
--- a/src/mesa/drivers/dri/i810/i810tris.c
+++ b/src/mesa/drivers/dri/i810/i810tris.c
@@ -199,10 +199,10 @@ do { 						\
 
 
 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[I810_MAX_TRIFUNC];
 
 
diff --git a/src/mesa/drivers/dri/i810/i810vb.c b/src/mesa/drivers/dri/i810/i810vb.c
index 2cdf0252ce7..880cfaf7a07 100644
--- a/src/mesa/drivers/dri/i810/i810vb.c
+++ b/src/mesa/drivers/dri/i810/i810vb.c
@@ -55,8 +55,8 @@
 
 static struct {
    void                (*emit)( GLcontext *, GLuint, GLuint, void *, GLuint );
-   interp_func		interp;
-   copy_pv_func	        copy_pv;
+   tnl_interp_func		interp;
+   tnl_copy_pv_func	        copy_pv;
    GLboolean           (*check_tex_sizes)( GLcontext *ctx );
    GLuint               vertex_size;
    GLuint               vertex_format;
diff --git a/src/mesa/drivers/dri/i830/i830_tris.c b/src/mesa/drivers/dri/i830/i830_tris.c
index 8421897cfea..e0907202d50 100644
--- a/src/mesa/drivers/dri/i830/i830_tris.c
+++ b/src/mesa/drivers/dri/i830/i830_tris.c
@@ -190,10 +190,10 @@ do { 						\
 
 
 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[I830_MAX_TRIFUNC];
 
 
diff --git a/src/mesa/drivers/dri/i915/intel_tris.c b/src/mesa/drivers/dri/i915/intel_tris.c
index 261b1f27950..886029574e0 100644
--- a/src/mesa/drivers/dri/i915/intel_tris.c
+++ b/src/mesa/drivers/dri/i915/intel_tris.c
@@ -285,10 +285,10 @@ do { 						\
 
 
 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[INTEL_MAX_TRIFUNC];
 
 
diff --git a/src/mesa/drivers/dri/mach64/mach64_tris.c b/src/mesa/drivers/dri/mach64/mach64_tris.c
index 3ef34fbb4b6..6b12ee92e24 100644
--- a/src/mesa/drivers/dri/mach64/mach64_tris.c
+++ b/src/mesa/drivers/dri/mach64/mach64_tris.c
@@ -1227,10 +1227,10 @@ do {						\
 #define MACH64_MAX_TRIFUNC	0x10
 
 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[MACH64_MAX_TRIFUNC];
 
 
diff --git a/src/mesa/drivers/dri/mach64/mach64_vb.c b/src/mesa/drivers/dri/mach64/mach64_vb.c
index 7e23006132b..83a5f73e6ba 100644
--- a/src/mesa/drivers/dri/mach64/mach64_vb.c
+++ b/src/mesa/drivers/dri/mach64/mach64_vb.c
@@ -56,8 +56,8 @@
 
 static struct {
    void                (*emit)( GLcontext *, GLuint, GLuint, void *, GLuint );
-   interp_func		interp;
-   copy_pv_func	        copy_pv;
+   tnl_interp_func		interp;
+   tnl_copy_pv_func	        copy_pv;
    GLboolean           (*check_tex_sizes)( GLcontext *ctx );
    GLuint               vertex_size;
    GLuint               vertex_format;
diff --git a/src/mesa/drivers/dri/mga/mgatris.c b/src/mesa/drivers/dri/mga/mgatris.c
index bf415a15a63..1f142ccb4dd 100644
--- a/src/mesa/drivers/dri/mga/mgatris.c
+++ b/src/mesa/drivers/dri/mga/mgatris.c
@@ -328,10 +328,10 @@ mga_fallback_point( mgaContextPtr mmesa,
 #define MGA_MAX_TRIFUNC     0x20
 
 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[MGA_MAX_TRIFUNC];
 
 #define DO_FALLBACK (IND & MGA_FALLBACK_BIT)
diff --git a/src/mesa/drivers/dri/mga/mgavb.c b/src/mesa/drivers/dri/mga/mgavb.c
index dacb38dd9fc..902d8bd1c1b 100644
--- a/src/mesa/drivers/dri/mga/mgavb.c
+++ b/src/mesa/drivers/dri/mga/mgavb.c
@@ -55,8 +55,8 @@
 
 static struct {
    void                (*emit)( GLcontext *, GLuint, GLuint, void *, GLuint );
-   interp_func		interp;
-   copy_pv_func	        copy_pv;
+   tnl_interp_func		interp;
+   tnl_copy_pv_func	        copy_pv;
    GLboolean           (*check_tex_sizes)( GLcontext *ctx );
    GLuint               vertex_size;
    GLuint               vertex_format;
diff --git a/src/mesa/drivers/dri/r128/r128_tris.c b/src/mesa/drivers/dri/r128/r128_tris.c
index b00ea62e28d..d3dfb3b1174 100644
--- a/src/mesa/drivers/dri/r128/r128_tris.c
+++ b/src/mesa/drivers/dri/r128/r128_tris.c
@@ -199,10 +199,10 @@ do {						\
 
 
 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[R128_MAX_TRIFUNC];
 
 
diff --git a/src/mesa/drivers/dri/r128/r128_vb.c b/src/mesa/drivers/dri/r128/r128_vb.c
index 541d7ecd02f..213a3350526 100644
--- a/src/mesa/drivers/dri/r128/r128_vb.c
+++ b/src/mesa/drivers/dri/r128/r128_vb.c
@@ -60,8 +60,8 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 static struct {
    void                (*emit)( GLcontext *, GLuint, GLuint, void *, GLuint );
-   interp_func		interp;
-   copy_pv_func	        copy_pv;
+   tnl_interp_func		interp;
+   tnl_copy_pv_func	        copy_pv;
    GLboolean           (*check_tex_sizes)( GLcontext *ctx );
    GLuint               vertex_size;
    GLuint               vertex_format;
diff --git a/src/mesa/drivers/dri/r200/r200_swtcl.c b/src/mesa/drivers/dri/r200/r200_swtcl.c
index 5c5c5bd75e3..0444294d797 100644
--- a/src/mesa/drivers/dri/r200/r200_swtcl.c
+++ b/src/mesa/drivers/dri/r200/r200_swtcl.c
@@ -380,10 +380,10 @@ static void r200ResetLineStipple( GLcontext *ctx );
 
 
 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[R200_MAX_TRIFUNC];
 
 
diff --git a/src/mesa/drivers/dri/radeon/radeon_swtcl.c b/src/mesa/drivers/dri/radeon/radeon_swtcl.c
index fd14e76d444..789f2777c00 100644
--- a/src/mesa/drivers/dri/radeon/radeon_swtcl.c
+++ b/src/mesa/drivers/dri/radeon/radeon_swtcl.c
@@ -70,8 +70,8 @@ static void flush_last_swtcl_prim( radeonContextPtr rmesa  );
 
 static struct {
    void                (*emit)( GLcontext *, GLuint, GLuint, void *, GLuint );
-   interp_func		interp;
-   copy_pv_func	        copy_pv;
+   tnl_interp_func		interp;
+   tnl_copy_pv_func	        copy_pv;
    GLboolean           (*check_tex_sizes)( GLcontext *ctx );
    GLuint               vertex_size;
    GLuint               vertex_format;
@@ -595,7 +595,7 @@ static GLboolean radeon_run_render( GLcontext *ctx,
    radeonContextPtr rmesa = RADEON_CONTEXT(ctx);
    TNLcontext *tnl = TNL_CONTEXT(ctx);
    struct vertex_buffer *VB = &tnl->vb;
-   render_func *tab = TAG(render_tab_verts);
+   tnl_render_func *tab = TAG(render_tab_verts);
    GLuint i;
 
    if (rmesa->swtcl.indexed_verts.buf && (!VB->Elts || stage->changed_inputs)) 
@@ -859,10 +859,10 @@ static void radeonResetLineStipple( GLcontext *ctx );
 
 
 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[RADEON_MAX_TRIFUNC];
 
 
diff --git a/src/mesa/drivers/dri/savage/savagetris.c b/src/mesa/drivers/dri/savage/savagetris.c
index 1cb2d46e90d..31917132f7f 100644
--- a/src/mesa/drivers/dri/savage/savagetris.c
+++ b/src/mesa/drivers/dri/savage/savagetris.c
@@ -251,10 +251,10 @@ do {						\
 
 
 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[SAVAGE_MAX_TRIFUNC];
 
 
diff --git a/src/mesa/drivers/dri/sis/sis_tris.c b/src/mesa/drivers/dri/sis/sis_tris.c
index 56676b04cf4..da23df5fe73 100644
--- a/src/mesa/drivers/dri/sis/sis_tris.c
+++ b/src/mesa/drivers/dri/sis/sis_tris.c
@@ -333,10 +333,10 @@ do { 						\
 
 
 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[SIS_MAX_TRIFUNC];
 
 
diff --git a/src/mesa/drivers/dri/tdfx/tdfx_tris.c b/src/mesa/drivers/dri/tdfx/tdfx_tris.c
index 408682e1fac..c3398c73fc6 100644
--- a/src/mesa/drivers/dri/tdfx/tdfx_tris.c
+++ b/src/mesa/drivers/dri/tdfx/tdfx_tris.c
@@ -303,10 +303,10 @@ static void tdfx_draw_point( tdfxContextPtr fxMesa,
 #define TDFX_MAX_TRIFUNC     0x20
 
 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[TDFX_MAX_TRIFUNC];
 
 #define DO_FALLBACK (IND & TDFX_FALLBACK_BIT)
diff --git a/src/mesa/drivers/dri/tdfx/tdfx_vb.c b/src/mesa/drivers/dri/tdfx/tdfx_vb.c
index 28cd9793a7e..b7d75bb4e46 100644
--- a/src/mesa/drivers/dri/tdfx/tdfx_vb.c
+++ b/src/mesa/drivers/dri/tdfx/tdfx_vb.c
@@ -63,8 +63,8 @@ typedef void (*tdfx_emit_func)( GLcontext *, GLuint, GLuint, void *, GLuint );
 
 static struct {
    tdfx_emit_func	        emit;
-   interp_func		interp;
-   copy_pv_func	        copy_pv;
+   tnl_interp_func		interp;
+   tnl_copy_pv_func	        copy_pv;
    GLboolean           (*check_tex_sizes)( GLcontext *ctx );
    GLuint               vertex_size;
    GLuint               vertex_stride_shift;
diff --git a/src/mesa/drivers/dri/unichrome/via_dmatmp.h b/src/mesa/drivers/dri/unichrome/via_dmatmp.h
index 5808b505f37..0253d7b57fe 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 9f87533e3d0..210248ff4be 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 61f80ae9704..423b1372a73 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 6e8a5371815..f0a0edfbd15 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 99f90003e13..fd9f39a0580 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];
diff --git a/src/mesa/drivers/glide/fxtris.c b/src/mesa/drivers/glide/fxtris.c
index b85db94c6b7..9eb895073bf 100644
--- a/src/mesa/drivers/glide/fxtris.c
+++ b/src/mesa/drivers/glide/fxtris.c
@@ -404,10 +404,10 @@ static void fx_draw_point_wide_aa ( fxMesaContext fxMesa,
 #define FX_MAX_TRIFUNC     0x20
 
 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[FX_MAX_TRIFUNC];
 
 #define DO_FALLBACK (IND & FX_FALLBACK_BIT)
diff --git a/src/mesa/drivers/glide/fxvb.c b/src/mesa/drivers/glide/fxvb.c
index f00f2644295..46a4278d075 100644
--- a/src/mesa/drivers/glide/fxvb.c
+++ b/src/mesa/drivers/glide/fxvb.c
@@ -72,8 +72,8 @@ typedef void (*emit_func)( GLcontext *, GLuint, GLuint, void * );
 
 static struct {
    emit_func	        emit;
-   copy_pv_func		copy_pv;
-   interp_func		interp;
+   tnl_copy_pv_func		copy_pv;
+   tnl_interp_func		interp;
    GLboolean           (*check_tex_sizes)( GLcontext *ctx );
    GLuint               vertex_format;
 } setup_tab[MAX_SETUP];
diff --git a/src/mesa/drivers/windows/gdi/wmesa.c b/src/mesa/drivers/windows/gdi/wmesa.c
index 46273546266..eb64cf69a59 100644
--- a/src/mesa/drivers/windows/gdi/wmesa.c
+++ b/src/mesa/drivers/windows/gdi/wmesa.c
@@ -654,7 +654,7 @@ static void fast_rgb_points( GLcontext* ctx, GLuint first, GLuint last )
 }
 
 /* Return pointer to accelerated points function */
-extern points_func choose_points_function( GLcontext* ctx )
+extern tnl_points_func choose_points_function( GLcontext* ctx )
 {
   return NULL;
 }
@@ -664,7 +664,7 @@ static void fast_flat_rgb_line( GLcontext* ctx, GLuint v0,
 {
 }
 
-static line_func choose_line_function( GLcontext* ctx )
+static tnl_line_func choose_line_function( GLcontext* ctx )
 {
 }
 
@@ -3182,7 +3182,7 @@ static void flat_DITHER8_triangle( GLcontext *ctx, GLuint v0, GLuint v1,
 #endif
 /************** END DEAD TRIANGLE CODE ***********************/
 
-static triangle_func choose_triangle_function( GLcontext *ctx )
+static tnl_triangle_func choose_triangle_function( GLcontext *ctx )
 {
 #if 0
     WMesaContext wmesa = (WMesaContext) ctx->DriverCtx;
diff --git a/src/mesa/drivers/windows/gldirect/dx7/gld_vb_d3d_render_dx7.c b/src/mesa/drivers/windows/gldirect/dx7/gld_vb_d3d_render_dx7.c
index cecfaa5f70e..21b56285796 100644
--- a/src/mesa/drivers/windows/gldirect/dx7/gld_vb_d3d_render_dx7.c
+++ b/src/mesa/drivers/windows/gldirect/dx7/gld_vb_d3d_render_dx7.c
@@ -125,7 +125,7 @@ static GLboolean gld_d3d_render_stage_run(
 	TNLcontext				*tnl;
 	struct vertex_buffer	*VB;
 	GLuint					new_inputs;
-	render_func				*tab;
+	tnl_render_func				*tab;
 	GLint					pass;
 	GLD_pb_dx7				*gldPB = &gld->PB3d;
 	DWORD					dwFlags;
diff --git a/src/mesa/drivers/windows/gldirect/dx7/gld_vb_mesa_render_dx7.c b/src/mesa/drivers/windows/gldirect/dx7/gld_vb_mesa_render_dx7.c
index f122d25c74c..7ee625d04bd 100644
--- a/src/mesa/drivers/windows/gldirect/dx7/gld_vb_mesa_render_dx7.c
+++ b/src/mesa/drivers/windows/gldirect/dx7/gld_vb_mesa_render_dx7.c
@@ -1,4 +1,4 @@
-/* $Id: gld_vb_mesa_render_dx7.c,v 1.1 2004/04/20 11:13:11 alanh Exp $ */
+/* $Id: gld_vb_mesa_render_dx7.c,v 1.2 2004/07/01 13:14:06 keithw Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -143,9 +143,9 @@ do {							\
    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;
@@ -175,7 +175,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;
@@ -232,9 +232,9 @@ static void clip_elt_triangles( GLcontext *ctx,
    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;		\
    (void) (LineFunc && TriangleFunc && QuadFunc);		\
    (void) elt;
 
@@ -281,25 +281,25 @@ void _tnl_RenderClippedLine( GLcontext *ctx, GLuint ii, GLuint jj )
 /*              Clip and render whole vertex buffers                  */
 /**********************************************************************/
 
-points_func _gldSetupPoints[4] = {
+tnl_points_func _gldSetupPoints[4] = {
 	gld_Points2D_DX7,
 	gld_Points2D_DX7,
 	gld_Points2D_DX7,
 	gld_Points2D_DX7
 };
-line_func _gldSetupLine[4] = {
+tnl_line_func _gldSetupLine[4] = {
 	gld_Line2DFlat_DX7,
 	gld_Line2DSmooth_DX7,
 	gld_Line2DFlat_DX7,
 	gld_Line2DSmooth_DX7,
 };
-triangle_func _gldSetupTriangle[4] = {
+tnl_triangle_func _gldSetupTriangle[4] = {
 	gld_Triangle2DFlat_DX7,
 	gld_Triangle2DSmooth_DX7,
 	gld_Triangle2DFlatExtras_DX7,
 	gld_Triangle2DSmoothExtras_DX7
 };
-quad_func _gldSetupQuad[4] = {
+tnl_quad_func _gldSetupQuad[4] = {
 	gld_Quad2DFlat_DX7,
 	gld_Quad2DSmooth_DX7,
 	gld_Quad2DFlatExtras_DX7,
@@ -318,7 +318,7 @@ static GLboolean _gld_mesa_render_stage_run(
 	TNLcontext				*tnl = TNL_CONTEXT(ctx);
 	struct vertex_buffer	*VB = &tnl->vb;
 	GLuint					new_inputs = stage->changed_inputs;
-	render_func				*tab;
+	tnl_render_func				*tab;
 	GLint					pass = 0;
 	GLD_pb_dx7				*gldPB;
 	DWORD					dwFlags;
diff --git a/src/mesa/drivers/windows/gldirect/dx8/gld_vb_d3d_render_dx8.c b/src/mesa/drivers/windows/gldirect/dx8/gld_vb_d3d_render_dx8.c
index 871a651990a..e6e020fc7ce 100644
--- a/src/mesa/drivers/windows/gldirect/dx8/gld_vb_d3d_render_dx8.c
+++ b/src/mesa/drivers/windows/gldirect/dx8/gld_vb_d3d_render_dx8.c
@@ -125,7 +125,7 @@ static GLboolean gld_d3d_render_stage_run(
 	TNLcontext				*tnl;
 	struct vertex_buffer	*VB;
 	GLuint					new_inputs;
-	render_func				*tab;
+	tnl_render_func				*tab;
 	GLint					pass;
 	GLD_pb_dx8				*gldPB = &gld->PB3d;
 /*
diff --git a/src/mesa/drivers/windows/gldirect/dx8/gld_vb_mesa_render_dx8.c b/src/mesa/drivers/windows/gldirect/dx8/gld_vb_mesa_render_dx8.c
index 083b9d4910a..98adc6769ad 100644
--- a/src/mesa/drivers/windows/gldirect/dx8/gld_vb_mesa_render_dx8.c
+++ b/src/mesa/drivers/windows/gldirect/dx8/gld_vb_mesa_render_dx8.c
@@ -1,4 +1,4 @@
-/* $Id: gld_vb_mesa_render_dx8.c,v 1.1 2004/04/20 11:13:11 alanh Exp $ */
+/* $Id: gld_vb_mesa_render_dx8.c,v 1.2 2004/07/01 13:14:07 keithw Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -143,9 +143,9 @@ do {							\
    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;
@@ -175,7 +175,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;
@@ -232,9 +232,9 @@ static void clip_elt_triangles( GLcontext *ctx,
    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;		\
    (void) (LineFunc && TriangleFunc && QuadFunc);		\
    (void) elt;
 
@@ -281,25 +281,25 @@ void _tnl_RenderClippedLine( GLcontext *ctx, GLuint ii, GLuint jj )
 /*              Clip and render whole vertex buffers                  */
 /**********************************************************************/
 
-points_func _gldSetupPoints[4] = {
+tnl_points_func _gldSetupPoints[4] = {
 	gld_Points2D_DX8,
 	gld_Points2D_DX8,
 	gld_Points2D_DX8,
 	gld_Points2D_DX8
 };
-line_func _gldSetupLine[4] = {
+tnl_line_func _gldSetupLine[4] = {
 	gld_Line2DFlat_DX8,
 	gld_Line2DSmooth_DX8,
 	gld_Line2DFlat_DX8,
 	gld_Line2DSmooth_DX8,
 };
-triangle_func _gldSetupTriangle[4] = {
+tnl_triangle_func _gldSetupTriangle[4] = {
 	gld_Triangle2DFlat_DX8,
 	gld_Triangle2DSmooth_DX8,
 	gld_Triangle2DFlatExtras_DX8,
 	gld_Triangle2DSmoothExtras_DX8
 };
-quad_func _gldSetupQuad[4] = {
+tnl_quad_func _gldSetupQuad[4] = {
 	gld_Quad2DFlat_DX8,
 	gld_Quad2DSmooth_DX8,
 	gld_Quad2DFlatExtras_DX8,
@@ -318,7 +318,7 @@ static GLboolean _gld_mesa_render_stage_run(
 	TNLcontext				*tnl = TNL_CONTEXT(ctx);
 	struct vertex_buffer	*VB = &tnl->vb;
 	GLuint					new_inputs = stage->changed_inputs;
-	render_func				*tab;
+	tnl_render_func				*tab;
 	GLint					pass = 0;
 	GLD_pb_dx8				*gldPB;
 
diff --git a/src/mesa/drivers/windows/gldirect/dx9/gld_vb_d3d_render_dx9.c b/src/mesa/drivers/windows/gldirect/dx9/gld_vb_d3d_render_dx9.c
index 30650d6f9a9..f19f2a5eaaf 100644
--- a/src/mesa/drivers/windows/gldirect/dx9/gld_vb_d3d_render_dx9.c
+++ b/src/mesa/drivers/windows/gldirect/dx9/gld_vb_d3d_render_dx9.c
@@ -125,7 +125,7 @@ static GLboolean gld_d3d_render_stage_run(
 	TNLcontext				*tnl;
 	struct vertex_buffer	*VB;
 	GLuint					new_inputs;
-	render_func				*tab;
+	tnl_render_func				*tab;
 	GLint					pass;
 	GLD_pb_dx9				*gldPB = &gld->PB3d;
 /*
diff --git a/src/mesa/drivers/windows/gldirect/dx9/gld_vb_mesa_render_dx9.c b/src/mesa/drivers/windows/gldirect/dx9/gld_vb_mesa_render_dx9.c
index 10e994c3c85..b55a417d7be 100644
--- a/src/mesa/drivers/windows/gldirect/dx9/gld_vb_mesa_render_dx9.c
+++ b/src/mesa/drivers/windows/gldirect/dx9/gld_vb_mesa_render_dx9.c
@@ -1,4 +1,4 @@
-/* $Id: gld_vb_mesa_render_dx9.c,v 1.1 2004/04/20 11:13:11 alanh Exp $ */
+/* $Id: gld_vb_mesa_render_dx9.c,v 1.2 2004/07/01 13:14:07 keithw Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -138,9 +138,9 @@ do {							\
    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;
@@ -170,7 +170,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;
@@ -227,9 +227,9 @@ static void clip_elt_triangles( GLcontext *ctx,
    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;		\
    (void) (LineFunc && TriangleFunc && QuadFunc);		\
    (void) elt;
 
@@ -276,25 +276,25 @@ void _tnl_RenderClippedLine( GLcontext *ctx, GLuint ii, GLuint jj )
 /*              Clip and render whole vertex buffers                  */
 /**********************************************************************/
 
-points_func _gldSetupPoints[4] = {
+tnl_points_func _gldSetupPoints[4] = {
 	gld_Points2D_DX9,
 	gld_Points2D_DX9,
 	gld_Points2D_DX9,
 	gld_Points2D_DX9
 };
-line_func _gldSetupLine[4] = {
+tnl_line_func _gldSetupLine[4] = {
 	gld_Line2DFlat_DX9,
 	gld_Line2DSmooth_DX9,
 	gld_Line2DFlat_DX9,
 	gld_Line2DSmooth_DX9,
 };
-triangle_func _gldSetupTriangle[4] = {
+tnl_triangle_func _gldSetupTriangle[4] = {
 	gld_Triangle2DFlat_DX9,
 	gld_Triangle2DSmooth_DX9,
 	gld_Triangle2DFlatExtras_DX9,
 	gld_Triangle2DSmoothExtras_DX9
 };
-quad_func _gldSetupQuad[4] = {
+tnl_quad_func _gldSetupQuad[4] = {
 	gld_Quad2DFlat_DX9,
 	gld_Quad2DSmooth_DX9,
 	gld_Quad2DFlatExtras_DX9,
@@ -313,7 +313,7 @@ static GLboolean _gld_mesa_render_stage_run(
 	TNLcontext				*tnl = TNL_CONTEXT(ctx);
 	struct vertex_buffer	*VB = &tnl->vb;
 	GLuint					new_inputs = stage->changed_inputs;
-	render_func				*tab;
+	tnl_render_func				*tab;
 	GLint					pass = 0;
 	GLD_pb_dx9				*gldPB;
 
diff --git a/src/mesa/drivers/windows/gldirect/mesasw/gld_wgl_mesasw.c b/src/mesa/drivers/windows/gldirect/mesasw/gld_wgl_mesasw.c
index ed58e35301c..0a5957b5a4f 100644
--- a/src/mesa/drivers/windows/gldirect/mesasw/gld_wgl_mesasw.c
+++ b/src/mesa/drivers/windows/gldirect/mesasw/gld_wgl_mesasw.c
@@ -909,7 +909,7 @@ static void fast_rgb_points( GLcontext* ctx, GLuint first, GLuint last )
 //---------------------------------------------------------------------------
 
 /* Return pointer to accelerated points function */
-extern points_func choose_points_function( GLcontext* ctx )
+extern tnl_points_func choose_points_function( GLcontext* ctx )
 {
   return NULL;
 }
@@ -923,7 +923,7 @@ static void fast_flat_rgb_line( GLcontext* ctx, GLuint v0,
 
 //---------------------------------------------------------------------------
 
-static line_func choose_line_function( GLcontext* ctx )
+static tnl_line_func choose_line_function( GLcontext* ctx )
 {
 }