From f9995b30756140724f41daf963fa06167912be7f Mon Sep 17 00:00:00 2001 From: Kristian Høgsberg Date: Tue, 12 Oct 2010 12:26:10 -0400 Subject: Drop GLcontext typedef and use struct gl_context instead --- src/mesa/tnl_dd/imm/t_dd_imm_primtmp.h | 112 ++++++++++++++++----------------- src/mesa/tnl_dd/imm/t_dd_imm_vb.c | 8 +-- src/mesa/tnl_dd/imm/t_dd_imm_vbtmp.h | 6 +- src/mesa/tnl_dd/t_dd.c | 6 +- src/mesa/tnl_dd/t_dd_dmatmp.h | 48 +++++++------- src/mesa/tnl_dd/t_dd_dmatmp2.h | 46 +++++++------- src/mesa/tnl_dd/t_dd_rendertmp.h | 24 +++---- src/mesa/tnl_dd/t_dd_triemit.h | 2 +- src/mesa/tnl_dd/t_dd_tritmp.h | 10 +-- src/mesa/tnl_dd/t_dd_unfilled.h | 4 +- src/mesa/tnl_dd/t_dd_vb.c | 16 ++--- src/mesa/tnl_dd/t_dd_vbtmp.h | 10 +-- 12 files changed, 146 insertions(+), 146 deletions(-) (limited to 'src/mesa/tnl_dd') diff --git a/src/mesa/tnl_dd/imm/t_dd_imm_primtmp.h b/src/mesa/tnl_dd/imm/t_dd_imm_primtmp.h index 97dca3fd42..7103db5355 100644 --- a/src/mesa/tnl_dd/imm/t_dd_imm_primtmp.h +++ b/src/mesa/tnl_dd/imm/t_dd_imm_primtmp.h @@ -46,7 +46,7 @@ * GL_POINTS */ -static void TAG(flush_point_0)( GLcontext *ctx, TNL_VERTEX *v0 ) +static void TAG(flush_point_0)( struct gl_context *ctx, TNL_VERTEX *v0 ) { if ( !v0->mask ) { LOCAL_VARS; @@ -59,16 +59,16 @@ static void TAG(flush_point_0)( GLcontext *ctx, TNL_VERTEX *v0 ) * GL_LINES */ -static void TAG(flush_line_1)( GLcontext *ctx, TNL_VERTEX *v0 ); +static void TAG(flush_line_1)( struct gl_context *ctx, TNL_VERTEX *v0 ); -static void TAG(flush_line_0)( GLcontext *ctx, TNL_VERTEX *v0 ) +static void TAG(flush_line_0)( struct gl_context *ctx, TNL_VERTEX *v0 ) { LOCAL_VARS; FLUSH_VERTEX = TAG(flush_line_1); ACTIVE_VERTEX = IMM_VERTICES( 1 ); } -static void TAG(flush_line_1)( GLcontext *ctx, TNL_VERTEX *v0 ) +static void TAG(flush_line_1)( struct gl_context *ctx, TNL_VERTEX *v0 ) { LOCAL_VARS; TNL_VERTEX *v1 = v0 - 1; @@ -85,10 +85,10 @@ static void TAG(flush_line_1)( GLcontext *ctx, TNL_VERTEX *v0 ) * GL_LINE_LOOP */ -static void TAG(flush_line_loop_2)( GLcontext *ctx, TNL_VERTEX *v0 ); -static void TAG(flush_line_loop_1)( GLcontext *ctx, TNL_VERTEX *v0 ); +static void TAG(flush_line_loop_2)( struct gl_context *ctx, TNL_VERTEX *v0 ); +static void TAG(flush_line_loop_1)( struct gl_context *ctx, TNL_VERTEX *v0 ); -static void TAG(flush_line_loop_0)( GLcontext *ctx, TNL_VERTEX *v0 ) +static void TAG(flush_line_loop_0)( struct gl_context *ctx, TNL_VERTEX *v0 ) { LOCAL_VARS; @@ -107,7 +107,7 @@ static void TAG(flush_line_loop_0)( GLcontext *ctx, TNL_VERTEX *v0 ) EMIT_VERTEX( b ); \ } -static void TAG(flush_line_loop_1)( GLcontext *ctx, TNL_VERTEX *v0 ) +static void TAG(flush_line_loop_1)( struct gl_context *ctx, TNL_VERTEX *v0 ) { LOCAL_VARS; TNL_VERTEX *v1 = v0 - 1; @@ -116,7 +116,7 @@ static void TAG(flush_line_loop_1)( GLcontext *ctx, TNL_VERTEX *v0 ) DRAW_LINELOOP_LINE( v1, v0 ); } -static void TAG(flush_line_loop_2)( GLcontext *ctx, TNL_VERTEX *v0 ) +static void TAG(flush_line_loop_2)( struct gl_context *ctx, TNL_VERTEX *v0 ) { LOCAL_VARS; TNL_VERTEX *v1 = v0 + 1; @@ -125,7 +125,7 @@ static void TAG(flush_line_loop_2)( GLcontext *ctx, TNL_VERTEX *v0 ) DRAW_LINELOOP_LINE( v1, v0 ); } -static void TAG(end_line_loop)( GLcontext *ctx ) +static void TAG(end_line_loop)( struct gl_context *ctx ) { LOCAL_VARS; @@ -142,10 +142,10 @@ static void TAG(end_line_loop)( GLcontext *ctx ) * GL_LINE_STRIP */ -static void TAG(flush_line_strip_2)( GLcontext *ctx, TNL_VERTEX *v0 ); -static void TAG(flush_line_strip_1)( GLcontext *ctx, TNL_VERTEX *v0 ); +static void TAG(flush_line_strip_2)( struct gl_context *ctx, TNL_VERTEX *v0 ); +static void TAG(flush_line_strip_1)( struct gl_context *ctx, TNL_VERTEX *v0 ); -static void TAG(flush_line_strip_0)( GLcontext *ctx, TNL_VERTEX *v0 ) +static void TAG(flush_line_strip_0)( struct gl_context *ctx, TNL_VERTEX *v0 ) { LOCAL_VARS; @@ -154,7 +154,7 @@ static void TAG(flush_line_strip_0)( GLcontext *ctx, TNL_VERTEX *v0 ) } -static void TAG(flush_line_strip_1)( GLcontext *ctx, TNL_VERTEX *v0 ) +static void TAG(flush_line_strip_1)( struct gl_context *ctx, TNL_VERTEX *v0 ) { LOCAL_VARS; TNL_VERTEX *v1 = v0 - 1; @@ -173,7 +173,7 @@ static void TAG(flush_line_strip_1)( GLcontext *ctx, TNL_VERTEX *v0 ) } } -static void TAG(flush_line_strip_2)( GLcontext *ctx, TNL_VERTEX *v0 ) +static void TAG(flush_line_strip_2)( struct gl_context *ctx, TNL_VERTEX *v0 ) { LOCAL_VARS; TNL_VERTEX *v1 = v0 + 1; @@ -198,10 +198,10 @@ static void TAG(flush_line_strip_2)( GLcontext *ctx, TNL_VERTEX *v0 ) * GL_TRIANGLES */ -static void TAG(flush_triangle_2)( GLcontext *ctx, TNL_VERTEX *v0 ); -static void TAG(flush_triangle_1)( GLcontext *ctx, TNL_VERTEX *v0 ); +static void TAG(flush_triangle_2)( struct gl_context *ctx, TNL_VERTEX *v0 ); +static void TAG(flush_triangle_1)( struct gl_context *ctx, TNL_VERTEX *v0 ); -static void TAG(flush_triangle_0)( GLcontext *ctx, TNL_VERTEX *v0 ) +static void TAG(flush_triangle_0)( struct gl_context *ctx, TNL_VERTEX *v0 ) { LOCAL_VARS; @@ -212,7 +212,7 @@ static void TAG(flush_triangle_0)( GLcontext *ctx, TNL_VERTEX *v0 ) BEGIN_PRIM( GL_TRIANGLES, 0 ); } -static void TAG(flush_triangle_1)( GLcontext *ctx, TNL_VERTEX *v0 ) +static void TAG(flush_triangle_1)( struct gl_context *ctx, TNL_VERTEX *v0 ) { LOCAL_VARS; @@ -222,7 +222,7 @@ static void TAG(flush_triangle_1)( GLcontext *ctx, TNL_VERTEX *v0 ) FLUSH_VERTEX = TAG(flush_triangle_2); } -static void TAG(flush_triangle_2)( GLcontext *ctx, TNL_VERTEX *v0 ) +static void TAG(flush_triangle_2)( struct gl_context *ctx, TNL_VERTEX *v0 ) { LOCAL_VARS; TNL_VERTEX *v2 = v0 - 2; @@ -249,18 +249,18 @@ static void TAG(flush_triangle_2)( GLcontext *ctx, TNL_VERTEX *v0 ) * GL_TRIANGLE_STRIP */ -static void TAG(flush_tri_strip_3)( GLcontext *ctx, TNL_VERTEX *v0 ); -static void TAG(flush_tri_strip_2)( GLcontext *ctx, TNL_VERTEX *v0 ); -static void TAG(flush_tri_strip_1)( GLcontext *ctx, TNL_VERTEX *v0 ); +static void TAG(flush_tri_strip_3)( struct gl_context *ctx, TNL_VERTEX *v0 ); +static void TAG(flush_tri_strip_2)( struct gl_context *ctx, TNL_VERTEX *v0 ); +static void TAG(flush_tri_strip_1)( struct gl_context *ctx, TNL_VERTEX *v0 ); -static void TAG(flush_tri_strip_0)( GLcontext *ctx, TNL_VERTEX *v0 ) +static void TAG(flush_tri_strip_0)( struct gl_context *ctx, TNL_VERTEX *v0 ) { LOCAL_VARS; ACTIVE_VERTEX = IMM_VERTICES( 1 ); FLUSH_VERTEX = TAG(flush_tri_strip_1); } -static void TAG(flush_tri_strip_1)( GLcontext *ctx, TNL_VERTEX *v0 ) +static void TAG(flush_tri_strip_1)( struct gl_context *ctx, TNL_VERTEX *v0 ) { LOCAL_VARS; ACTIVE_VERTEX = IMM_VERTICES( 2 ); @@ -283,7 +283,7 @@ static void TAG(flush_tri_strip_1)( GLcontext *ctx, TNL_VERTEX *v0 ) EMIT_VERTEX( v0 ); \ } -static void TAG(flush_tri_strip_2)( GLcontext *ctx, TNL_VERTEX *v0 ) +static void TAG(flush_tri_strip_2)( struct gl_context *ctx, TNL_VERTEX *v0 ) { LOCAL_VARS; FLUSH_VERTEX = TAG(flush_tri_strip_3); @@ -291,7 +291,7 @@ static void TAG(flush_tri_strip_2)( GLcontext *ctx, TNL_VERTEX *v0 ) DO_TRISTRIP_TRI( 0, 1 ); } -static void TAG(flush_tri_strip_3)( GLcontext *ctx, TNL_VERTEX *v0 ) +static void TAG(flush_tri_strip_3)( struct gl_context *ctx, TNL_VERTEX *v0 ) { LOCAL_VARS; FLUSH_VERTEX = TAG(flush_tri_strip_4); @@ -299,7 +299,7 @@ static void TAG(flush_tri_strip_3)( GLcontext *ctx, TNL_VERTEX *v0 ) DO_TRISTRIP_TRI( 1, 2 ); } -static void TAG(flush_tri_strip_4)( GLcontext *ctx, TNL_VERTEX *v0 ) +static void TAG(flush_tri_strip_4)( struct gl_context *ctx, TNL_VERTEX *v0 ) { LOCAL_VARS; FLUSH_VERTEX = TAG(flush_tri_strip_5); @@ -307,7 +307,7 @@ static void TAG(flush_tri_strip_4)( GLcontext *ctx, TNL_VERTEX *v0 ) DO_TRISTRIP_TRI( 2, 3 ); } -static void TAG(flush_tri_strip_5)( GLcontext *ctx, TNL_VERTEX *v0 ) +static void TAG(flush_tri_strip_5)( struct gl_context *ctx, TNL_VERTEX *v0 ) { LOCAL_VARS; FLUSH_VERTEX = TAG(flush_tri_strip_2); @@ -321,10 +321,10 @@ static void TAG(flush_tri_strip_5)( GLcontext *ctx, TNL_VERTEX *v0 ) * GL_TRIANGLE_FAN */ -static void TAG(flush_tri_fan_2)( GLcontext *ctx, TNL_VERTEX *v0 ); -static void TAG(flush_tri_fan_1)( GLcontext *ctx, TNL_VERTEX *v0 ); +static void TAG(flush_tri_fan_2)( struct gl_context *ctx, TNL_VERTEX *v0 ); +static void TAG(flush_tri_fan_1)( struct gl_context *ctx, TNL_VERTEX *v0 ); -static void TAG(flush_tri_fan_0)( GLcontext *ctx, TNL_VERTEX *v0 ) +static void TAG(flush_tri_fan_0)( struct gl_context *ctx, TNL_VERTEX *v0 ) { LOCAL_VARS; @@ -332,7 +332,7 @@ static void TAG(flush_tri_fan_0)( GLcontext *ctx, TNL_VERTEX *v0 ) FLUSH_VERTEX = TAG(flush_tri_fan_1); } -static void TAG(flush_tri_fan_1)( GLcontext *ctx, TNL_VERTEX *v0 ) +static void TAG(flush_tri_fan_1)( struct gl_context *ctx, TNL_VERTEX *v0 ) { LOCAL_VARS; @@ -356,7 +356,7 @@ static void TAG(flush_tri_fan_1)( GLcontext *ctx, TNL_VERTEX *v0 ) EMIT_VERTEX( v0 ); \ } -static void TAG(flush_tri_fan_2)( GLcontext *ctx, TNL_VERTEX *v0 ) +static void TAG(flush_tri_fan_2)( struct gl_context *ctx, TNL_VERTEX *v0 ) { LOCAL_VARS; ACTIVE_VERTEX = IMM_VERTICES( 1 ); @@ -364,7 +364,7 @@ static void TAG(flush_tri_fan_2)( GLcontext *ctx, TNL_VERTEX *v0 ) DO_TRIFAN_TRI( 0, 1 ); } -static void TAG(flush_tri_fan_3)( GLcontext *ctx, TNL_VERTEX *v0 ) +static void TAG(flush_tri_fan_3)( struct gl_context *ctx, TNL_VERTEX *v0 ) { LOCAL_VARS; ACTIVE_VERTEX = IMM_VERTICES( 2 ); @@ -378,32 +378,32 @@ static void TAG(flush_tri_fan_3)( GLcontext *ctx, TNL_VERTEX *v0 ) * GL_QUADS */ -static void TAG(flush_quad_3)( GLcontext *ctx, TNL_VERTEX *v0 ); -static void TAG(flush_quad_2)( GLcontext *ctx, TNL_VERTEX *v0 ); -static void TAG(flush_quad_1)( GLcontext *ctx, TNL_VERTEX *v0 ); +static void TAG(flush_quad_3)( struct gl_context *ctx, TNL_VERTEX *v0 ); +static void TAG(flush_quad_2)( struct gl_context *ctx, TNL_VERTEX *v0 ); +static void TAG(flush_quad_1)( struct gl_context *ctx, TNL_VERTEX *v0 ); -static void TAG(flush_quad_0)( GLcontext *ctx, TNL_VERTEX *v0 ) +static void TAG(flush_quad_0)( struct gl_context *ctx, TNL_VERTEX *v0 ) { LOCAL_VARS; IMM_VERTEX( v0 ) = v0 + 1; FLUSH_VERTEX = TAG(flush_quad_1); } -static void TAG(flush_quad_1)( GLcontext *ctx, TNL_VERTEX *v0 ) +static void TAG(flush_quad_1)( struct gl_context *ctx, TNL_VERTEX *v0 ) { LOCAL_VARS; IMM_VERTEX( v0 ) = v0 + 1; FLUSH_VERTEX = TAG(flush_quad_2); } -static void TAG(flush_quad_2)( GLcontext *ctx, TNL_VERTEX *v0 ) +static void TAG(flush_quad_2)( struct gl_context *ctx, TNL_VERTEX *v0 ) { LOCAL_VARS; IMM_VERTEX( v0 ) = v0 + 1; FLUSH_VERTEX = TAG(flush_quad_3); } -static void TAG(flush_quad_3)( GLcontext *ctx, TNL_VERTEX *v0 ) +static void TAG(flush_quad_3)( struct gl_context *ctx, TNL_VERTEX *v0 ) { LOCAL_VARS; TNL_VERTEX *v3 = v0 - 3; @@ -431,11 +431,11 @@ static void TAG(flush_quad_3)( GLcontext *ctx, TNL_VERTEX *v0 ) * GL_QUAD_STRIP */ -static void TAG(flush_quad_strip_3)( GLcontext *ctx, TNL_VERTEX *v0 ); -static void TAG(flush_quad_strip_2)( GLcontext *ctx, TNL_VERTEX *v0 ); -static void TAG(flush_quad_strip_1)( GLcontext *ctx, TNL_VERTEX *v0 ); +static void TAG(flush_quad_strip_3)( struct gl_context *ctx, TNL_VERTEX *v0 ); +static void TAG(flush_quad_strip_2)( struct gl_context *ctx, TNL_VERTEX *v0 ); +static void TAG(flush_quad_strip_1)( struct gl_context *ctx, TNL_VERTEX *v0 ); -static void TAG(flush_quad_strip_0)( GLcontext *ctx, TNL_VERTEX *v0 ) +static void TAG(flush_quad_strip_0)( struct gl_context *ctx, TNL_VERTEX *v0 ) { LOCAL_VARS; @@ -444,7 +444,7 @@ static void TAG(flush_quad_strip_0)( GLcontext *ctx, TNL_VERTEX *v0 ) FLUSH_VERTEX = TAG(flush_quad_strip_1); } -static void TAG(flush_quad_strip_1)( GLcontext *ctx, TNL_VERTEX *v0 ) +static void TAG(flush_quad_strip_1)( struct gl_context *ctx, TNL_VERTEX *v0 ) { LOCAL_VARS; @@ -453,7 +453,7 @@ static void TAG(flush_quad_strip_1)( GLcontext *ctx, TNL_VERTEX *v0 ) FLUSH_VERTEX = TAG(flush_quad_strip_2); } -static void TAG(flush_quad_strip_2)( GLcontext *ctx, TNL_VERTEX *v0 ) +static void TAG(flush_quad_strip_2)( struct gl_context *ctx, TNL_VERTEX *v0 ) { LOCAL_VARS; @@ -462,7 +462,7 @@ static void TAG(flush_quad_strip_2)( GLcontext *ctx, TNL_VERTEX *v0 ) FLUSH_VERTEX = TAG(flush_quad_strip_3); } -static void TAG(flush_quad_strip_3)( GLcontext *ctx, TNL_VERTEX *v0 ) +static void TAG(flush_quad_strip_3)( struct gl_context *ctx, TNL_VERTEX *v0 ) { LOCAL_VARS; TNL_VERTEX *v3 = IMM_VERTEX( v3 ); @@ -489,17 +489,17 @@ static void TAG(flush_quad_strip_3)( GLcontext *ctx, TNL_VERTEX *v0 ) * GL_POLYGON */ -static void TAG(flush_poly_2)( GLcontext *ctx, TNL_VERTEX *v0 ); -static void TAG(flush_poly_1)( GLcontext *ctx, TNL_VERTEX *v0 ); +static void TAG(flush_poly_2)( struct gl_context *ctx, TNL_VERTEX *v0 ); +static void TAG(flush_poly_1)( struct gl_context *ctx, TNL_VERTEX *v0 ); -static void TAG(flush_poly_0)( GLcontext *ctx, TNL_VERTEX *v0 ) +static void TAG(flush_poly_0)( struct gl_context *ctx, TNL_VERTEX *v0 ) { LOCAL_VARS; ACTIVE_VERTEX = IMM_VERTICES( 1 ); FLUSH_VERTEX = TAG(flush_poly_1); } -static void TAG(flush_poly_1)( GLcontext *ctx, TNL_VERTEX *v0 ) +static void TAG(flush_poly_1)( struct gl_context *ctx, TNL_VERTEX *v0 ) { LOCAL_VARS; ACTIVE_VERTEX = IMM_VERTICES( 2 ); @@ -522,7 +522,7 @@ static void TAG(flush_poly_1)( GLcontext *ctx, TNL_VERTEX *v0 ) EMIT_VERTEX( v0 ); \ } -static void TAG(flush_poly_2)( GLcontext *ctx, TNL_VERTEX *v0 ) +static void TAG(flush_poly_2)( struct gl_context *ctx, TNL_VERTEX *v0 ) { LOCAL_VARS; ACTIVE_VERTEX = IMM_VERTICES( 1 ); @@ -530,7 +530,7 @@ static void TAG(flush_poly_2)( GLcontext *ctx, TNL_VERTEX *v0 ) DO_POLY_TRI( 0, 1 ); } -static void TAG(flush_poly_3)( GLcontext *ctx, TNL_VERTEX *v0 ) +static void TAG(flush_poly_3)( struct gl_context *ctx, TNL_VERTEX *v0 ) { LOCAL_VARS; ACTIVE_VERTEX = IMM_VERTICES( 2 ); @@ -539,7 +539,7 @@ static void TAG(flush_poly_3)( GLcontext *ctx, TNL_VERTEX *v0 ) } -void (*TAG(flush_tab)[GL_POLYGON+1])( GLcontext *, TNL_VERTEX * ) = +void (*TAG(flush_tab)[GL_POLYGON+1])( struct gl_context *, TNL_VERTEX * ) = { TAG(flush_point), TAG(flush_line_0), diff --git a/src/mesa/tnl_dd/imm/t_dd_imm_vb.c b/src/mesa/tnl_dd/imm/t_dd_imm_vb.c index 0c4462f556..5081d92dba 100644 --- a/src/mesa/tnl_dd/imm/t_dd_imm_vb.c +++ b/src/mesa/tnl_dd/imm/t_dd_imm_vb.c @@ -113,7 +113,7 @@ do { \ /* Clip a line against the viewport and user clip planes. */ -static void TAG(clip_draw_line)( GLcontext *ctx, +static void TAG(clip_draw_line)( struct gl_context *ctx, TNL_VERTEX *I, TNL_VERTEX *J, GLuint mask ) @@ -140,7 +140,7 @@ static void TAG(clip_draw_line)( GLcontext *ctx, /* Clip a triangle against the viewport and user clip planes. */ -static void TAG(clip_draw_triangle)( GLcontext *ctx, +static void TAG(clip_draw_triangle)( struct gl_context *ctx, TNL_VERTEX *v0, TNL_VERTEX *v1, TNL_VERTEX *v2, @@ -173,7 +173,7 @@ static void TAG(clip_draw_triangle)( GLcontext *ctx, } -static __inline void TAG(draw_triangle)( GLcontext *ctx, +static __inline void TAG(draw_triangle)( struct gl_context *ctx, TNL_VERTEX *v0, TNL_VERTEX *v1, TNL_VERTEX *v2 ) @@ -188,7 +188,7 @@ static __inline void TAG(draw_triangle)( GLcontext *ctx, } } -static __inline void TAG(draw_line)( GLcontext *ctx, +static __inline void TAG(draw_line)( struct gl_context *ctx, TNL_VERTEX *v0, TNL_VERTEX *v1 ) { diff --git a/src/mesa/tnl_dd/imm/t_dd_imm_vbtmp.h b/src/mesa/tnl_dd/imm/t_dd_imm_vbtmp.h index 2f76553cff..bb394622fa 100644 --- a/src/mesa/tnl_dd/imm/t_dd_imm_vbtmp.h +++ b/src/mesa/tnl_dd/imm/t_dd_imm_vbtmp.h @@ -41,7 +41,7 @@ /* COPY_VERTEX_FROM_CURRENT in t_dd_imm_vapi.c */ -static void TAG(emit_vfmt)( GLcontext *ctx, VERTEX *v ) +static void TAG(emit_vfmt)( struct gl_context *ctx, VERTEX *v ) { LOCALVARS ; @@ -132,7 +132,7 @@ static void TAG(emit_vfmt)( GLcontext *ctx, VERTEX *v ) -static void TAG(interp)( GLcontext *ctx, +static void TAG(interp)( struct gl_context *ctx, GLfloat t, TNL_VERTEX *dst, TNL_VERTEX *in, @@ -240,7 +240,7 @@ static void TAG(interp)( GLcontext *ctx, } -static __inline void TAG(copy_pv)( GLcontext *ctx, +static __inline void TAG(copy_pv)( struct gl_context *ctx, TNL_VERTEX *dst, TNL_VERTEX *src ) { diff --git a/src/mesa/tnl_dd/t_dd.c b/src/mesa/tnl_dd/t_dd.c index 731da5c320..214ebd4280 100644 --- a/src/mesa/tnl_dd/t_dd.c +++ b/src/mesa/tnl_dd/t_dd.c @@ -26,7 +26,7 @@ * Keith Whitwell */ -static void copy_pv_rgba4_spec5( GLcontext *ctx, GLuint edst, GLuint esrc ) +static void copy_pv_rgba4_spec5( struct gl_context *ctx, GLuint edst, GLuint esrc ) { i810ContextPtr imesa = I810_CONTEXT( ctx ); GLubyte *i810verts = (GLubyte *)imesa->verts; @@ -37,7 +37,7 @@ static void copy_pv_rgba4_spec5( GLcontext *ctx, GLuint edst, GLuint esrc ) dst->ui[5] = src->ui[5]; } -static void copy_pv_rgba4( GLcontext *ctx, GLuint edst, GLuint esrc ) +static void copy_pv_rgba4( struct gl_context *ctx, GLuint edst, GLuint esrc ) { i810ContextPtr imesa = I810_CONTEXT( ctx ); GLubyte *i810verts = (GLubyte *)imesa->verts; @@ -47,7 +47,7 @@ static void copy_pv_rgba4( GLcontext *ctx, GLuint edst, GLuint esrc ) dst->ui[4] = src->ui[4]; } -static void copy_pv_rgba3( GLcontext *ctx, GLuint edst, GLuint esrc ) +static void copy_pv_rgba3( struct gl_context *ctx, GLuint edst, GLuint esrc ) { i810ContextPtr imesa = I810_CONTEXT( ctx ); GLubyte *i810verts = (GLubyte *)imesa->verts; diff --git a/src/mesa/tnl_dd/t_dd_dmatmp.h b/src/mesa/tnl_dd/t_dd_dmatmp.h index 2424204b88..997fc0b20c 100644 --- a/src/mesa/tnl_dd/t_dd_dmatmp.h +++ b/src/mesa/tnl_dd/t_dd_dmatmp.h @@ -73,7 +73,7 @@ do { \ #if (HAVE_ELTS) -static void *TAG(emit_elts)( GLcontext *ctx, GLuint *elts, GLuint nr, +static void *TAG(emit_elts)( struct gl_context *ctx, GLuint *elts, GLuint nr, void *buf) { GLint i; @@ -94,7 +94,7 @@ static void *TAG(emit_elts)( GLcontext *ctx, GLuint *elts, GLuint nr, } #endif -static __inline void *TAG(emit_verts)( GLcontext *ctx, GLuint start, +static __inline void *TAG(emit_verts)( struct gl_context *ctx, GLuint start, GLuint count, void *buf ) { return EMIT_VERTS(ctx, start, count, buf); @@ -104,7 +104,7 @@ static __inline void *TAG(emit_verts)( GLcontext *ctx, GLuint start, * Render non-indexed primitives. ***********************************************************************/ -static void TAG(render_points_verts)( GLcontext *ctx, +static void TAG(render_points_verts)( struct gl_context *ctx, GLuint start, GLuint count, GLuint flags ) @@ -133,7 +133,7 @@ static void TAG(render_points_verts)( GLcontext *ctx, } } -static void TAG(render_lines_verts)( GLcontext *ctx, +static void TAG(render_lines_verts)( struct gl_context *ctx, GLuint start, GLuint count, GLuint flags ) @@ -169,7 +169,7 @@ static void TAG(render_lines_verts)( GLcontext *ctx, } -static void TAG(render_line_strip_verts)( GLcontext *ctx, +static void TAG(render_line_strip_verts)( struct gl_context *ctx, GLuint start, GLuint count, GLuint flags ) @@ -201,7 +201,7 @@ static void TAG(render_line_strip_verts)( GLcontext *ctx, } -static void TAG(render_line_loop_verts)( GLcontext *ctx, +static void TAG(render_line_loop_verts)( struct gl_context *ctx, GLuint start, GLuint count, GLuint flags ) @@ -267,7 +267,7 @@ static void TAG(render_line_loop_verts)( GLcontext *ctx, } -static void TAG(render_triangles_verts)( GLcontext *ctx, +static void TAG(render_triangles_verts)( struct gl_context *ctx, GLuint start, GLuint count, GLuint flags ) @@ -298,7 +298,7 @@ static void TAG(render_triangles_verts)( GLcontext *ctx, -static void TAG(render_tri_strip_verts)( GLcontext *ctx, +static void TAG(render_tri_strip_verts)( struct gl_context *ctx, GLuint start, GLuint count, GLuint flags ) @@ -336,7 +336,7 @@ static void TAG(render_tri_strip_verts)( GLcontext *ctx, } } -static void TAG(render_tri_fan_verts)( GLcontext *ctx, +static void TAG(render_tri_fan_verts)( struct gl_context *ctx, GLuint start, GLuint count, GLuint flags ) @@ -376,7 +376,7 @@ static void TAG(render_tri_fan_verts)( GLcontext *ctx, } -static void TAG(render_poly_verts)( GLcontext *ctx, +static void TAG(render_poly_verts)( struct gl_context *ctx, GLuint start, GLuint count, GLuint flags ) @@ -414,7 +414,7 @@ static void TAG(render_poly_verts)( GLcontext *ctx, } } -static void TAG(render_quad_strip_verts)( GLcontext *ctx, +static void TAG(render_quad_strip_verts)( struct gl_context *ctx, GLuint start, GLuint count, GLuint flags ) @@ -540,7 +540,7 @@ static void TAG(render_quad_strip_verts)( GLcontext *ctx, } -static void TAG(render_quads_verts)( GLcontext *ctx, +static void TAG(render_quads_verts)( struct gl_context *ctx, GLuint start, GLuint count, GLuint flags ) @@ -649,7 +649,7 @@ static void TAG(render_quads_verts)( GLcontext *ctx, } } -static void TAG(render_noop)( GLcontext *ctx, +static void TAG(render_noop)( struct gl_context *ctx, GLuint start, GLuint count, GLuint flags ) @@ -680,7 +680,7 @@ static tnl_render_func TAG(render_tab_verts)[GL_POLYGON+2] = ****************************************************************************/ #if (HAVE_ELTS) -static void TAG(render_points_elts)( GLcontext *ctx, +static void TAG(render_points_elts)( struct gl_context *ctx, GLuint start, GLuint count, GLuint flags ) @@ -712,7 +712,7 @@ static void TAG(render_points_elts)( GLcontext *ctx, -static void TAG(render_lines_elts)( GLcontext *ctx, +static void TAG(render_lines_elts)( struct gl_context *ctx, GLuint start, GLuint count, GLuint flags ) @@ -749,7 +749,7 @@ static void TAG(render_lines_elts)( GLcontext *ctx, } -static void TAG(render_line_strip_elts)( GLcontext *ctx, +static void TAG(render_line_strip_elts)( struct gl_context *ctx, GLuint start, GLuint count, GLuint flags ) @@ -783,7 +783,7 @@ static void TAG(render_line_strip_elts)( GLcontext *ctx, } -static void TAG(render_line_loop_elts)( GLcontext *ctx, +static void TAG(render_line_loop_elts)( struct gl_context *ctx, GLuint start, GLuint count, GLuint flags ) @@ -855,7 +855,7 @@ static void TAG(render_line_loop_elts)( GLcontext *ctx, * buffers. For elts, this is probably no better (worse?) than the * standard path. */ -static void TAG(render_triangles_elts)( GLcontext *ctx, +static void TAG(render_triangles_elts)( struct gl_context *ctx, GLuint start, GLuint count, GLuint flags ) @@ -889,7 +889,7 @@ static void TAG(render_triangles_elts)( GLcontext *ctx, -static void TAG(render_tri_strip_elts)( GLcontext *ctx, +static void TAG(render_tri_strip_elts)( struct gl_context *ctx, GLuint start, GLuint count, GLuint flags ) @@ -927,7 +927,7 @@ static void TAG(render_tri_strip_elts)( GLcontext *ctx, } } -static void TAG(render_tri_fan_elts)( GLcontext *ctx, +static void TAG(render_tri_fan_elts)( struct gl_context *ctx, GLuint start, GLuint count, GLuint flags ) @@ -965,7 +965,7 @@ static void TAG(render_tri_fan_elts)( GLcontext *ctx, } -static void TAG(render_poly_elts)( GLcontext *ctx, +static void TAG(render_poly_elts)( struct gl_context *ctx, GLuint start, GLuint count, GLuint flags ) @@ -1003,7 +1003,7 @@ static void TAG(render_poly_elts)( GLcontext *ctx, } } -static void TAG(render_quad_strip_elts)( GLcontext *ctx, +static void TAG(render_quad_strip_elts)( struct gl_context *ctx, GLuint start, GLuint count, GLuint flags ) @@ -1071,7 +1071,7 @@ static void TAG(render_quad_strip_elts)( GLcontext *ctx, } -static void TAG(render_quads_elts)( GLcontext *ctx, +static void TAG(render_quads_elts)( struct gl_context *ctx, GLuint start, GLuint count, GLuint flags ) @@ -1173,7 +1173,7 @@ static tnl_render_func TAG(render_tab_elts)[GL_POLYGON+2] = /* Pre-check the primitives in the VB to prevent the need for * fallbacks later on. */ -static GLboolean TAG(validate_render)( GLcontext *ctx, +static GLboolean TAG(validate_render)( struct gl_context *ctx, struct vertex_buffer *VB ) { GLint i; diff --git a/src/mesa/tnl_dd/t_dd_dmatmp2.h b/src/mesa/tnl_dd/t_dd_dmatmp2.h index cd225b6343..8836bde09f 100644 --- a/src/mesa/tnl_dd/t_dd_dmatmp2.h +++ b/src/mesa/tnl_dd/t_dd_dmatmp2.h @@ -70,7 +70,7 @@ do { \ /**********************************************************************/ -static ELT_TYPE *TAG(emit_elts)( GLcontext *ctx, +static ELT_TYPE *TAG(emit_elts)( struct gl_context *ctx, ELT_TYPE *dest, GLuint *elts, GLuint nr ) { @@ -89,7 +89,7 @@ static ELT_TYPE *TAG(emit_elts)( GLcontext *ctx, return dest; } -static ELT_TYPE *TAG(emit_consecutive_elts)( GLcontext *ctx, +static ELT_TYPE *TAG(emit_consecutive_elts)( struct gl_context *ctx, ELT_TYPE *dest, GLuint start, GLuint nr ) { @@ -114,7 +114,7 @@ static ELT_TYPE *TAG(emit_consecutive_elts)( GLcontext *ctx, -static void TAG(render_points_verts)( GLcontext *ctx, +static void TAG(render_points_verts)( struct gl_context *ctx, GLuint start, GLuint count, GLuint flags ) @@ -126,7 +126,7 @@ static void TAG(render_points_verts)( GLcontext *ctx, } } -static void TAG(render_lines_verts)( GLcontext *ctx, +static void TAG(render_lines_verts)( struct gl_context *ctx, GLuint start, GLuint count, GLuint flags ) @@ -150,7 +150,7 @@ static void TAG(render_lines_verts)( GLcontext *ctx, } -static void TAG(render_line_strip_verts)( GLcontext *ctx, +static void TAG(render_line_strip_verts)( struct gl_context *ctx, GLuint start, GLuint count, GLuint flags ) @@ -197,7 +197,7 @@ static void TAG(render_line_strip_verts)( GLcontext *ctx, } -static void TAG(render_line_loop_verts)( GLcontext *ctx, +static void TAG(render_line_loop_verts)( struct gl_context *ctx, GLuint start, GLuint count, GLuint flags ) @@ -286,7 +286,7 @@ static void TAG(render_line_loop_verts)( GLcontext *ctx, } -static void TAG(render_triangles_verts)( GLcontext *ctx, +static void TAG(render_triangles_verts)( struct gl_context *ctx, GLuint start, GLuint count, GLuint flags ) @@ -307,7 +307,7 @@ static void TAG(render_triangles_verts)( GLcontext *ctx, -static void TAG(render_tri_strip_verts)( GLcontext *ctx, +static void TAG(render_tri_strip_verts)( struct gl_context *ctx, GLuint start, GLuint count, GLuint flags ) @@ -352,7 +352,7 @@ static void TAG(render_tri_strip_verts)( GLcontext *ctx, EMIT_PRIM( ctx, GL_TRIANGLE_STRIP, HW_TRIANGLE_STRIP_0, start, count ); } -static void TAG(render_tri_fan_verts)( GLcontext *ctx, +static void TAG(render_tri_fan_verts)( struct gl_context *ctx, GLuint start, GLuint count, GLuint flags ) @@ -395,7 +395,7 @@ static void TAG(render_tri_fan_verts)( GLcontext *ctx, } -static void TAG(render_poly_verts)( GLcontext *ctx, +static void TAG(render_poly_verts)( struct gl_context *ctx, GLuint start, GLuint count, GLuint flags ) @@ -409,7 +409,7 @@ static void TAG(render_poly_verts)( GLcontext *ctx, EMIT_PRIM( ctx, GL_POLYGON, HW_POLYGON, start, count ); } -static void TAG(render_quad_strip_verts)( GLcontext *ctx, +static void TAG(render_quad_strip_verts)( struct gl_context *ctx, GLuint start, GLuint count, GLuint flags ) @@ -460,7 +460,7 @@ static void TAG(render_quad_strip_verts)( GLcontext *ctx, } -static void TAG(render_quads_verts)( GLcontext *ctx, +static void TAG(render_quads_verts)( struct gl_context *ctx, GLuint start, GLuint count, GLuint flags ) @@ -509,7 +509,7 @@ static void TAG(render_quads_verts)( GLcontext *ctx, } } -static void TAG(render_noop)( GLcontext *ctx, +static void TAG(render_noop)( struct gl_context *ctx, GLuint start, GLuint count, GLuint flags ) @@ -539,7 +539,7 @@ static tnl_render_func TAG(render_tab_verts)[GL_POLYGON+2] = * Render elts using hardware indexed verts * ****************************************************************************/ -static void TAG(render_points_elts)( GLcontext *ctx, +static void TAG(render_points_elts)( struct gl_context *ctx, GLuint start, GLuint count, GLuint flags ) @@ -563,7 +563,7 @@ static void TAG(render_points_elts)( GLcontext *ctx, -static void TAG(render_lines_elts)( GLcontext *ctx, +static void TAG(render_lines_elts)( struct gl_context *ctx, GLuint start, GLuint count, GLuint flags ) @@ -602,7 +602,7 @@ static void TAG(render_lines_elts)( GLcontext *ctx, } -static void TAG(render_line_strip_elts)( GLcontext *ctx, +static void TAG(render_line_strip_elts)( struct gl_context *ctx, GLuint start, GLuint count, GLuint flags ) @@ -631,7 +631,7 @@ static void TAG(render_line_strip_elts)( GLcontext *ctx, } -static void TAG(render_line_loop_elts)( GLcontext *ctx, +static void TAG(render_line_loop_elts)( struct gl_context *ctx, GLuint start, GLuint count, GLuint flags ) @@ -683,7 +683,7 @@ static void TAG(render_line_loop_elts)( GLcontext *ctx, } -static void TAG(render_triangles_elts)( GLcontext *ctx, +static void TAG(render_triangles_elts)( struct gl_context *ctx, GLuint start, GLuint count, GLuint flags ) @@ -716,7 +716,7 @@ static void TAG(render_triangles_elts)( GLcontext *ctx, -static void TAG(render_tri_strip_elts)( GLcontext *ctx, +static void TAG(render_tri_strip_elts)( struct gl_context *ctx, GLuint start, GLuint count, GLuint flags ) @@ -746,7 +746,7 @@ static void TAG(render_tri_strip_elts)( GLcontext *ctx, } } -static void TAG(render_tri_fan_elts)( GLcontext *ctx, +static void TAG(render_tri_fan_elts)( struct gl_context *ctx, GLuint start, GLuint count, GLuint flags ) @@ -773,7 +773,7 @@ static void TAG(render_tri_fan_elts)( GLcontext *ctx, } -static void TAG(render_poly_elts)( GLcontext *ctx, +static void TAG(render_poly_elts)( struct gl_context *ctx, GLuint start, GLuint count, GLuint flags ) @@ -799,7 +799,7 @@ static void TAG(render_poly_elts)( GLcontext *ctx, } } -static void TAG(render_quad_strip_elts)( GLcontext *ctx, +static void TAG(render_quad_strip_elts)( struct gl_context *ctx, GLuint start, GLuint count, GLuint flags ) @@ -861,7 +861,7 @@ static void TAG(render_quad_strip_elts)( GLcontext *ctx, } -static void TAG(render_quads_elts)( GLcontext *ctx, +static void TAG(render_quads_elts)( struct gl_context *ctx, GLuint start, GLuint count, GLuint flags ) diff --git a/src/mesa/tnl_dd/t_dd_rendertmp.h b/src/mesa/tnl_dd/t_dd_rendertmp.h index b9f030195d..692b4d1fd7 100644 --- a/src/mesa/tnl_dd/t_dd_rendertmp.h +++ b/src/mesa/tnl_dd/t_dd_rendertmp.h @@ -63,7 +63,7 @@ #define RENDER_TAB_QUALIFIER static #endif -static void TAG(render_points)( GLcontext *ctx, +static void TAG(render_points)( struct gl_context *ctx, GLuint start, GLuint count, GLuint flags ) @@ -77,7 +77,7 @@ static void TAG(render_points)( GLcontext *ctx, POSTFIX; } -static void TAG(render_lines)( GLcontext *ctx, +static void TAG(render_lines)( struct gl_context *ctx, GLuint start, GLuint count, GLuint flags ) @@ -96,7 +96,7 @@ static void TAG(render_lines)( GLcontext *ctx, } -static void TAG(render_line_strip)( GLcontext *ctx, +static void TAG(render_line_strip)( struct gl_context *ctx, GLuint start, GLuint count, GLuint flags ) @@ -118,7 +118,7 @@ static void TAG(render_line_strip)( GLcontext *ctx, } -static void TAG(render_line_loop)( GLcontext *ctx, +static void TAG(render_line_loop)( struct gl_context *ctx, GLuint start, GLuint count, GLuint flags ) @@ -150,7 +150,7 @@ static void TAG(render_line_loop)( GLcontext *ctx, } -static void TAG(render_triangles)( GLcontext *ctx, +static void TAG(render_triangles)( struct gl_context *ctx, GLuint start, GLuint count, GLuint flags ) @@ -177,7 +177,7 @@ static void TAG(render_triangles)( GLcontext *ctx, -static void TAG(render_tri_strip)( GLcontext *ctx, +static void TAG(render_tri_strip)( struct gl_context *ctx, GLuint start, GLuint count, GLuint flags ) @@ -213,7 +213,7 @@ static void TAG(render_tri_strip)( GLcontext *ctx, } -static void TAG(render_tri_fan)( GLcontext *ctx, +static void TAG(render_tri_fan)( struct gl_context *ctx, GLuint start, GLuint count, GLuint flags ) @@ -252,7 +252,7 @@ static void TAG(render_tri_fan)( GLcontext *ctx, } -static void TAG(render_poly)( GLcontext *ctx, +static void TAG(render_poly)( struct gl_context *ctx, GLuint start, GLuint count, GLuint flags ) @@ -321,7 +321,7 @@ static void TAG(render_poly)( GLcontext *ctx, POSTFIX; } -static void TAG(render_quads)( GLcontext *ctx, +static void TAG(render_quads)( struct gl_context *ctx, GLuint start, GLuint count, GLuint flags ) @@ -346,7 +346,7 @@ static void TAG(render_quads)( GLcontext *ctx, POSTFIX; } -static void TAG(render_quad_strip)( GLcontext *ctx, +static void TAG(render_quad_strip)( struct gl_context *ctx, GLuint start, GLuint count, GLuint flags ) @@ -384,7 +384,7 @@ static void TAG(render_quad_strip)( GLcontext *ctx, POSTFIX; } -static void TAG(render_noop)( GLcontext *ctx, +static void TAG(render_noop)( struct gl_context *ctx, GLuint start, GLuint count, GLuint flags ) @@ -392,7 +392,7 @@ static void TAG(render_noop)( GLcontext *ctx, (void)(ctx && start && count && flags); } -RENDER_TAB_QUALIFIER void (*TAG(render_tab)[GL_POLYGON+2])(GLcontext *, +RENDER_TAB_QUALIFIER void (*TAG(render_tab)[GL_POLYGON+2])(struct gl_context *, GLuint, GLuint, GLuint) = diff --git a/src/mesa/tnl_dd/t_dd_triemit.h b/src/mesa/tnl_dd/t_dd_triemit.h index f5979ee9a7..39c9d26481 100644 --- a/src/mesa/tnl_dd/t_dd_triemit.h +++ b/src/mesa/tnl_dd/t_dd_triemit.h @@ -136,7 +136,7 @@ static __inline void TAG(point)( CTX_ARG, #endif -static void TAG(fast_clipped_poly)( GLcontext *ctx, const GLuint *elts, +static void TAG(fast_clipped_poly)( struct gl_context *ctx, const GLuint *elts, GLuint n ) { LOCAL_VARS diff --git a/src/mesa/tnl_dd/t_dd_tritmp.h b/src/mesa/tnl_dd/t_dd_tritmp.h index 2c36d845ab..022f0c6c60 100644 --- a/src/mesa/tnl_dd/t_dd_tritmp.h +++ b/src/mesa/tnl_dd/t_dd_tritmp.h @@ -111,7 +111,7 @@ #endif #if DO_TRI -static void TAG(triangle)( GLcontext *ctx, GLuint e0, GLuint e1, GLuint e2 ) +static void TAG(triangle)( struct gl_context *ctx, GLuint e0, GLuint e1, GLuint e2 ) { struct vertex_buffer *VB = &TNL_CONTEXT( ctx )->vb; VERTEX *v[3]; @@ -335,7 +335,7 @@ static void TAG(triangle)( GLcontext *ctx, GLuint e0, GLuint e1, GLuint e2 ) #if DO_QUAD #if DO_FULL_QUAD -static void TAG(quadr)( GLcontext *ctx, +static void TAG(quadr)( struct gl_context *ctx, GLuint e0, GLuint e1, GLuint e2, GLuint e3 ) { struct vertex_buffer *VB = &TNL_CONTEXT( ctx )->vb; @@ -575,7 +575,7 @@ static void TAG(quadr)( GLcontext *ctx, } } #else -static void TAG(quadr)( GLcontext *ctx, GLuint e0, +static void TAG(quadr)( struct gl_context *ctx, GLuint e0, GLuint e1, GLuint e2, GLuint e3 ) { if (DO_UNFILLED) { @@ -597,7 +597,7 @@ static void TAG(quadr)( GLcontext *ctx, GLuint e0, #endif #if DO_LINE -static void TAG(line)( GLcontext *ctx, GLuint e0, GLuint e1 ) +static void TAG(line)( struct gl_context *ctx, GLuint e0, GLuint e1 ) { struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb; VERTEX *v[2]; @@ -628,7 +628,7 @@ static void TAG(line)( GLcontext *ctx, GLuint e0, GLuint e1 ) #endif #if DO_POINTS -static void TAG(points)( GLcontext *ctx, GLuint first, GLuint last ) +static void TAG(points)( struct gl_context *ctx, GLuint first, GLuint last ) { struct vertex_buffer *VB = &TNL_CONTEXT( ctx )->vb; GLuint i; diff --git a/src/mesa/tnl_dd/t_dd_unfilled.h b/src/mesa/tnl_dd/t_dd_unfilled.h index 9c467291a1..9856a36d6f 100644 --- a/src/mesa/tnl_dd/t_dd_unfilled.h +++ b/src/mesa/tnl_dd/t_dd_unfilled.h @@ -32,7 +32,7 @@ #define VERT_RESTORE_SPEC( idx ) #endif -static void TAG(unfilled_tri)( GLcontext *ctx, +static void TAG(unfilled_tri)( struct gl_context *ctx, GLenum mode, GLuint e0, GLuint e1, GLuint e2 ) { @@ -95,7 +95,7 @@ static void TAG(unfilled_tri)( GLcontext *ctx, } -static void TAG(unfilled_quad)( GLcontext *ctx, +static void TAG(unfilled_quad)( struct gl_context *ctx, GLenum mode, GLuint e0, GLuint e1, GLuint e2, GLuint e3 ) diff --git a/src/mesa/tnl_dd/t_dd_vb.c b/src/mesa/tnl_dd/t_dd_vb.c index a8a0a69768..543b0a5685 100644 --- a/src/mesa/tnl_dd/t_dd_vb.c +++ b/src/mesa/tnl_dd/t_dd_vb.c @@ -46,7 +46,7 @@ * really convenient to put them. Need to build some actual .o files in * this directory? */ -static void copy_pv_rgba4_spec5( GLcontext *ctx, GLuint edst, GLuint esrc ) +static void copy_pv_rgba4_spec5( struct gl_context *ctx, GLuint edst, GLuint esrc ) { LOCALVARS GLubyte *verts = GET_VERTEX_STORE(); @@ -57,7 +57,7 @@ static void copy_pv_rgba4_spec5( GLcontext *ctx, GLuint edst, GLuint esrc ) dst[5] = src[5]; } -static void copy_pv_rgba4( GLcontext *ctx, GLuint edst, GLuint esrc ) +static void copy_pv_rgba4( struct gl_context *ctx, GLuint edst, GLuint esrc ) { LOCALVARS GLubyte *verts = GET_VERTEX_STORE(); @@ -67,7 +67,7 @@ static void copy_pv_rgba4( GLcontext *ctx, GLuint edst, GLuint esrc ) dst[4] = src[4]; } -static void copy_pv_rgba3( GLcontext *ctx, GLuint edst, GLuint esrc ) +static void copy_pv_rgba3( struct gl_context *ctx, GLuint edst, GLuint esrc ) { LOCALVARS GLubyte *verts = GET_VERTEX_STORE(); @@ -78,7 +78,7 @@ static void copy_pv_rgba3( GLcontext *ctx, GLuint edst, GLuint esrc ) } -void TAG(translate_vertex)(GLcontext *ctx, +void TAG(translate_vertex)(struct gl_context *ctx, const VERTEX *src, SWvertex *dst) { @@ -189,10 +189,10 @@ void TAG(translate_vertex)(GLcontext *ctx, /* prototype to silence warning */ -void TAG(print_vertex)( GLcontext *ctx, const VERTEX *v ); +void TAG(print_vertex)( struct gl_context *ctx, const VERTEX *v ); -void TAG(print_vertex)( GLcontext *ctx, const VERTEX *v ) +void TAG(print_vertex)( struct gl_context *ctx, const VERTEX *v ) { LOCALVARS GLuint format = GET_VERTEX_FORMAT(); @@ -289,7 +289,7 @@ void TAG(print_vertex)( GLcontext *ctx, const VERTEX *v ) #define GET_COLOR(ptr, idx) ((ptr)->data[idx]) -INTERP_QUALIFIER void TAG(interp_extras)( GLcontext *ctx, +INTERP_QUALIFIER void TAG(interp_extras)( struct gl_context *ctx, GLfloat t, GLuint dst, GLuint out, GLuint in, GLboolean force_boundary ) @@ -320,7 +320,7 @@ INTERP_QUALIFIER void TAG(interp_extras)( GLcontext *ctx, INTERP_VERTEX(ctx, t, dst, out, in, force_boundary); } -INTERP_QUALIFIER void TAG(copy_pv_extras)( GLcontext *ctx, +INTERP_QUALIFIER void TAG(copy_pv_extras)( struct gl_context *ctx, GLuint dst, GLuint src ) { LOCALVARS diff --git a/src/mesa/tnl_dd/t_dd_vbtmp.h b/src/mesa/tnl_dd/t_dd_vbtmp.h index 85101b9ceb..d19137b767 100644 --- a/src/mesa/tnl_dd/t_dd_vbtmp.h +++ b/src/mesa/tnl_dd/t_dd_vbtmp.h @@ -117,7 +117,7 @@ #if (HAVE_HW_DIVIDE || DO_SPEC || DO_TEX0 || DO_FOG || !HAVE_TINY_VERTICES) -static void TAG(emit)( GLcontext *ctx, +static void TAG(emit)( struct gl_context *ctx, GLuint start, GLuint end, void *dest, GLuint stride ) @@ -338,7 +338,7 @@ static void TAG(emit)( GLcontext *ctx, #error "cannot use tiny vertices with hw perspective divide" #endif -static void TAG(emit)( GLcontext *ctx, GLuint start, GLuint end, +static void TAG(emit)( struct gl_context *ctx, GLuint start, GLuint end, void *dest, GLuint stride ) { LOCALVARS @@ -403,7 +403,7 @@ static void TAG(emit)( GLcontext *ctx, GLuint start, GLuint end, #if (HAVE_PTEX_VERTICES) -static GLboolean TAG(check_tex_sizes)( GLcontext *ctx ) +static GLboolean TAG(check_tex_sizes)( struct gl_context *ctx ) { LOCALVARS struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb; @@ -431,7 +431,7 @@ static GLboolean TAG(check_tex_sizes)( GLcontext *ctx ) return GL_TRUE; } #else -static GLboolean TAG(check_tex_sizes)( GLcontext *ctx ) +static GLboolean TAG(check_tex_sizes)( struct gl_context *ctx ) { LOCALVARS struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb; @@ -472,7 +472,7 @@ static GLboolean TAG(check_tex_sizes)( GLcontext *ctx ) #endif /* ptex */ -static void TAG(interp)( GLcontext *ctx, +static void TAG(interp)( struct gl_context *ctx, GLfloat t, GLuint edst, GLuint eout, GLuint ein, GLboolean force_boundary ) -- cgit v1.2.3