Various fallbacks, checks and tags.

[mesa.git] / src / mesa / drivers / dri / ffb / ffb_tris.c

diff --git a/src/mesa/drivers/dri/ffb/ffb_tris.c b/src/mesa/drivers/dri/ffb/ffb_tris.c
index 62c74247b079528cf24acb297c4a61dd223c5f19..ca0e514dc0e5907f6700a06045ee5afc5ef63bd4 100644 (file)
--- a/src/mesa/drivers/dri/ffb/ffb_tris.c
+++ b/src/mesa/drivers/dri/ffb/ffb_tris.c
@@ -306,8 +306,8 @@ static void ffbRasterPrimitive(GLcontext *ctx, GLenum rprim);
 #define FFB_MAX_TRIFUNC        0x08
 
 static struct {
-       triangle_func triangle;
-       quad_func quad;
+       tnl_triangle_func triangle;
+       tnl_quad_func quad;
 } rast_tab[FFB_MAX_TRIFUNC];
 
 #define DO_OFFSET   (IND & FFB_OFFSET_BIT)
@@ -549,13 +549,13 @@ static void init_render_tab(void)
                render_tab_flat_alpha_tricull_elt;
 
        for (i = 0; i < MAX_FFB_RENDER_FUNCS; i++) {
-               render_func *rf = render_tabs[i];
-               render_func *rfe = render_tabs_elt[i];
+               tnl_render_func *rf = render_tabs[i];
+               tnl_render_func *rfe = render_tabs_elt[i];
 
                if (i & FFB_TRI_CULL_BIT) {
                        int from_idx = (i & ~FFB_TRI_CULL_BIT);
-                       render_func *rf_from = render_tabs[from_idx];
-                       render_func *rfe_from = render_tabs_elt[from_idx];
+                       tnl_render_func *rf_from = render_tabs[from_idx];
+                       tnl_render_func *rfe_from = render_tabs_elt[from_idx];
                        int j;
 
                        for (j = GL_POINTS; j < GL_TRIANGLES; j++) {