diff options
Diffstat (limited to 'src/mesa/drivers')
| -rw-r--r-- | src/mesa/drivers/dri/ffb/ffb_vb.c | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/sis/sis_tris.c | 10 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/tdfx/tdfx_vb.c | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/mesa/drivers/dri/ffb/ffb_vb.c b/src/mesa/drivers/dri/ffb/ffb_vb.c index 7594c2b1a7e..5b8e5923a5f 100644 --- a/src/mesa/drivers/dri/ffb/ffb_vb.c +++ b/src/mesa/drivers/dri/ffb/ffb_vb.c @@ -74,10 +74,10 @@ static void ffb_copy_pv_twoside(GLcontext *ctx, GLuint edst, GLuint esrc) #define FFB_VB_TWOSIDE_BIT 0x04 #define FFB_VB_MAX 0x08 -typedef void (*emit_func)(GLcontext *, GLuint, GLuint); +typedef void (*ffb_emit_func)(GLcontext *, GLuint, GLuint); static struct { - emit_func emit; + ffb_emit_func emit; interp_func interp; } setup_tab[FFB_VB_MAX]; diff --git a/src/mesa/drivers/dri/sis/sis_tris.c b/src/mesa/drivers/dri/sis/sis_tris.c index 7716a5b5608..56676b04cf4 100644 --- a/src/mesa/drivers/dri/sis/sis_tris.c +++ b/src/mesa/drivers/dri/sis/sis_tris.c @@ -905,7 +905,7 @@ sisFlushPrimsLocked(sisContextPtr smesa) mEndPrimitive(); } else { int mmio_index = 0, incr = 0; - void (*emit_func)(sisContextPtr smesa, char *verts) = NULL; + void (*sis_emit_func)(sisContextPtr smesa, char *verts) = NULL; if (smesa->AGPParseSet & MASK_PsShadingSmooth) mmio_index |= VERT_SMOOTH; @@ -921,22 +921,22 @@ sisFlushPrimsLocked(sisContextPtr smesa) switch (smesa->AGPParseSet & MASK_PsDataType) { case MASK_PsPointList: incr = smesa->vertex_size * 4; - emit_func = sis_point_func_mmio[mmio_index]; + sis_emit_func = sis_point_func_mmio[mmio_index]; break; case MASK_PsLineList: incr = smesa->vertex_size * 4 * 2; - emit_func = sis_line_func_mmio[mmio_index]; + sis_emit_func = sis_line_func_mmio[mmio_index]; break; case MASK_PsTriangleList: incr = smesa->vertex_size * 4 * 3; - emit_func = sis_tri_func_mmio[mmio_index]; + sis_emit_func = sis_tri_func_mmio[mmio_index]; break; } mWait3DCmdQueue(1); MMIO(REG_3D_PrimitiveSet, smesa->dwPrimitiveSet); while (smesa->vb_last < smesa->vb_cur) { - emit_func(smesa, smesa->vb_last); + sis_emit_func(smesa, smesa->vb_last); smesa->vb_last += incr; } mWait3DCmdQueue(1); diff --git a/src/mesa/drivers/dri/tdfx/tdfx_vb.c b/src/mesa/drivers/dri/tdfx/tdfx_vb.c index 3562ead19c4..28cd9793a7e 100644 --- a/src/mesa/drivers/dri/tdfx/tdfx_vb.c +++ b/src/mesa/drivers/dri/tdfx/tdfx_vb.c @@ -59,10 +59,10 @@ static void copy_pv_rgba3( GLcontext *ctx, GLuint edst, GLuint esrc ) dst->ui[3] = src->ui[3]; } -typedef void (*emit_func)( GLcontext *, GLuint, GLuint, void *, GLuint ); +typedef void (*tdfx_emit_func)( GLcontext *, GLuint, GLuint, void *, GLuint ); static struct { - emit_func emit; + tdfx_emit_func emit; interp_func interp; copy_pv_func copy_pv; GLboolean (*check_tex_sizes)( GLcontext *ctx ); |