r300: Changed r300_run_vb_render calls to r300RunRender in some conditionally

disabled code.

diff --git a/src/mesa/drivers/dri/r300/r300_context.h b/src/mesa/drivers/dri/r300/r300_context.h
index 4cc3352ab0f294c03dab3c74f49c49e725995896..b7d2552b189d56334d8bb8efe6817107021622a7 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_context.h
+++ b/src/mesa/drivers/dri/r300/r300_context.h
@@ -914,8 +914,8 @@ extern int r300Fallback(GLcontext * ctx);
 extern void radeon_vb_to_rvb(r300ContextPtr rmesa,
                             struct radeon_vertex_buffer *rvb,
                             struct vertex_buffer *vb);
-extern GLboolean r300_run_vb_render(GLcontext * ctx,
-                                   struct tnl_pipeline_stage *stage);
+extern GLboolean r300RunRender(GLcontext * ctx,
+                              struct tnl_pipeline_stage *stage);
 
 #ifdef RADEON_VTXFMT_A
 extern void radeon_init_vtxfmt_a(r300ContextPtr rmesa);

diff --git a/src/mesa/drivers/dri/r300/radeon_vtxfmt_a.c b/src/mesa/drivers/dri/r300/radeon_vtxfmt_a.c
index a15a17d1d33e3ee77ce5406fa5d3d499a2696a6c..bdd731fdf59d4fec00015cec4f243f480e089532 100644 (file)
--- a/src/mesa/drivers/dri/r300/radeon_vtxfmt_a.c
+++ b/src/mesa/drivers/dri/r300/radeon_vtxfmt_a.c
@@ -337,7 +337,7 @@ static void radeonDrawRangeElements(GLcontext *ctx,
        rmesa->state.VB.elt_min = min;
        rmesa->state.VB.elt_max = max;
        
-       if (r300_run_vb_render(ctx, NULL)) {
+       if (r300RunRender(ctx, NULL)) {
                r300ReleaseDmaRegion(rmesa, &rvb, __FUNCTION__);
                return GL_FALSE;
        }
@@ -398,7 +398,7 @@ static GLboolean radeonDrawArrays( GLcontext *ctx,
        rmesa->state.VB.elt_min = 0;
        rmesa->state.VB.elt_max = 0;
        
-       if (r300_run_vb_render(ctx, NULL))
+       if (r300RunRender(ctx, NULL))
           return GL_FALSE;
 
        return GL_TRUE;