summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/mesa/drivers/dri/r300/r300_context.c2
-rw-r--r--src/mesa/drivers/dri/r300/r300_context.h4
-rw-r--r--src/mesa/drivers/dri/r300/r300_ioctl.c2
-rw-r--r--src/mesa/drivers/dri/r300/radeon_vtxfmt_a.c4
4 files changed, 6 insertions, 6 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_context.c b/src/mesa/drivers/dri/r300/r300_context.c
index 21750aab33c..dd348e223c2 100644
--- a/src/mesa/drivers/dri/r300/r300_context.c
+++ b/src/mesa/drivers/dri/r300/r300_context.c
@@ -215,7 +215,7 @@ GLboolean r300CreateContext(const __GLcontextModes * glVisual,
#endif
#ifdef HW_VBOS
if (hw_tcl_on) {
- r300_init_vbo_funcs(&functions);
+ r300InitVBOFuncs(&functions);
}
#endif
if (!radeonInitContext(&r300->radeon, &functions,
diff --git a/src/mesa/drivers/dri/r300/r300_context.h b/src/mesa/drivers/dri/r300/r300_context.h
index afdfc29e433..78e0b1ac9d0 100644
--- a/src/mesa/drivers/dri/r300/r300_context.h
+++ b/src/mesa/drivers/dri/r300/r300_context.h
@@ -929,8 +929,8 @@ extern void radeon_init_vtxfmt_a(r300ContextPtr rmesa);
#endif
#ifdef HW_VBOS
-extern void r300_init_vbo_funcs(struct dd_function_table *functions);
-extern void r300_evict_vbos(GLcontext *ctx, int amount);
+extern void r300InitVBOFuncs(struct dd_function_table *functions);
+extern void r300EvictVBOs(GLcontext *ctx, int amount);
#endif
#define RADEON_D_CAPTURE 0
diff --git a/src/mesa/drivers/dri/r300/r300_ioctl.c b/src/mesa/drivers/dri/r300/r300_ioctl.c
index 82414259df9..1b73389600b 100644
--- a/src/mesa/drivers/dri/r300/r300_ioctl.c
+++ b/src/mesa/drivers/dri/r300/r300_ioctl.c
@@ -442,7 +442,7 @@ static void r300RefillCurrentDmaRegion(r300ContextPtr rmesa, int size)
#ifdef HW_VBOS
if (dmabuf->id == 0) {
/* Just kick all */
- r300_evict_vbos(rmesa->radeon.glCtx, /*RADEON_BUFFER_SIZE*16*/1<<30);
+ r300EvictVBOs(rmesa->radeon.glCtx, /*RADEON_BUFFER_SIZE*16*/1<<30);
dmabuf->id = radeon_mm_alloc(rmesa, 4, size);
}
#endif
diff --git a/src/mesa/drivers/dri/r300/radeon_vtxfmt_a.c b/src/mesa/drivers/dri/r300/radeon_vtxfmt_a.c
index 9a5173cad1a..a15a17d1d33 100644
--- a/src/mesa/drivers/dri/r300/radeon_vtxfmt_a.c
+++ b/src/mesa/drivers/dri/r300/radeon_vtxfmt_a.c
@@ -618,7 +618,7 @@ static void r300DeleteBuffer(GLcontext *ctx, struct gl_buffer_object *obj)
_mesa_delete_buffer_object(ctx, obj);
}
-void r300_evict_vbos(GLcontext *ctx, int amount)
+void r300EvictVBOs(GLcontext *ctx, int amount)
{
r300ContextPtr rmesa = R300_CONTEXT(ctx);
struct _mesa_HashTable *hash = ctx->Shared->BufferObjects;
@@ -649,7 +649,7 @@ void r300_evict_vbos(GLcontext *ctx, int amount)
}
-void r300_init_vbo_funcs(struct dd_function_table *functions)
+void r300InitVBOFuncs(struct dd_function_table *functions)
{
functions->NewBufferObject = r300NewBufferObject;
functions->BufferData = r300BufferData;