OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Keith Whitwell
2004-07-01 13:14:05 +00:00
parent c3c8c71846
commit 3d38361b71
51 changed files with 223 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/mesa/drivers/dri/ffb/ffb_tris.c
View File

@@ -306,8 +306,8 @@ static void ffbRasterPrimitive(GLcontext *ctx, GLenum rprim);
#define FFB_MAX_TRIFUNC 0x08 #define FFB_MAX_TRIFUNC 0x08
static struct { static struct {
triangle_func triangle; tnl_triangle_func triangle;
quad_func quad; tnl_quad_func quad;
} rast_tab[FFB_MAX_TRIFUNC]; } rast_tab[FFB_MAX_TRIFUNC];
#define DO_OFFSET (IND & FFB_OFFSET_BIT) #define DO_OFFSET (IND & FFB_OFFSET_BIT)
@@ -549,13 +549,13 @@ static void init_render_tab(void)
render_tab_flat_alpha_tricull_elt; render_tab_flat_alpha_tricull_elt;
for (i = 0; i < MAX_FFB_RENDER_FUNCS; i++) { for (i = 0; i < MAX_FFB_RENDER_FUNCS; i++) {
render_func *rf = render_tabs[i]; tnl_render_func *rf = render_tabs[i];
render_func *rfe = render_tabs_elt[i]; tnl_render_func *rfe = render_tabs_elt[i];
if (i & FFB_TRI_CULL_BIT) { if (i & FFB_TRI_CULL_BIT) {
int from_idx = (i & ~FFB_TRI_CULL_BIT); int from_idx = (i & ~FFB_TRI_CULL_BIT);
render_func *rf_from = render_tabs[from_idx]; tnl_render_func *rf_from = render_tabs[from_idx];
render_func *rfe_from = render_tabs_elt[from_idx]; tnl_render_func *rfe_from = render_tabs_elt[from_idx];
int j; int j;
for (j = GL_POINTS; j < GL_TRIANGLES; j++) { for (j = GL_POINTS; j < GL_TRIANGLES; j++) {

2
src/mesa/drivers/dri/ffb/ffb_vb.c
View File

@@ -78,7 +78,7 @@ typedef void (*ffb_emit_func)(GLcontext *, GLuint, GLuint);
static struct { static struct {
ffb_emit_func emit; ffb_emit_func emit;
interp_func interp; tnl_interp_func interp;
} setup_tab[FFB_VB_MAX]; } setup_tab[FFB_VB_MAX];

2
src/mesa/drivers/dri/gamma/gamma_render.c
View File

@@ -177,7 +177,7 @@ static GLboolean gamma_run_render( GLcontext *ctx,
TNLcontext *tnl = TNL_CONTEXT(ctx); TNLcontext *tnl = TNL_CONTEXT(ctx);
struct vertex_buffer *VB = &tnl->vb; struct vertex_buffer *VB = &tnl->vb;
GLuint i; GLuint i;
render_func *tab; tnl_render_func *tab;
/* GH: THIS IS A HACK!!! */ /* GH: THIS IS A HACK!!! */
if (VB->ClipOrMask || gmesa->RenderIndex != 0) if (VB->ClipOrMask || gmesa->RenderIndex != 0)

8
src/mesa/drivers/dri/gamma/gamma_tris.c
View File

@@ -275,10 +275,10 @@ do { \
static struct { static struct {
points_func points; tnl_points_func points;
line_func line; tnl_line_func line;
triangle_func triangle; tnl_triangle_func triangle;
quad_func quad; tnl_quad_func quad;
} rast_tab[GAMMA_MAX_TRIFUNC]; } rast_tab[GAMMA_MAX_TRIFUNC];

4
src/mesa/drivers/dri/gamma/gamma_vb.c
View File

@@ -51,8 +51,8 @@
static struct { static struct {
void (*emit)( GLcontext *, GLuint, GLuint, void *, GLuint ); void (*emit)( GLcontext *, GLuint, GLuint, void *, GLuint );
interp_func interp; tnl_interp_func interp;
copy_pv_func copy_pv; tnl_copy_pv_func copy_pv;
GLboolean (*check_tex_sizes)( GLcontext *ctx ); GLboolean (*check_tex_sizes)( GLcontext *ctx );
GLuint vertex_size; GLuint vertex_size;
GLuint vertex_format; GLuint vertex_format;

8
src/mesa/drivers/dri/i810/i810tris.c
View File

@@ -199,10 +199,10 @@ do { \
static struct { static struct {
points_func points; tnl_points_func points;
line_func line; tnl_line_func line;
triangle_func triangle; tnl_triangle_func triangle;
quad_func quad; tnl_quad_func quad;
} rast_tab[I810_MAX_TRIFUNC]; } rast_tab[I810_MAX_TRIFUNC];

4
src/mesa/drivers/dri/i810/i810vb.c
View File

@@ -55,8 +55,8 @@
static struct { static struct {
void (*emit)( GLcontext *, GLuint, GLuint, void *, GLuint ); void (*emit)( GLcontext *, GLuint, GLuint, void *, GLuint );
interp_func interp; tnl_interp_func interp;
copy_pv_func copy_pv; tnl_copy_pv_func copy_pv;
GLboolean (*check_tex_sizes)( GLcontext *ctx ); GLboolean (*check_tex_sizes)( GLcontext *ctx );
GLuint vertex_size; GLuint vertex_size;
GLuint vertex_format; GLuint vertex_format;

8
src/mesa/drivers/dri/i830/i830_tris.c
View File

@@ -190,10 +190,10 @@ do { \
static struct { static struct {
points_func points; tnl_points_func points;
line_func line; tnl_line_func line;
triangle_func triangle; tnl_triangle_func triangle;
quad_func quad; tnl_quad_func quad;
} rast_tab[I830_MAX_TRIFUNC]; } rast_tab[I830_MAX_TRIFUNC];

8
src/mesa/drivers/dri/i915/intel_tris.c
View File

@@ -285,10 +285,10 @@ do { \
static struct { static struct {
points_func points; tnl_points_func points;
line_func line; tnl_line_func line;
triangle_func triangle; tnl_triangle_func triangle;
quad_func quad; tnl_quad_func quad;
} rast_tab[INTEL_MAX_TRIFUNC]; } rast_tab[INTEL_MAX_TRIFUNC];

8
src/mesa/drivers/dri/mach64/mach64_tris.c
View File

@@ -1227,10 +1227,10 @@ do { \
#define MACH64_MAX_TRIFUNC 0x10 #define MACH64_MAX_TRIFUNC 0x10
static struct { static struct {
points_func points; tnl_points_func points;
line_func line; tnl_line_func line;
triangle_func triangle; tnl_triangle_func triangle;
quad_func quad; tnl_quad_func quad;
} rast_tab[MACH64_MAX_TRIFUNC]; } rast_tab[MACH64_MAX_TRIFUNC];

4
src/mesa/drivers/dri/mach64/mach64_vb.c
View File

@@ -56,8 +56,8 @@
static struct { static struct {
void (*emit)( GLcontext *, GLuint, GLuint, void *, GLuint ); void (*emit)( GLcontext *, GLuint, GLuint, void *, GLuint );
interp_func interp; tnl_interp_func interp;
copy_pv_func copy_pv; tnl_copy_pv_func copy_pv;
GLboolean (*check_tex_sizes)( GLcontext *ctx ); GLboolean (*check_tex_sizes)( GLcontext *ctx );
GLuint vertex_size; GLuint vertex_size;
GLuint vertex_format; GLuint vertex_format;

8
src/mesa/drivers/dri/mga/mgatris.c
View File

@@ -328,10 +328,10 @@ mga_fallback_point( mgaContextPtr mmesa,
#define MGA_MAX_TRIFUNC 0x20 #define MGA_MAX_TRIFUNC 0x20
static struct { static struct {
points_func points; tnl_points_func points;
line_func line; tnl_line_func line;
triangle_func triangle; tnl_triangle_func triangle;
quad_func quad; tnl_quad_func quad;
} rast_tab[MGA_MAX_TRIFUNC]; } rast_tab[MGA_MAX_TRIFUNC];
#define DO_FALLBACK (IND & MGA_FALLBACK_BIT) #define DO_FALLBACK (IND & MGA_FALLBACK_BIT)

4
src/mesa/drivers/dri/mga/mgavb.c
View File

@@ -55,8 +55,8 @@
static struct { static struct {
void (*emit)( GLcontext *, GLuint, GLuint, void *, GLuint ); void (*emit)( GLcontext *, GLuint, GLuint, void *, GLuint );
interp_func interp; tnl_interp_func interp;
copy_pv_func copy_pv; tnl_copy_pv_func copy_pv;
GLboolean (*check_tex_sizes)( GLcontext *ctx ); GLboolean (*check_tex_sizes)( GLcontext *ctx );
GLuint vertex_size; GLuint vertex_size;
GLuint vertex_format; GLuint vertex_format;

8
src/mesa/drivers/dri/r128/r128_tris.c
View File

@@ -199,10 +199,10 @@ do { \
static struct { static struct {
points_func points; tnl_points_func points;
line_func line; tnl_line_func line;
triangle_func triangle; tnl_triangle_func triangle;
quad_func quad; tnl_quad_func quad;
} rast_tab[R128_MAX_TRIFUNC]; } rast_tab[R128_MAX_TRIFUNC];

4
src/mesa/drivers/dri/r128/r128_vb.c
View File

@@ -60,8 +60,8 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
static struct { static struct {
void (*emit)( GLcontext *, GLuint, GLuint, void *, GLuint ); void (*emit)( GLcontext *, GLuint, GLuint, void *, GLuint );
interp_func interp; tnl_interp_func interp;
copy_pv_func copy_pv; tnl_copy_pv_func copy_pv;
GLboolean (*check_tex_sizes)( GLcontext *ctx ); GLboolean (*check_tex_sizes)( GLcontext *ctx );
GLuint vertex_size; GLuint vertex_size;
GLuint vertex_format; GLuint vertex_format;

8
src/mesa/drivers/dri/r200/r200_swtcl.c
View File

@@ -380,10 +380,10 @@ static void r200ResetLineStipple( GLcontext *ctx );
static struct { static struct {
points_func points; tnl_points_func points;
line_func line; tnl_line_func line;
triangle_func triangle; tnl_triangle_func triangle;
quad_func quad; tnl_quad_func quad;
} rast_tab[R200_MAX_TRIFUNC]; } rast_tab[R200_MAX_TRIFUNC];

14
src/mesa/drivers/dri/radeon/radeon_swtcl.c
View File

@@ -70,8 +70,8 @@ static void flush_last_swtcl_prim( radeonContextPtr rmesa );
static struct { static struct {
void (*emit)( GLcontext *, GLuint, GLuint, void *, GLuint ); void (*emit)( GLcontext *, GLuint, GLuint, void *, GLuint );
interp_func interp; tnl_interp_func interp;
copy_pv_func copy_pv; tnl_copy_pv_func copy_pv;
GLboolean (*check_tex_sizes)( GLcontext *ctx ); GLboolean (*check_tex_sizes)( GLcontext *ctx );
GLuint vertex_size; GLuint vertex_size;
GLuint vertex_format; GLuint vertex_format;
@@ -595,7 +595,7 @@ static GLboolean radeon_run_render( GLcontext *ctx,
radeonContextPtr rmesa = RADEON_CONTEXT(ctx); radeonContextPtr rmesa = RADEON_CONTEXT(ctx);
TNLcontext *tnl = TNL_CONTEXT(ctx); TNLcontext *tnl = TNL_CONTEXT(ctx);
struct vertex_buffer *VB = &tnl->vb; struct vertex_buffer *VB = &tnl->vb;
render_func *tab = TAG(render_tab_verts); tnl_render_func *tab = TAG(render_tab_verts);
GLuint i; GLuint i;
if (rmesa->swtcl.indexed_verts.buf && (!VB->Elts || stage->changed_inputs)) if (rmesa->swtcl.indexed_verts.buf && (!VB->Elts || stage->changed_inputs))
@@ -859,10 +859,10 @@ static void radeonResetLineStipple( GLcontext *ctx );
static struct { static struct {
points_func points; tnl_points_func points;
line_func line; tnl_line_func line;
triangle_func triangle; tnl_triangle_func triangle;
quad_func quad; tnl_quad_func quad;
} rast_tab[RADEON_MAX_TRIFUNC]; } rast_tab[RADEON_MAX_TRIFUNC];

8
src/mesa/drivers/dri/savage/savagetris.c
View File

@@ -251,10 +251,10 @@ do { \
static struct { static struct {
points_func points; tnl_points_func points;
line_func line; tnl_line_func line;
triangle_func triangle; tnl_triangle_func triangle;
quad_func quad; tnl_quad_func quad;
} rast_tab[SAVAGE_MAX_TRIFUNC]; } rast_tab[SAVAGE_MAX_TRIFUNC];

8
src/mesa/drivers/dri/sis/sis_tris.c
View File

@@ -333,10 +333,10 @@ do { \
static struct { static struct {
points_func points; tnl_points_func points;
line_func line; tnl_line_func line;
triangle_func triangle; tnl_triangle_func triangle;
quad_func quad; tnl_quad_func quad;
} rast_tab[SIS_MAX_TRIFUNC]; } rast_tab[SIS_MAX_TRIFUNC];

8
src/mesa/drivers/dri/tdfx/tdfx_tris.c
View File

@@ -303,10 +303,10 @@ static void tdfx_draw_point( tdfxContextPtr fxMesa,
#define TDFX_MAX_TRIFUNC 0x20 #define TDFX_MAX_TRIFUNC 0x20
static struct { static struct {
points_func points; tnl_points_func points;
line_func line; tnl_line_func line;
triangle_func triangle; tnl_triangle_func triangle;
quad_func quad; tnl_quad_func quad;
} rast_tab[TDFX_MAX_TRIFUNC]; } rast_tab[TDFX_MAX_TRIFUNC];
#define DO_FALLBACK (IND & TDFX_FALLBACK_BIT) #define DO_FALLBACK (IND & TDFX_FALLBACK_BIT)

4
src/mesa/drivers/dri/tdfx/tdfx_vb.c
View File

@@ -63,8 +63,8 @@ typedef void (*tdfx_emit_func)( GLcontext *, GLuint, GLuint, void *, GLuint );
static struct { static struct {
tdfx_emit_func emit; tdfx_emit_func emit;
interp_func interp; tnl_interp_func interp;
copy_pv_func copy_pv; tnl_copy_pv_func copy_pv;
GLboolean (*check_tex_sizes)( GLcontext *ctx ); GLboolean (*check_tex_sizes)( GLcontext *ctx );
GLuint vertex_size; GLuint vertex_size;
GLuint vertex_stride_shift; GLuint vertex_stride_shift;

2
src/mesa/drivers/dri/unichrome/via_dmatmp.h
View File

@@ -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_points_verts),
TAG(render_lines_verts), TAG(render_lines_verts),

10
src/mesa/drivers/dri/unichrome/via_render.c
View File

@@ -321,9 +321,9 @@ const struct tnl_pipeline_stage _via_fastrender_stage =
const GLuint * const elt = VB->Elts; \ const GLuint * const elt = VB->Elts; \
const GLubyte *mask = VB->ClipMask; \ const GLubyte *mask = VB->ClipMask; \
const GLuint sz = VB->ClipPtr->size; \ const GLuint sz = VB->ClipPtr->size; \
const line_func LineFunc = tnl->Driver.Render.Line; \ const tnl_line_func LineFunc = tnl->Driver.Render.Line; \
const triangle_func TriangleFunc = tnl->Driver.Render.Triangle; \ const tnl_triangle_func TriangleFunc = tnl->Driver.Render.Triangle; \
const quad_func QuadFunc = tnl->Driver.Render.Quad; \ const tnl_quad_func QuadFunc = tnl->Driver.Render.Quad; \
const GLboolean stipple = ctx->Line.StippleFlag; \ const GLboolean stipple = ctx->Line.StippleFlag; \
(void) (LineFunc && TriangleFunc && QuadFunc); \ (void) (LineFunc && TriangleFunc && QuadFunc); \
(void) elt; (void) mask; (void) sz; (void) stipple; (void) elt; (void) mask; (void) sz; (void) stipple;
@@ -355,7 +355,7 @@ static void clip_elt_triangles(GLcontext *ctx,
GLuint flags) GLuint flags)
{ {
TNLcontext *tnl = TNL_CONTEXT(ctx); 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; struct vertex_buffer *VB = &tnl->vb;
const GLuint * const elt = VB->Elts; const GLuint * const elt = VB->Elts;
GLubyte *mask = VB->ClipMask; GLubyte *mask = VB->ClipMask;
@@ -423,7 +423,7 @@ static GLboolean via_run_render(GLcontext *ctx,
GLuint newInputs = stage->changed_inputs; GLuint newInputs = stage->changed_inputs;
/*GLuint newInputs = stage->inputs;*/ /*GLuint newInputs = stage->inputs;*/
render_func *tab; tnl_render_func *tab;
GLuint pass = 0; GLuint pass = 0;
#ifdef DEBUG #ifdef DEBUG

14
src/mesa/drivers/dri/unichrome/via_tris.c
View File

@@ -229,10 +229,10 @@ static __inline__ void via_draw_line(viaContextPtr vmesa,
static struct { static struct {
points_func points; tnl_points_func points;
line_func line; tnl_line_func line;
triangle_func triangle; tnl_triangle_func triangle;
quad_func quad; tnl_quad_func quad;
} rast_tab[VIA_MAX_TRIFUNC]; } rast_tab[VIA_MAX_TRIFUNC];
@@ -551,9 +551,9 @@ via_fallback_point(viaContextPtr vmesa,
TNLcontext *tnl = TNL_CONTEXT(ctx); \ TNLcontext *tnl = TNL_CONTEXT(ctx); \
struct vertex_buffer *VB = &tnl->vb; \ struct vertex_buffer *VB = &tnl->vb; \
const GLuint * const elt = VB->Elts; \ const GLuint * const elt = VB->Elts; \
const line_func LineFunc = tnl->Driver.Render.Line; \ const tnl_line_func LineFunc = tnl->Driver.Render.Line; \
const triangle_func TriangleFunc = tnl->Driver.Render.Triangle; \ const tnl_triangle_func TriangleFunc = tnl->Driver.Render.Triangle; \
const quad_func QuadFunc = tnl->Driver.Render.Quad; \ const tnl_quad_func QuadFunc = tnl->Driver.Render.Quad; \
const GLboolean stipple = ctx->Line.StippleFlag; \ const GLboolean stipple = ctx->Line.StippleFlag; \
(void) (LineFunc && TriangleFunc && QuadFunc); \ (void) (LineFunc && TriangleFunc && QuadFunc); \
(void) elt; (void) stipple; (void) elt; (void) stipple;

4
src/mesa/drivers/dri/unichrome/via_vb.c
View File

@@ -39,8 +39,8 @@
static struct { static struct {
void (*emit)(GLcontext *, GLuint, GLuint, void *, GLuint); void (*emit)(GLcontext *, GLuint, GLuint, void *, GLuint);
interp_func interp; tnl_interp_func interp;
copy_pv_func copyPv; tnl_copy_pv_func copyPv;
GLboolean (*check_tex_sizes)(GLcontext *ctx); GLboolean (*check_tex_sizes)(GLcontext *ctx);
GLuint vertexSize; GLuint vertexSize;
GLuint vertexStrideShift; GLuint vertexStrideShift;

6
src/mesa/drivers/dri/unichrome/via_vb_cliptmp.h
View File

@@ -119,7 +119,7 @@ TAG(clip_line)(GLcontext *ctx, GLuint i, GLuint j, GLubyte mask)
{ {
TNLcontext *tnl = TNL_CONTEXT(ctx); TNLcontext *tnl = TNL_CONTEXT(ctx);
struct vertex_buffer *VB = &tnl->vb; 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; GLfloat (*coord)[4] = VB->ClipPtr->data;
GLuint ii = i, jj = j, p; GLuint ii = i, jj = j, p;
#ifdef DEBUG #ifdef DEBUG
@@ -168,7 +168,7 @@ TAG(clip_tri)(GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2, GLubyte mask)
{ {
TNLcontext *tnl = TNL_CONTEXT(ctx); TNLcontext *tnl = TNL_CONTEXT(ctx);
struct vertex_buffer *VB = &tnl->vb; 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; GLfloat (*coord)[4] = VB->ClipPtr->data;
GLuint pv = v2; GLuint pv = v2;
GLuint vlist[2][MAX_CLIPPED_VERTICES]; 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); TNLcontext *tnl = TNL_CONTEXT(ctx);
struct vertex_buffer *VB = &tnl->vb; 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; GLfloat (*coord)[4] = VB->ClipPtr->data;
GLuint pv = v3; GLuint pv = v3;
GLuint vlist[2][MAX_CLIPPED_VERTICES]; GLuint vlist[2][MAX_CLIPPED_VERTICES];

8
src/mesa/drivers/glide/fxtris.c
View File

@@ -404,10 +404,10 @@ static void fx_draw_point_wide_aa ( fxMesaContext fxMesa,
#define FX_MAX_TRIFUNC 0x20 #define FX_MAX_TRIFUNC 0x20
static struct { static struct {
points_func points; tnl_points_func points;
line_func line; tnl_line_func line;
triangle_func triangle; tnl_triangle_func triangle;
quad_func quad; tnl_quad_func quad;
} rast_tab[FX_MAX_TRIFUNC]; } rast_tab[FX_MAX_TRIFUNC];
#define DO_FALLBACK (IND & FX_FALLBACK_BIT) #define DO_FALLBACK (IND & FX_FALLBACK_BIT)

4
src/mesa/drivers/glide/fxvb.c
View File

@@ -72,8 +72,8 @@ typedef void (*emit_func)( GLcontext *, GLuint, GLuint, void * );
static struct { static struct {
emit_func emit; emit_func emit;
copy_pv_func copy_pv; tnl_copy_pv_func copy_pv;
interp_func interp; tnl_interp_func interp;
GLboolean (*check_tex_sizes)( GLcontext *ctx ); GLboolean (*check_tex_sizes)( GLcontext *ctx );
GLuint vertex_format; GLuint vertex_format;
} setup_tab[MAX_SETUP]; } setup_tab[MAX_SETUP];

6
src/mesa/drivers/windows/gdi/wmesa.c
View File

@@ -654,7 +654,7 @@ static void fast_rgb_points( GLcontext* ctx, GLuint first, GLuint last )
} }
/* Return pointer to accelerated points function */ /* 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; 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 #endif
/************** END DEAD TRIANGLE CODE ***********************/ /************** END DEAD TRIANGLE CODE ***********************/
static triangle_func choose_triangle_function( GLcontext *ctx ) static tnl_triangle_func choose_triangle_function( GLcontext *ctx )
{ {
#if 0 #if 0
WMesaContext wmesa = (WMesaContext) ctx->DriverCtx; WMesaContext wmesa = (WMesaContext) ctx->DriverCtx;

2
src/mesa/drivers/windows/gldirect/dx7/gld_vb_d3d_render_dx7.c
View File

@@ -125,7 +125,7 @@ static GLboolean gld_d3d_render_stage_run(
TNLcontext *tnl; TNLcontext *tnl;
struct vertex_buffer *VB; struct vertex_buffer *VB;
GLuint new_inputs; GLuint new_inputs;
render_func *tab; tnl_render_func *tab;
GLint pass; GLint pass;
GLD_pb_dx7 *gldPB = &gld->PB3d; GLD_pb_dx7 *gldPB = &gld->PB3d;
DWORD dwFlags; DWORD dwFlags;

26
src/mesa/drivers/windows/gldirect/dx7/gld_vb_mesa_render_dx7.c
View File

@@ -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 * Mesa 3-D graphics library
@@ -143,9 +143,9 @@ do { \
const GLuint * const elt = VB->Elts; \ const GLuint * const elt = VB->Elts; \
const GLubyte *mask = VB->ClipMask; \ const GLubyte *mask = VB->ClipMask; \
const GLuint sz = VB->ClipPtr->size; \ const GLuint sz = VB->ClipPtr->size; \
const line_func LineFunc = tnl->Driver.Render.Line; \ const tnl_line_func LineFunc = tnl->Driver.Render.Line; \
const triangle_func TriangleFunc = tnl->Driver.Render.Triangle; \ const tnl_triangle_func TriangleFunc = tnl->Driver.Render.Triangle; \
const quad_func QuadFunc = tnl->Driver.Render.Quad; \ const tnl_quad_func QuadFunc = tnl->Driver.Render.Quad; \
const GLboolean stipple = ctx->Line.StippleFlag; \ const GLboolean stipple = ctx->Line.StippleFlag; \
(void) (LineFunc && TriangleFunc && QuadFunc); \ (void) (LineFunc && TriangleFunc && QuadFunc); \
(void) elt; (void) mask; (void) sz; (void) stipple; (void) elt; (void) mask; (void) sz; (void) stipple;
@@ -175,7 +175,7 @@ static void clip_elt_triangles( GLcontext *ctx,
GLuint flags ) GLuint flags )
{ {
TNLcontext *tnl = TNL_CONTEXT(ctx); 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; struct vertex_buffer *VB = &tnl->vb;
const GLuint * const elt = VB->Elts; const GLuint * const elt = VB->Elts;
GLubyte *mask = VB->ClipMask; GLubyte *mask = VB->ClipMask;
@@ -232,9 +232,9 @@ static void clip_elt_triangles( GLcontext *ctx,
TNLcontext *tnl = TNL_CONTEXT(ctx); \ TNLcontext *tnl = TNL_CONTEXT(ctx); \
struct vertex_buffer *VB = &tnl->vb; \ struct vertex_buffer *VB = &tnl->vb; \
const GLuint * const elt = VB->Elts; \ const GLuint * const elt = VB->Elts; \
const line_func LineFunc = tnl->Driver.Render.Line; \ const tnl_line_func LineFunc = tnl->Driver.Render.Line; \
const triangle_func TriangleFunc = tnl->Driver.Render.Triangle; \ const tnl_triangle_func TriangleFunc = tnl->Driver.Render.Triangle; \
const quad_func QuadFunc = tnl->Driver.Render.Quad; \ const tnl_quad_func QuadFunc = tnl->Driver.Render.Quad; \
(void) (LineFunc && TriangleFunc && QuadFunc); \ (void) (LineFunc && TriangleFunc && QuadFunc); \
(void) elt; (void) elt;
@@ -281,25 +281,25 @@ void _tnl_RenderClippedLine( GLcontext *ctx, GLuint ii, GLuint jj )
/* Clip and render whole vertex buffers */ /* 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,
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_Line2DFlat_DX7,
gld_Line2DSmooth_DX7, gld_Line2DSmooth_DX7,
gld_Line2DFlat_DX7, gld_Line2DFlat_DX7,
gld_Line2DSmooth_DX7, gld_Line2DSmooth_DX7,
}; };
triangle_func _gldSetupTriangle[4] = { tnl_triangle_func _gldSetupTriangle[4] = {
gld_Triangle2DFlat_DX7, gld_Triangle2DFlat_DX7,
gld_Triangle2DSmooth_DX7, gld_Triangle2DSmooth_DX7,
gld_Triangle2DFlatExtras_DX7, gld_Triangle2DFlatExtras_DX7,
gld_Triangle2DSmoothExtras_DX7 gld_Triangle2DSmoothExtras_DX7
}; };
quad_func _gldSetupQuad[4] = { tnl_quad_func _gldSetupQuad[4] = {
gld_Quad2DFlat_DX7, gld_Quad2DFlat_DX7,
gld_Quad2DSmooth_DX7, gld_Quad2DSmooth_DX7,
gld_Quad2DFlatExtras_DX7, gld_Quad2DFlatExtras_DX7,
@@ -318,7 +318,7 @@ static GLboolean _gld_mesa_render_stage_run(
TNLcontext *tnl = TNL_CONTEXT(ctx); TNLcontext *tnl = TNL_CONTEXT(ctx);
struct vertex_buffer *VB = &tnl->vb; struct vertex_buffer *VB = &tnl->vb;
GLuint new_inputs = stage->changed_inputs; GLuint new_inputs = stage->changed_inputs;
render_func *tab; tnl_render_func *tab;
GLint pass = 0; GLint pass = 0;
GLD_pb_dx7 *gldPB; GLD_pb_dx7 *gldPB;
DWORD dwFlags; DWORD dwFlags;

2
src/mesa/drivers/windows/gldirect/dx8/gld_vb_d3d_render_dx8.c
View File

@@ -125,7 +125,7 @@ static GLboolean gld_d3d_render_stage_run(
TNLcontext *tnl; TNLcontext *tnl;
struct vertex_buffer *VB; struct vertex_buffer *VB;
GLuint new_inputs; GLuint new_inputs;
render_func *tab; tnl_render_func *tab;
GLint pass; GLint pass;
GLD_pb_dx8 *gldPB = &gld->PB3d; GLD_pb_dx8 *gldPB = &gld->PB3d;
/* /*

26
src/mesa/drivers/windows/gldirect/dx8/gld_vb_mesa_render_dx8.c
View File

@@ -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 * Mesa 3-D graphics library
@@ -143,9 +143,9 @@ do { \
const GLuint * const elt = VB->Elts; \ const GLuint * const elt = VB->Elts; \
const GLubyte *mask = VB->ClipMask; \ const GLubyte *mask = VB->ClipMask; \
const GLuint sz = VB->ClipPtr->size; \ const GLuint sz = VB->ClipPtr->size; \
const line_func LineFunc = tnl->Driver.Render.Line; \ const tnl_line_func LineFunc = tnl->Driver.Render.Line; \
const triangle_func TriangleFunc = tnl->Driver.Render.Triangle; \ const tnl_triangle_func TriangleFunc = tnl->Driver.Render.Triangle; \
const quad_func QuadFunc = tnl->Driver.Render.Quad; \ const tnl_quad_func QuadFunc = tnl->Driver.Render.Quad; \
const GLboolean stipple = ctx->Line.StippleFlag; \ const GLboolean stipple = ctx->Line.StippleFlag; \
(void) (LineFunc && TriangleFunc && QuadFunc); \ (void) (LineFunc && TriangleFunc && QuadFunc); \
(void) elt; (void) mask; (void) sz; (void) stipple; (void) elt; (void) mask; (void) sz; (void) stipple;
@@ -175,7 +175,7 @@ static void clip_elt_triangles( GLcontext *ctx,
GLuint flags ) GLuint flags )
{ {
TNLcontext *tnl = TNL_CONTEXT(ctx); 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; struct vertex_buffer *VB = &tnl->vb;
const GLuint * const elt = VB->Elts; const GLuint * const elt = VB->Elts;
GLubyte *mask = VB->ClipMask; GLubyte *mask = VB->ClipMask;
@@ -232,9 +232,9 @@ static void clip_elt_triangles( GLcontext *ctx,
TNLcontext *tnl = TNL_CONTEXT(ctx); \ TNLcontext *tnl = TNL_CONTEXT(ctx); \
struct vertex_buffer *VB = &tnl->vb; \ struct vertex_buffer *VB = &tnl->vb; \
const GLuint * const elt = VB->Elts; \ const GLuint * const elt = VB->Elts; \
const line_func LineFunc = tnl->Driver.Render.Line; \ const tnl_line_func LineFunc = tnl->Driver.Render.Line; \
const triangle_func TriangleFunc = tnl->Driver.Render.Triangle; \ const tnl_triangle_func TriangleFunc = tnl->Driver.Render.Triangle; \
const quad_func QuadFunc = tnl->Driver.Render.Quad; \ const tnl_quad_func QuadFunc = tnl->Driver.Render.Quad; \
(void) (LineFunc && TriangleFunc && QuadFunc); \ (void) (LineFunc && TriangleFunc && QuadFunc); \
(void) elt; (void) elt;
@@ -281,25 +281,25 @@ void _tnl_RenderClippedLine( GLcontext *ctx, GLuint ii, GLuint jj )
/* Clip and render whole vertex buffers */ /* 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,
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_Line2DFlat_DX8,
gld_Line2DSmooth_DX8, gld_Line2DSmooth_DX8,
gld_Line2DFlat_DX8, gld_Line2DFlat_DX8,
gld_Line2DSmooth_DX8, gld_Line2DSmooth_DX8,
}; };
triangle_func _gldSetupTriangle[4] = { tnl_triangle_func _gldSetupTriangle[4] = {
gld_Triangle2DFlat_DX8, gld_Triangle2DFlat_DX8,
gld_Triangle2DSmooth_DX8, gld_Triangle2DSmooth_DX8,
gld_Triangle2DFlatExtras_DX8, gld_Triangle2DFlatExtras_DX8,
gld_Triangle2DSmoothExtras_DX8 gld_Triangle2DSmoothExtras_DX8
}; };
quad_func _gldSetupQuad[4] = { tnl_quad_func _gldSetupQuad[4] = {
gld_Quad2DFlat_DX8, gld_Quad2DFlat_DX8,
gld_Quad2DSmooth_DX8, gld_Quad2DSmooth_DX8,
gld_Quad2DFlatExtras_DX8, gld_Quad2DFlatExtras_DX8,
@@ -318,7 +318,7 @@ static GLboolean _gld_mesa_render_stage_run(
TNLcontext *tnl = TNL_CONTEXT(ctx); TNLcontext *tnl = TNL_CONTEXT(ctx);
struct vertex_buffer *VB = &tnl->vb; struct vertex_buffer *VB = &tnl->vb;
GLuint new_inputs = stage->changed_inputs; GLuint new_inputs = stage->changed_inputs;
render_func *tab; tnl_render_func *tab;
GLint pass = 0; GLint pass = 0;
GLD_pb_dx8 *gldPB; GLD_pb_dx8 *gldPB;

2
src/mesa/drivers/windows/gldirect/dx9/gld_vb_d3d_render_dx9.c
View File

@@ -125,7 +125,7 @@ static GLboolean gld_d3d_render_stage_run(
TNLcontext *tnl; TNLcontext *tnl;
struct vertex_buffer *VB; struct vertex_buffer *VB;
GLuint new_inputs; GLuint new_inputs;
render_func *tab; tnl_render_func *tab;
GLint pass; GLint pass;
GLD_pb_dx9 *gldPB = &gld->PB3d; GLD_pb_dx9 *gldPB = &gld->PB3d;
/* /*

26
src/mesa/drivers/windows/gldirect/dx9/gld_vb_mesa_render_dx9.c
View File

@@ -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 * Mesa 3-D graphics library
@@ -138,9 +138,9 @@ do { \
const GLuint * const elt = VB->Elts; \ const GLuint * const elt = VB->Elts; \
const GLubyte *mask = VB->ClipMask; \ const GLubyte *mask = VB->ClipMask; \
const GLuint sz = VB->ClipPtr->size; \ const GLuint sz = VB->ClipPtr->size; \
const line_func LineFunc = tnl->Driver.Render.Line; \ const tnl_line_func LineFunc = tnl->Driver.Render.Line; \
const triangle_func TriangleFunc = tnl->Driver.Render.Triangle; \ const tnl_triangle_func TriangleFunc = tnl->Driver.Render.Triangle; \
const quad_func QuadFunc = tnl->Driver.Render.Quad; \ const tnl_quad_func QuadFunc = tnl->Driver.Render.Quad; \
const GLboolean stipple = ctx->Line.StippleFlag; \ const GLboolean stipple = ctx->Line.StippleFlag; \
(void) (LineFunc && TriangleFunc && QuadFunc); \ (void) (LineFunc && TriangleFunc && QuadFunc); \
(void) elt; (void) mask; (void) sz; (void) stipple; (void) elt; (void) mask; (void) sz; (void) stipple;
@@ -170,7 +170,7 @@ static void clip_elt_triangles( GLcontext *ctx,
GLuint flags ) GLuint flags )
{ {
TNLcontext *tnl = TNL_CONTEXT(ctx); 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; struct vertex_buffer *VB = &tnl->vb;
const GLuint * const elt = VB->Elts; const GLuint * const elt = VB->Elts;
GLubyte *mask = VB->ClipMask; GLubyte *mask = VB->ClipMask;
@@ -227,9 +227,9 @@ static void clip_elt_triangles( GLcontext *ctx,
TNLcontext *tnl = TNL_CONTEXT(ctx); \ TNLcontext *tnl = TNL_CONTEXT(ctx); \
struct vertex_buffer *VB = &tnl->vb; \ struct vertex_buffer *VB = &tnl->vb; \
const GLuint * const elt = VB->Elts; \ const GLuint * const elt = VB->Elts; \
const line_func LineFunc = tnl->Driver.Render.Line; \ const tnl_line_func LineFunc = tnl->Driver.Render.Line; \
const triangle_func TriangleFunc = tnl->Driver.Render.Triangle; \ const tnl_triangle_func TriangleFunc = tnl->Driver.Render.Triangle; \
const quad_func QuadFunc = tnl->Driver.Render.Quad; \ const tnl_quad_func QuadFunc = tnl->Driver.Render.Quad; \
(void) (LineFunc && TriangleFunc && QuadFunc); \ (void) (LineFunc && TriangleFunc && QuadFunc); \
(void) elt; (void) elt;
@@ -276,25 +276,25 @@ void _tnl_RenderClippedLine( GLcontext *ctx, GLuint ii, GLuint jj )
/* Clip and render whole vertex buffers */ /* 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,
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_Line2DFlat_DX9,
gld_Line2DSmooth_DX9, gld_Line2DSmooth_DX9,
gld_Line2DFlat_DX9, gld_Line2DFlat_DX9,
gld_Line2DSmooth_DX9, gld_Line2DSmooth_DX9,
}; };
triangle_func _gldSetupTriangle[4] = { tnl_triangle_func _gldSetupTriangle[4] = {
gld_Triangle2DFlat_DX9, gld_Triangle2DFlat_DX9,
gld_Triangle2DSmooth_DX9, gld_Triangle2DSmooth_DX9,
gld_Triangle2DFlatExtras_DX9, gld_Triangle2DFlatExtras_DX9,
gld_Triangle2DSmoothExtras_DX9 gld_Triangle2DSmoothExtras_DX9
}; };
quad_func _gldSetupQuad[4] = { tnl_quad_func _gldSetupQuad[4] = {
gld_Quad2DFlat_DX9, gld_Quad2DFlat_DX9,
gld_Quad2DSmooth_DX9, gld_Quad2DSmooth_DX9,
gld_Quad2DFlatExtras_DX9, gld_Quad2DFlatExtras_DX9,
@@ -313,7 +313,7 @@ static GLboolean _gld_mesa_render_stage_run(
TNLcontext *tnl = TNL_CONTEXT(ctx); TNLcontext *tnl = TNL_CONTEXT(ctx);
struct vertex_buffer *VB = &tnl->vb; struct vertex_buffer *VB = &tnl->vb;
GLuint new_inputs = stage->changed_inputs; GLuint new_inputs = stage->changed_inputs;
render_func *tab; tnl_render_func *tab;
GLint pass = 0; GLint pass = 0;
GLD_pb_dx9 *gldPB; GLD_pb_dx9 *gldPB;

4
src/mesa/drivers/windows/gldirect/mesasw/gld_wgl_mesasw.c
View File

@@ -909,7 +909,7 @@ static void fast_rgb_points( GLcontext* ctx, GLuint first, GLuint last )
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
/* Return pointer to accelerated points function */ /* 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; 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 )
{ {
} }

4
src/mesa/swrast_setup/ss_triangle.c
View File

@@ -41,8 +41,8 @@
#define SS_UNFILLED_BIT 0x8 #define SS_UNFILLED_BIT 0x8
#define SS_MAX_TRIFUNC 0x10 #define SS_MAX_TRIFUNC 0x10
static triangle_func tri_tab[SS_MAX_TRIFUNC]; static tnl_triangle_func tri_tab[SS_MAX_TRIFUNC];
static quad_func quad_tab[SS_MAX_TRIFUNC]; static tnl_quad_func quad_tab[SS_MAX_TRIFUNC];
static void _swsetup_render_line_tri( GLcontext *ctx, static void _swsetup_render_line_tri( GLcontext *ctx,

81
src/mesa/tnl/t_context.h
View File

@@ -249,7 +249,7 @@ struct tnl_copied_vtx {
#define VERT_BUFFER_SIZE 2048 /* 8kbytes */ #define VERT_BUFFER_SIZE 2048 /* 8kbytes */
typedef void (*attrfv_func)( const GLfloat * ); typedef void (*tnl_attrfv_func)( const GLfloat * );
struct _tnl_dynfn { struct _tnl_dynfn {
struct _tnl_dynfn *next, *prev; struct _tnl_dynfn *next, *prev;
@@ -288,7 +288,7 @@ struct tnl_vtx {
GLuint counter, initial_counter; GLuint counter, initial_counter;
struct tnl_copied_vtx copied; struct tnl_copied_vtx copied;
attrfv_func tabfv[_TNL_MAX_ATTR_CODEGEN+1][4]; /* plus 1 for ERROR_ATTRIB */ tnl_attrfv_func tabfv[_TNL_MAX_ATTR_CODEGEN+1][4]; /* plus 1 for ERROR_ATTRIB */
struct _tnl_dynfn_lists cache; struct _tnl_dynfn_lists cache;
struct _tnl_dynfn_generators gen; struct _tnl_dynfn_generators gen;
@@ -527,14 +527,17 @@ struct tnl_pipeline {
struct tnl_clipspace; struct tnl_clipspace;
struct tnl_clipspace_attr; struct tnl_clipspace_attr;
typedef void (*extract_func)( const struct tnl_clipspace_attr *a, GLfloat *out, typedef void (*tnl_extract_func)( const struct tnl_clipspace_attr *a,
const GLubyte *v ); GLfloat *out,
const GLubyte *v );
typedef void (*insert_func)( const struct tnl_clipspace_attr *a, GLubyte *v, typedef void (*tnl_insert_func)( const struct tnl_clipspace_attr *a,
const GLfloat *in ); GLubyte *v,
const GLfloat *in );
typedef void (*emit_func)( GLcontext *ctx, GLuint start, typedef void (*tnl_emit_func)( GLcontext *ctx,
GLuint end, void *dest ); GLuint start,
GLuint end, void *dest );
/** /**
@@ -549,9 +552,9 @@ struct tnl_clipspace_attr
GLuint vertattrsize; /* size of the attribute in bytes */ GLuint vertattrsize; /* size of the attribute in bytes */
GLubyte *inputptr; GLubyte *inputptr;
GLuint inputstride; GLuint inputstride;
insert_func *insert; tnl_insert_func *insert;
insert_func emit; tnl_insert_func emit;
extract_func extract; tnl_extract_func extract;
const GLfloat *vp; /* NDC->Viewport mapping matrix */ const GLfloat *vp; /* NDC->Viewport mapping matrix */
}; };
@@ -579,7 +582,7 @@ struct tnl_clipspace_codegen {
GLint, GLint ); GLint, GLint );
GLboolean (*emit_const_ubyte)( struct tnl_clipspace_codegen *, GLboolean (*emit_const_ubyte)( struct tnl_clipspace_codegen *,
GLint, GLubyte ); GLint, GLubyte );
emit_func (*emit_store_func)( struct tnl_clipspace_codegen * ); tnl_emit_func (*emit_store_func)( struct tnl_clipspace_codegen * );
struct _tnl_dynfn codegen_list; struct _tnl_dynfn codegen_list;
@@ -591,21 +594,21 @@ struct tnl_clipspace_codegen {
typedef void (*points_func)( GLcontext *ctx, GLuint first, GLuint last ); typedef void (*tnl_points_func)( GLcontext *ctx, GLuint first, GLuint last );
typedef void (*line_func)( GLcontext *ctx, GLuint v1, GLuint v2 ); typedef void (*tnl_line_func)( GLcontext *ctx, GLuint v1, GLuint v2 );
typedef void (*triangle_func)( GLcontext *ctx, typedef void (*tnl_triangle_func)( GLcontext *ctx,
GLuint v1, GLuint v2, GLuint v3 ); GLuint v1, GLuint v2, GLuint v3 );
typedef void (*quad_func)( GLcontext *ctx, GLuint v1, GLuint v2, typedef void (*tnl_quad_func)( GLcontext *ctx, GLuint v1, GLuint v2,
GLuint v3, GLuint v4 ); GLuint v3, GLuint v4 );
typedef void (*render_func)( GLcontext *ctx, GLuint start, GLuint count, typedef void (*tnl_render_func)( GLcontext *ctx, GLuint start, GLuint count,
GLuint flags ); GLuint flags );
typedef void (*interp_func)( GLcontext *ctx, typedef void (*tnl_interp_func)( GLcontext *ctx,
GLfloat t, GLuint dst, GLuint out, GLuint in, GLfloat t, GLuint dst, GLuint out, GLuint in,
GLboolean force_boundary ); GLboolean force_boundary );
typedef void (*copy_pv_func)( GLcontext *ctx, GLuint dst, GLuint src ); typedef void (*tnl_copy_pv_func)( GLcontext *ctx, GLuint dst, GLuint src );
typedef void (*setup_func)( GLcontext *ctx, typedef void (*tnl_setup_func)( GLcontext *ctx,
GLuint start, GLuint end, GLuint start, GLuint end,
GLuint new_inputs); GLuint new_inputs);
/** /**
@@ -625,9 +628,9 @@ struct tnl_clipspace
struct tnl_clipspace_attr attr[_TNL_ATTRIB_MAX]; struct tnl_clipspace_attr attr[_TNL_ATTRIB_MAX];
GLuint attr_count; GLuint attr_count;
emit_func emit; tnl_emit_func emit;
interp_func interp; tnl_interp_func interp;
copy_pv_func copy_pv; tnl_copy_pv_func copy_pv;
struct tnl_clipspace_codegen codegen; struct tnl_clipspace_codegen codegen;
}; };
@@ -673,14 +676,14 @@ struct tnl_device_driver
* modes accepted by glBegin(). * modes accepted by glBegin().
*/ */
interp_func Interp; tnl_interp_func Interp;
/* The interp function is called by the clipping routines when we need /* The interp function is called by the clipping routines when we need
* to generate an interpolated vertex. All pertinant vertex ancilliary * to generate an interpolated vertex. All pertinant vertex ancilliary
* data should be computed by interpolating between the 'in' and 'out' * data should be computed by interpolating between the 'in' and 'out'
* vertices. * vertices.
*/ */
copy_pv_func CopyPV; tnl_copy_pv_func CopyPV;
/* The copy function is used to make a copy of a vertex. All pertinant /* The copy function is used to make a copy of a vertex. All pertinant
* vertex attributes should be copied. * vertex attributes should be copied.
*/ */
@@ -693,16 +696,16 @@ struct tnl_device_driver
void (*ClippedLine)( GLcontext *ctx, GLuint v0, GLuint v1 ); void (*ClippedLine)( GLcontext *ctx, GLuint v0, GLuint v1 );
/* Render a line between the two vertices given by indexes v0 and v1. */ /* Render a line between the two vertices given by indexes v0 and v1. */
points_func Points; /* must now respect vb->elts */ tnl_points_func Points; /* must now respect vb->elts */
line_func Line; tnl_line_func Line;
triangle_func Triangle; tnl_triangle_func Triangle;
quad_func Quad; tnl_quad_func Quad;
/* These functions are called in order to render points, lines, /* These functions are called in order to render points, lines,
* triangles and quads. These are only called via the T&L module. * triangles and quads. These are only called via the T&L module.
*/ */
render_func *PrimTabVerts; tnl_render_func *PrimTabVerts;
render_func *PrimTabElts; tnl_render_func *PrimTabElts;
/* Render whole unclipped primitives (points, lines, linestrips, /* Render whole unclipped primitives (points, lines, linestrips,
* lineloops, etc). The tables are indexed by the GL enum of the * lineloops, etc). The tables are indexed by the GL enum of the
* primitive to be rendered. RenderTabVerts is used for non-indexed * primitive to be rendered. RenderTabVerts is used for non-indexed
@@ -714,7 +717,7 @@ struct tnl_device_driver
/* Reset the hardware's line stipple counter. /* Reset the hardware's line stipple counter.
*/ */
setup_func BuildVertices; tnl_setup_func BuildVertices;
/* This function is called whenever new vertices are required for /* This function is called whenever new vertices are required for
* rendering. The vertices in question are those n such that start * rendering. The vertices in question are those n such that start
* <= n < end. The new_inputs parameter indicates those fields of * <= n < end. The new_inputs parameter indicates those fields of

4
src/mesa/tnl/t_pipeline.h
View File

@@ -64,8 +64,8 @@ extern const struct tnl_pipeline_stage *_tnl_default_pipeline[];
/* Convenience routines provided by t_vb_render.c: /* Convenience routines provided by t_vb_render.c:
*/ */
extern render_func _tnl_render_tab_elts[]; extern tnl_render_func _tnl_render_tab_elts[];
extern render_func _tnl_render_tab_verts[]; extern tnl_render_func _tnl_render_tab_verts[];
extern void _tnl_RenderClippedPolygon( GLcontext *ctx, extern void _tnl_RenderClippedPolygon( GLcontext *ctx,
const GLuint *elts, GLuint n ); const GLuint *elts, GLuint n );

6
src/mesa/tnl/t_vb_cliptmp.h
View File

@@ -122,7 +122,7 @@ TAG(clip_line)( GLcontext *ctx, GLuint i, GLuint j, GLubyte mask )
{ {
TNLcontext *tnl = TNL_CONTEXT(ctx); TNLcontext *tnl = TNL_CONTEXT(ctx);
struct vertex_buffer *VB = &tnl->vb; 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; GLfloat (*coord)[4] = VB->ClipPtr->data;
GLuint ii = i, jj = j, p; GLuint ii = i, jj = j, p;
@@ -163,7 +163,7 @@ TAG(clip_tri)( GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2, GLubyte mask )
{ {
TNLcontext *tnl = TNL_CONTEXT(ctx); TNLcontext *tnl = TNL_CONTEXT(ctx);
struct vertex_buffer *VB = &tnl->vb; 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; GLfloat (*coord)[4] = VB->ClipPtr->data;
GLuint pv = v2; GLuint pv = v2;
GLuint vlist[2][MAX_CLIPPED_VERTICES]; GLuint vlist[2][MAX_CLIPPED_VERTICES];
@@ -216,7 +216,7 @@ TAG(clip_quad)( GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint v3,
{ {
TNLcontext *tnl = TNL_CONTEXT(ctx); TNLcontext *tnl = TNL_CONTEXT(ctx);
struct vertex_buffer *VB = &tnl->vb; 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; GLfloat (*coord)[4] = VB->ClipPtr->data;
GLuint pv = v3; GLuint pv = v3;
GLuint vlist[2][MAX_CLIPPED_VERTICES]; GLuint vlist[2][MAX_CLIPPED_VERTICES];

16
src/mesa/tnl/t_vb_render.c
View File

@@ -123,9 +123,9 @@ do { \
const GLuint * const elt = VB->Elts; \ const GLuint * const elt = VB->Elts; \
const GLubyte *mask = VB->ClipMask; \ const GLubyte *mask = VB->ClipMask; \
const GLuint sz = VB->ClipPtr->size; \ const GLuint sz = VB->ClipPtr->size; \
const line_func LineFunc = tnl->Driver.Render.Line; \ const tnl_line_func LineFunc = tnl->Driver.Render.Line; \
const triangle_func TriangleFunc = tnl->Driver.Render.Triangle; \ const tnl_triangle_func TriangleFunc = tnl->Driver.Render.Triangle; \
const quad_func QuadFunc = tnl->Driver.Render.Quad; \ const tnl_quad_func QuadFunc = tnl->Driver.Render.Quad; \
const GLboolean stipple = ctx->Line.StippleFlag; \ const GLboolean stipple = ctx->Line.StippleFlag; \
(void) (LineFunc && TriangleFunc && QuadFunc); \ (void) (LineFunc && TriangleFunc && QuadFunc); \
(void) elt; (void) mask; (void) sz; (void) stipple; (void) elt; (void) mask; (void) sz; (void) stipple;
@@ -155,7 +155,7 @@ static void clip_elt_triangles( GLcontext *ctx,
GLuint flags ) GLuint flags )
{ {
TNLcontext *tnl = TNL_CONTEXT(ctx); 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; struct vertex_buffer *VB = &tnl->vb;
const GLuint * const elt = VB->Elts; const GLuint * const elt = VB->Elts;
GLubyte *mask = VB->ClipMask; GLubyte *mask = VB->ClipMask;
@@ -212,9 +212,9 @@ static void clip_elt_triangles( GLcontext *ctx,
TNLcontext *tnl = TNL_CONTEXT(ctx); \ TNLcontext *tnl = TNL_CONTEXT(ctx); \
struct vertex_buffer *VB = &tnl->vb; \ struct vertex_buffer *VB = &tnl->vb; \
const GLuint * const elt = VB->Elts; \ const GLuint * const elt = VB->Elts; \
const line_func LineFunc = tnl->Driver.Render.Line; \ const tnl_line_func LineFunc = tnl->Driver.Render.Line; \
const triangle_func TriangleFunc = tnl->Driver.Render.Triangle; \ const tnl_triangle_func TriangleFunc = tnl->Driver.Render.Triangle; \
const quad_func QuadFunc = tnl->Driver.Render.Quad; \ const tnl_quad_func QuadFunc = tnl->Driver.Render.Quad; \
const GLboolean stipple = ctx->Line.StippleFlag; \ const GLboolean stipple = ctx->Line.StippleFlag; \
(void) (LineFunc && TriangleFunc && QuadFunc); \ (void) (LineFunc && TriangleFunc && QuadFunc); \
(void) elt; (void) stipple (void) elt; (void) stipple
@@ -269,7 +269,7 @@ static GLboolean run_render( GLcontext *ctx,
TNLcontext *tnl = TNL_CONTEXT(ctx); TNLcontext *tnl = TNL_CONTEXT(ctx);
struct vertex_buffer *VB = &tnl->vb; struct vertex_buffer *VB = &tnl->vb;
GLuint new_inputs = stage->changed_inputs; GLuint new_inputs = stage->changed_inputs;
render_func *tab; tnl_render_func *tab;
GLint pass = 0; GLint pass = 0;
/* Allow the drivers to lock before projected verts are built so /* Allow the drivers to lock before projected verts are built so

4
src/mesa/tnl/t_vertex.c
View File

@@ -588,8 +588,8 @@ static void extract_1ub_1f( const struct tnl_clipspace_attr *a, GLfloat *out, co
static struct { static struct {
const char *name; const char *name;
extract_func extract; tnl_extract_func extract;
insert_func insert[4]; tnl_insert_func insert[4];
const GLuint attrsize; const GLuint attrsize;
} format_info[EMIT_MAX] = { } format_info[EMIT_MAX] = {

2
src/mesa/tnl/t_vertex.h
View File

@@ -125,7 +125,7 @@ extern void _tnl_invalidate_vertices( GLcontext *ctx, GLuint newinputs );
extern void _tnl_invalidate_vertex_state( GLcontext *ctx, GLuint new_state ); extern void _tnl_invalidate_vertex_state( GLcontext *ctx, GLuint new_state );
extern emit_func _tnl_codegen_emit( GLcontext *ctx ); extern tnl_emit_func _tnl_codegen_emit( GLcontext *ctx );
#define REG_IN (0<<16) #define REG_IN (0<<16)
#define REG_OUT (1<<16) #define REG_OUT (1<<16)

2
src/mesa/tnl/t_vertex_c.c
View File

@@ -228,7 +228,7 @@ static GLboolean print_attr_footer( struct tnl_clipspace_codegen *p )
emit(p, " }\n"); emit(p, " }\n");
} }
static emit_func print_store_func( struct tnl_clipspace_codegen *p ) static tnl_emit_func print_store_func( struct tnl_clipspace_codegen *p )
{ {
fprintf(stderr, "%s: emitted:\n%s\n", __FUNCTION__, p->buf); fprintf(stderr, "%s: emitted:\n%s\n", __FUNCTION__, p->buf);

2
src/mesa/tnl/t_vertex_codegen.c
View File

@@ -447,7 +447,7 @@ static struct {
* the pipeline has been run. * the pipeline has been run.
*/ */
emit_func _tnl_codegen_emit( GLcontext *ctx ) tnl_emit_func _tnl_codegen_emit( GLcontext *ctx )
{ {
struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb; struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
struct tnl_clipspace *vtx = GET_VERTEX_STATE(ctx); struct tnl_clipspace *vtx = GET_VERTEX_STATE(ctx);

12
src/mesa/tnl/t_vtx_api.c
View File

@@ -45,8 +45,8 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
static void reset_attrfv( TNLcontext *tnl ); static void reset_attrfv( TNLcontext *tnl );
static attrfv_func choose[_TNL_MAX_ATTR_CODEGEN+1][4]; /* +1 for ERROR_ATTRIB */ static tnl_attrfv_func choose[_TNL_MAX_ATTR_CODEGEN+1][4]; /* +1 for ERROR_ATTRIB */
static attrfv_func generic_attr_func[_TNL_MAX_ATTR_CODEGEN][4]; static tnl_attrfv_func generic_attr_func[_TNL_MAX_ATTR_CODEGEN][4];
/* Close off the last primitive, execute the buffer, restart the /* Close off the last primitive, execute the buffer, restart the
@@ -359,7 +359,7 @@ static struct _tnl_dynfn *lookup( struct _tnl_dynfn *l, GLuint key )
} }
static attrfv_func do_codegen( GLcontext *ctx, GLuint attr, GLuint sz ) static tnl_attrfv_func do_codegen( GLcontext *ctx, GLuint attr, GLuint sz )
{ {
TNLcontext *tnl = TNL_CONTEXT(ctx); TNLcontext *tnl = TNL_CONTEXT(ctx);
struct _tnl_dynfn *dfn = 0; struct _tnl_dynfn *dfn = 0;
@@ -382,7 +382,7 @@ static attrfv_func do_codegen( GLcontext *ctx, GLuint attr, GLuint sz )
} }
if (dfn) if (dfn)
return (attrfv_func) dfn->code; return (tnl_attrfv_func) dfn->code;
else else
return 0; return 0;
} }
@@ -391,7 +391,7 @@ static attrfv_func do_codegen( GLcontext *ctx, GLuint attr, GLuint sz )
* entrypoint is called for the first time. * entrypoint is called for the first time.
*/ */
static attrfv_func do_choose( GLuint attr, GLuint sz ) static tnl_attrfv_func do_choose( GLuint attr, GLuint sz )
{ {
GET_CURRENT_CONTEXT( ctx ); GET_CURRENT_CONTEXT( ctx );
TNLcontext *tnl = TNL_CONTEXT(ctx); TNLcontext *tnl = TNL_CONTEXT(ctx);
@@ -432,7 +432,7 @@ static attrfv_func do_choose( GLuint attr, GLuint sz )
#define CHOOSE( ATTR, N ) \ #define CHOOSE( ATTR, N ) \
static void choose_##ATTR##_##N( const GLfloat *v ) \ static void choose_##ATTR##_##N( const GLfloat *v ) \
{ \ { \
attrfv_func f = do_choose(ATTR, N); \ tnl_attrfv_func f = do_choose(ATTR, N); \
f( v ); \ f( v ); \
} }

6
src/mesa/tnl/t_vtx_api.h
View File

@@ -72,7 +72,7 @@ extern GLboolean *_tnl_import_current_edgeflag( GLcontext *ctx,
*/ */
extern void _tnl_generic_exec_vtxfmt_init( GLcontext *ctx ); extern void _tnl_generic_exec_vtxfmt_init( GLcontext *ctx );
extern void _tnl_generic_attr_table_init( attrfv_func (*tab)[4] ); extern void _tnl_generic_attr_table_init( tnl_attrfv_func (*tab)[4] );
/* t_vtx_x86.c: /* t_vtx_x86.c:
*/ */
@@ -80,8 +80,8 @@ extern void _tnl_InitX86Codegen( struct _tnl_dynfn_generators *gen );
extern void _tnl_x86_exec_vtxfmt_init( GLcontext *ctx ); extern void _tnl_x86_exec_vtxfmt_init( GLcontext *ctx );
extern void _tnl_x86choosers( attrfv_func (*choose)[4], extern void _tnl_x86choosers( tnl_attrfv_func (*choose)[4],
attrfv_func (*do_choose)( GLuint attr, tnl_attrfv_func (*do_choose)( GLuint attr,
GLuint sz )); GLuint sz ));

2
src/mesa/tnl/t_vtx_generic.c
View File

@@ -113,7 +113,7 @@ ATTRS( 13 )
ATTRS( 14 ) ATTRS( 14 )
ATTRS( 15 ) ATTRS( 15 )
void _tnl_generic_attr_table_init( attrfv_func (*tab)[4] ) void _tnl_generic_attr_table_init( tnl_attrfv_func (*tab)[4] )
{ {
INIT( tab, 0 ); INIT( tab, 0 );
INIT( tab, 1 ); INIT( tab, 1 );

10
src/mesa/tnl/t_vtx_x86.c
View File

@@ -337,8 +337,8 @@ void _tnl_x86_exec_vtxfmt_init( GLcontext *ctx )
/* Install the codegen'ed choosers. /* Install the codegen'ed choosers.
* We should keep a list and free them in the end... * We should keep a list and free them in the end...
*/ */
void _tnl_x86choosers( attrfv_func (*choose)[4], void _tnl_x86choosers( tnl_attrfv_func (*choose)[4],
attrfv_func (*do_choose)( GLuint attr, tnl_attrfv_func (*do_choose)( GLuint attr,
GLuint sz )) GLuint sz ))
{ {
int attr, size; int attr, size;
@@ -354,7 +354,7 @@ void _tnl_x86choosers( attrfv_func (*choose)[4],
FIXUP(code, 0, 0, attr); FIXUP(code, 0, 0, attr);
FIXUP(code, 0, 1, size + 1); FIXUP(code, 0, 1, size + 1);
FIXUPREL(code, 0, 2, do_choose); FIXUPREL(code, 0, 2, do_choose);
choose[attr][size] = (attrfv_func)code; choose[attr][size] = (tnl_attrfv_func)code;
} }
} }
} }
@@ -373,8 +373,8 @@ void _tnl_x86_exec_vtxfmt_init( GLcontext *ctx )
} }
void _tnl_x86choosers( attrfv_func (*choose)[4], void _tnl_x86choosers( tnl_attrfv_func (*choose)[4],
attrfv_func (*do_choose)( GLuint attr, tnl_attrfv_func (*do_choose)( GLuint attr,
GLuint sz )) GLuint sz ))
{ {
(void) choose; (void) choose;

4
src/mesa/tnl_dd/t_dd_dmatmp.h
View File

@@ -633,7 +633,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_points_verts),
TAG(render_lines_verts), TAG(render_lines_verts),
@@ -1121,7 +1121,7 @@ static void TAG(render_quads_elts)( GLcontext *ctx,
static render_func TAG(render_tab_elts)[GL_POLYGON+2] = static tnl_render_func TAG(render_tab_elts)[GL_POLYGON+2] =
{ {
TAG(render_points_elts), TAG(render_points_elts),
TAG(render_lines_elts), TAG(render_lines_elts),

4
src/mesa/tnl_dd/t_dd_dmatmp2.h
View File

@@ -516,7 +516,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_points_verts),
TAG(render_lines_verts), TAG(render_lines_verts),
@@ -898,7 +898,7 @@ static void TAG(render_quads_elts)( GLcontext *ctx,
static render_func TAG(render_tab_elts)[GL_POLYGON+2] = static tnl_render_func TAG(render_tab_elts)[GL_POLYGON+2] =
{ {
TAG(render_points_elts), TAG(render_points_elts),
TAG(render_lines_elts), TAG(render_lines_elts),