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

8 files changed, 47 insertions, 47 deletions

diff --git a/src/mesa/drivers/windows/gdi/wmesa.c b/src/mesa/drivers/windows/gdi/wmesa.c
index 4627354626..eb64cf69a5 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 cecfaa5f70..21b5628579 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 f122d25c74..7ee625d04b 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 871a651990..e6e020fc7c 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 083b9d4910..98adc6769a 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 30650d6f9a..f19f2a5eaa 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 10e994c3c8..b55a417d7b 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 ed58e35301..0a5957b5a4 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 )
 {
 }