summaryrefslogtreecommitdiffstats
path: root/src/mesa/tnl
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa/tnl')
-rw-r--r--src/mesa/tnl/t_context.h81
-rw-r--r--src/mesa/tnl/t_pipeline.h4
-rw-r--r--src/mesa/tnl/t_vb_cliptmp.h6
-rw-r--r--src/mesa/tnl/t_vb_render.c16
-rw-r--r--src/mesa/tnl/t_vertex.c4
-rw-r--r--src/mesa/tnl/t_vertex.h2
-rw-r--r--src/mesa/tnl/t_vertex_c.c2
-rw-r--r--src/mesa/tnl/t_vertex_codegen.c2
-rw-r--r--src/mesa/tnl/t_vtx_api.c12
-rw-r--r--src/mesa/tnl/t_vtx_api.h6
-rw-r--r--src/mesa/tnl/t_vtx_generic.c2
-rw-r--r--src/mesa/tnl/t_vtx_x86.c10
12 files changed, 75 insertions, 72 deletions
diff --git a/src/mesa/tnl/t_context.h b/src/mesa/tnl/t_context.h
index 7e1aaead885..47e71c38beb 100644
--- a/src/mesa/tnl/t_context.h
+++ b/src/mesa/tnl/t_context.h
@@ -249,7 +249,7 @@ struct tnl_copied_vtx {
#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 *next, *prev;
@@ -288,7 +288,7 @@ struct tnl_vtx {
GLuint counter, initial_counter;
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_generators gen;
@@ -527,14 +527,17 @@ struct tnl_pipeline {
struct tnl_clipspace;
struct tnl_clipspace_attr;
-typedef void (*extract_func)( const struct tnl_clipspace_attr *a, GLfloat *out,
- const GLubyte *v );
+typedef void (*tnl_extract_func)( const struct tnl_clipspace_attr *a,
+ GLfloat *out,
+ const GLubyte *v );
-typedef void (*insert_func)( const struct tnl_clipspace_attr *a, GLubyte *v,
- const GLfloat *in );
+typedef void (*tnl_insert_func)( const struct tnl_clipspace_attr *a,
+ GLubyte *v,
+ const GLfloat *in );
-typedef void (*emit_func)( GLcontext *ctx, GLuint start,
- GLuint end, void *dest );
+typedef void (*tnl_emit_func)( GLcontext *ctx,
+ GLuint start,
+ GLuint end, void *dest );
/**
@@ -549,9 +552,9 @@ struct tnl_clipspace_attr
GLuint vertattrsize; /* size of the attribute in bytes */
GLubyte *inputptr;
GLuint inputstride;
- insert_func *insert;
- insert_func emit;
- extract_func extract;
+ tnl_insert_func *insert;
+ tnl_insert_func emit;
+ tnl_extract_func extract;
const GLfloat *vp; /* NDC->Viewport mapping matrix */
};
@@ -579,7 +582,7 @@ struct tnl_clipspace_codegen {
GLint, GLint );
GLboolean (*emit_const_ubyte)( struct tnl_clipspace_codegen *,
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;
@@ -591,21 +594,21 @@ struct tnl_clipspace_codegen {
-typedef void (*points_func)( GLcontext *ctx, GLuint first, GLuint last );
-typedef void (*line_func)( GLcontext *ctx, GLuint v1, GLuint v2 );
-typedef void (*triangle_func)( GLcontext *ctx,
- GLuint v1, GLuint v2, GLuint v3 );
-typedef void (*quad_func)( GLcontext *ctx, GLuint v1, GLuint v2,
- GLuint v3, GLuint v4 );
-typedef void (*render_func)( GLcontext *ctx, GLuint start, GLuint count,
- GLuint flags );
-typedef void (*interp_func)( GLcontext *ctx,
- GLfloat t, GLuint dst, GLuint out, GLuint in,
- GLboolean force_boundary );
-typedef void (*copy_pv_func)( GLcontext *ctx, GLuint dst, GLuint src );
-typedef void (*setup_func)( GLcontext *ctx,
- GLuint start, GLuint end,
- GLuint new_inputs);
+typedef void (*tnl_points_func)( GLcontext *ctx, GLuint first, GLuint last );
+typedef void (*tnl_line_func)( GLcontext *ctx, GLuint v1, GLuint v2 );
+typedef void (*tnl_triangle_func)( GLcontext *ctx,
+ GLuint v1, GLuint v2, GLuint v3 );
+typedef void (*tnl_quad_func)( GLcontext *ctx, GLuint v1, GLuint v2,
+ GLuint v3, GLuint v4 );
+typedef void (*tnl_render_func)( GLcontext *ctx, GLuint start, GLuint count,
+ GLuint flags );
+typedef void (*tnl_interp_func)( GLcontext *ctx,
+ GLfloat t, GLuint dst, GLuint out, GLuint in,
+ GLboolean force_boundary );
+typedef void (*tnl_copy_pv_func)( GLcontext *ctx, GLuint dst, GLuint src );
+typedef void (*tnl_setup_func)( GLcontext *ctx,
+ GLuint start, GLuint end,
+ GLuint new_inputs);
/**
@@ -625,9 +628,9 @@ struct tnl_clipspace
struct tnl_clipspace_attr attr[_TNL_ATTRIB_MAX];
GLuint attr_count;
- emit_func emit;
- interp_func interp;
- copy_pv_func copy_pv;
+ tnl_emit_func emit;
+ tnl_interp_func interp;
+ tnl_copy_pv_func copy_pv;
struct tnl_clipspace_codegen codegen;
};
@@ -673,14 +676,14 @@ struct tnl_device_driver
* modes accepted by glBegin().
*/
- interp_func Interp;
+ tnl_interp_func Interp;
/* The interp function is called by the clipping routines when we need
* to generate an interpolated vertex. All pertinant vertex ancilliary
* data should be computed by interpolating between the 'in' and 'out'
* vertices.
*/
- copy_pv_func CopyPV;
+ tnl_copy_pv_func CopyPV;
/* The copy function is used to make a copy of a vertex. All pertinant
* vertex attributes should be copied.
*/
@@ -693,16 +696,16 @@ struct tnl_device_driver
void (*ClippedLine)( GLcontext *ctx, GLuint v0, GLuint v1 );
/* Render a line between the two vertices given by indexes v0 and v1. */
- points_func Points; /* must now respect vb->elts */
- line_func Line;
- triangle_func Triangle;
- quad_func Quad;
+ tnl_points_func Points; /* must now respect vb->elts */
+ tnl_line_func Line;
+ tnl_triangle_func Triangle;
+ tnl_quad_func Quad;
/* These functions are called in order to render points, lines,
* triangles and quads. These are only called via the T&L module.
*/
- render_func *PrimTabVerts;
- render_func *PrimTabElts;
+ tnl_render_func *PrimTabVerts;
+ tnl_render_func *PrimTabElts;
/* Render whole unclipped primitives (points, lines, linestrips,
* lineloops, etc). The tables are indexed by the GL enum of the
* 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.
*/
- setup_func BuildVertices;
+ tnl_setup_func BuildVertices;
/* This function is called whenever new vertices are required for
* rendering. The vertices in question are those n such that start
* <= n < end. The new_inputs parameter indicates those fields of
diff --git a/src/mesa/tnl/t_pipeline.h b/src/mesa/tnl/t_pipeline.h
index d356ee4532c..9efb5b8d65a 100644
--- a/src/mesa/tnl/t_pipeline.h
+++ b/src/mesa/tnl/t_pipeline.h
@@ -64,8 +64,8 @@ extern const struct tnl_pipeline_stage *_tnl_default_pipeline[];
/* Convenience routines provided by t_vb_render.c:
*/
-extern render_func _tnl_render_tab_elts[];
-extern render_func _tnl_render_tab_verts[];
+extern tnl_render_func _tnl_render_tab_elts[];
+extern tnl_render_func _tnl_render_tab_verts[];
extern void _tnl_RenderClippedPolygon( GLcontext *ctx,
const GLuint *elts, GLuint n );
diff --git a/src/mesa/tnl/t_vb_cliptmp.h b/src/mesa/tnl/t_vb_cliptmp.h
index 47a3142e441..1e3a6b02ee2 100644
--- a/src/mesa/tnl/t_vb_cliptmp.h
+++ b/src/mesa/tnl/t_vb_cliptmp.h
@@ -122,7 +122,7 @@ TAG(clip_line)( GLcontext *ctx, GLuint i, GLuint j, GLubyte mask )
{
TNLcontext *tnl = TNL_CONTEXT(ctx);
struct vertex_buffer *VB = &tnl->vb;
- interp_func interp = tnl->Driver.Render.Interp;
+ tnl_interp_func interp = tnl->Driver.Render.Interp;
GLfloat (*coord)[4] = VB->ClipPtr->data;
GLuint ii = i, jj = j, p;
@@ -163,7 +163,7 @@ TAG(clip_tri)( GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2, GLubyte mask )
{
TNLcontext *tnl = TNL_CONTEXT(ctx);
struct vertex_buffer *VB = &tnl->vb;
- interp_func interp = tnl->Driver.Render.Interp;
+ tnl_interp_func interp = tnl->Driver.Render.Interp;
GLfloat (*coord)[4] = VB->ClipPtr->data;
GLuint pv = v2;
GLuint vlist[2][MAX_CLIPPED_VERTICES];
@@ -216,7 +216,7 @@ TAG(clip_quad)( GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint v3,
{
TNLcontext *tnl = TNL_CONTEXT(ctx);
struct vertex_buffer *VB = &tnl->vb;
- interp_func interp = tnl->Driver.Render.Interp;
+ tnl_interp_func interp = tnl->Driver.Render.Interp;
GLfloat (*coord)[4] = VB->ClipPtr->data;
GLuint pv = v3;
GLuint vlist[2][MAX_CLIPPED_VERTICES];
diff --git a/src/mesa/tnl/t_vb_render.c b/src/mesa/tnl/t_vb_render.c
index f8e41f5d9be..cbeb9d5f71f 100644
--- a/src/mesa/tnl/t_vb_render.c
+++ b/src/mesa/tnl/t_vb_render.c
@@ -123,9 +123,9 @@ do { \
const GLuint * const elt = VB->Elts; \
const GLubyte *mask = VB->ClipMask; \
const GLuint sz = VB->ClipPtr->size; \
- const line_func LineFunc = tnl->Driver.Render.Line; \
- const triangle_func TriangleFunc = tnl->Driver.Render.Triangle; \
- const quad_func QuadFunc = tnl->Driver.Render.Quad; \
+ const tnl_line_func LineFunc = tnl->Driver.Render.Line; \
+ const tnl_triangle_func TriangleFunc = tnl->Driver.Render.Triangle; \
+ const tnl_quad_func QuadFunc = tnl->Driver.Render.Quad; \
const GLboolean stipple = ctx->Line.StippleFlag; \
(void) (LineFunc && TriangleFunc && QuadFunc); \
(void) elt; (void) mask; (void) sz; (void) stipple;
@@ -155,7 +155,7 @@ static void clip_elt_triangles( GLcontext *ctx,
GLuint flags )
{
TNLcontext *tnl = TNL_CONTEXT(ctx);
- render_func render_tris = tnl->Driver.Render.PrimTabElts[GL_TRIANGLES];
+ tnl_render_func render_tris = tnl->Driver.Render.PrimTabElts[GL_TRIANGLES];
struct vertex_buffer *VB = &tnl->vb;
const GLuint * const elt = VB->Elts;
GLubyte *mask = VB->ClipMask;
@@ -212,9 +212,9 @@ static void clip_elt_triangles( GLcontext *ctx,
TNLcontext *tnl = TNL_CONTEXT(ctx); \
struct vertex_buffer *VB = &tnl->vb; \
const GLuint * const elt = VB->Elts; \
- const line_func LineFunc = tnl->Driver.Render.Line; \
- const triangle_func TriangleFunc = tnl->Driver.Render.Triangle; \
- const quad_func QuadFunc = tnl->Driver.Render.Quad; \
+ const tnl_line_func LineFunc = tnl->Driver.Render.Line; \
+ const tnl_triangle_func TriangleFunc = tnl->Driver.Render.Triangle; \
+ const tnl_quad_func QuadFunc = tnl->Driver.Render.Quad; \
const GLboolean stipple = ctx->Line.StippleFlag; \
(void) (LineFunc && TriangleFunc && QuadFunc); \
(void) elt; (void) stipple
@@ -269,7 +269,7 @@ static GLboolean run_render( GLcontext *ctx,
TNLcontext *tnl = TNL_CONTEXT(ctx);
struct vertex_buffer *VB = &tnl->vb;
GLuint new_inputs = stage->changed_inputs;
- render_func *tab;
+ tnl_render_func *tab;
GLint pass = 0;
/* Allow the drivers to lock before projected verts are built so
diff --git a/src/mesa/tnl/t_vertex.c b/src/mesa/tnl/t_vertex.c
index 0adbfede2d5..28b81c1d371 100644
--- a/src/mesa/tnl/t_vertex.c
+++ b/src/mesa/tnl/t_vertex.c
@@ -588,8 +588,8 @@ static void extract_1ub_1f( const struct tnl_clipspace_attr *a, GLfloat *out, co
static struct {
const char *name;
- extract_func extract;
- insert_func insert[4];
+ tnl_extract_func extract;
+ tnl_insert_func insert[4];
const GLuint attrsize;
} format_info[EMIT_MAX] = {
diff --git a/src/mesa/tnl/t_vertex.h b/src/mesa/tnl/t_vertex.h
index dda3ab0dad1..6e0813e79c1 100644
--- a/src/mesa/tnl/t_vertex.h
+++ b/src/mesa/tnl/t_vertex.h
@@ -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 emit_func _tnl_codegen_emit( GLcontext *ctx );
+extern tnl_emit_func _tnl_codegen_emit( GLcontext *ctx );
#define REG_IN (0<<16)
#define REG_OUT (1<<16)
diff --git a/src/mesa/tnl/t_vertex_c.c b/src/mesa/tnl/t_vertex_c.c
index d1ef7cd53c0..9d18b23fc78 100644
--- a/src/mesa/tnl/t_vertex_c.c
+++ b/src/mesa/tnl/t_vertex_c.c
@@ -228,7 +228,7 @@ static GLboolean print_attr_footer( struct tnl_clipspace_codegen *p )
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);
diff --git a/src/mesa/tnl/t_vertex_codegen.c b/src/mesa/tnl/t_vertex_codegen.c
index 3c99b0411ea..e3e7f2ef1d2 100644
--- a/src/mesa/tnl/t_vertex_codegen.c
+++ b/src/mesa/tnl/t_vertex_codegen.c
@@ -447,7 +447,7 @@ static struct {
* 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 tnl_clipspace *vtx = GET_VERTEX_STATE(ctx);
diff --git a/src/mesa/tnl/t_vtx_api.c b/src/mesa/tnl/t_vtx_api.c
index 1bc84ee53d3..e75ac5b3397 100644
--- a/src/mesa/tnl/t_vtx_api.c
+++ b/src/mesa/tnl/t_vtx_api.c
@@ -45,8 +45,8 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
static void reset_attrfv( TNLcontext *tnl );
-static 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 choose[_TNL_MAX_ATTR_CODEGEN+1][4]; /* +1 for ERROR_ATTRIB */
+static tnl_attrfv_func generic_attr_func[_TNL_MAX_ATTR_CODEGEN][4];
/* 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);
struct _tnl_dynfn *dfn = 0;
@@ -382,7 +382,7 @@ static attrfv_func do_codegen( GLcontext *ctx, GLuint attr, GLuint sz )
}
if (dfn)
- return (attrfv_func) dfn->code;
+ return (tnl_attrfv_func) dfn->code;
else
return 0;
}
@@ -391,7 +391,7 @@ static attrfv_func do_codegen( GLcontext *ctx, GLuint attr, GLuint sz )
* 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 );
TNLcontext *tnl = TNL_CONTEXT(ctx);
@@ -432,7 +432,7 @@ static attrfv_func do_choose( GLuint attr, GLuint sz )
#define CHOOSE( ATTR, N ) \
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 ); \
}
diff --git a/src/mesa/tnl/t_vtx_api.h b/src/mesa/tnl/t_vtx_api.h
index 97d5cf55638..9818c082b80 100644
--- a/src/mesa/tnl/t_vtx_api.h
+++ b/src/mesa/tnl/t_vtx_api.h
@@ -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_attr_table_init( attrfv_func (*tab)[4] );
+extern void _tnl_generic_attr_table_init( tnl_attrfv_func (*tab)[4] );
/* 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_x86choosers( attrfv_func (*choose)[4],
- attrfv_func (*do_choose)( GLuint attr,
+extern void _tnl_x86choosers( tnl_attrfv_func (*choose)[4],
+ tnl_attrfv_func (*do_choose)( GLuint attr,
GLuint sz ));
diff --git a/src/mesa/tnl/t_vtx_generic.c b/src/mesa/tnl/t_vtx_generic.c
index 323dca5cd7f..daa7deace37 100644
--- a/src/mesa/tnl/t_vtx_generic.c
+++ b/src/mesa/tnl/t_vtx_generic.c
@@ -113,7 +113,7 @@ ATTRS( 13 )
ATTRS( 14 )
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, 1 );
diff --git a/src/mesa/tnl/t_vtx_x86.c b/src/mesa/tnl/t_vtx_x86.c
index 53265d23759..59a869879a5 100644
--- a/src/mesa/tnl/t_vtx_x86.c
+++ b/src/mesa/tnl/t_vtx_x86.c
@@ -337,8 +337,8 @@ void _tnl_x86_exec_vtxfmt_init( GLcontext *ctx )
/* Install the codegen'ed choosers.
* We should keep a list and free them in the end...
*/
-void _tnl_x86choosers( attrfv_func (*choose)[4],
- attrfv_func (*do_choose)( GLuint attr,
+void _tnl_x86choosers( tnl_attrfv_func (*choose)[4],
+ tnl_attrfv_func (*do_choose)( GLuint attr,
GLuint sz ))
{
int attr, size;
@@ -354,7 +354,7 @@ void _tnl_x86choosers( attrfv_func (*choose)[4],
FIXUP(code, 0, 0, attr);
FIXUP(code, 0, 1, size + 1);
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],
- attrfv_func (*do_choose)( GLuint attr,
+void _tnl_x86choosers( tnl_attrfv_func (*choose)[4],
+ tnl_attrfv_func (*do_choose)( GLuint attr,
GLuint sz ))
{
(void) choose;
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-12 20:22:39 +0000