aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/vbo
diff options
context:
space:
mode:
Diffstat (limited to 'mesalib/src/mesa/vbo')
-rw-r--r--mesalib/src/mesa/vbo/vbo_context.c2
-rw-r--r--mesalib/src/mesa/vbo/vbo_save.c4
-rw-r--r--mesalib/src/mesa/vbo/vbo_save_api.c8
3 files changed, 7 insertions, 7 deletions
diff --git a/mesalib/src/mesa/vbo/vbo_context.c b/mesalib/src/mesa/vbo/vbo_context.c
index 5f1c72bc1..fd15fb6a9 100644
--- a/mesalib/src/mesa/vbo/vbo_context.c
+++ b/mesalib/src/mesa/vbo/vbo_context.c
@@ -223,7 +223,7 @@ void _vbo_DestroyContext( struct gl_context *ctx )
vbo_exec_destroy(ctx);
if (ctx->API == API_OPENGL)
vbo_save_destroy(ctx);
- FREE(vbo);
+ free(vbo);
ctx->swtnl_im = NULL;
}
}
diff --git a/mesalib/src/mesa/vbo/vbo_save.c b/mesalib/src/mesa/vbo/vbo_save.c
index 7a97d3c65..a40039927 100644
--- a/mesalib/src/mesa/vbo/vbo_save.c
+++ b/mesalib/src/mesa/vbo/vbo_save.c
@@ -101,13 +101,13 @@ void vbo_save_destroy( struct gl_context *ctx )
if (save->prim_store) {
if ( --save->prim_store->refcount == 0 ) {
- FREE( save->prim_store );
+ free(save->prim_store);
save->prim_store = NULL;
}
if ( --save->vertex_store->refcount == 0 ) {
_mesa_reference_buffer_object(ctx,
&save->vertex_store->bufferobj, NULL);
- FREE( save->vertex_store );
+ free(save->vertex_store);
save->vertex_store = NULL;
}
}
diff --git a/mesalib/src/mesa/vbo/vbo_save_api.c b/mesalib/src/mesa/vbo/vbo_save_api.c
index a02a13db5..636aa1fdb 100644
--- a/mesalib/src/mesa/vbo/vbo_save_api.c
+++ b/mesalib/src/mesa/vbo/vbo_save_api.c
@@ -233,7 +233,7 @@ free_vertex_store(struct gl_context *ctx,
_mesa_reference_buffer_object(ctx, &vertex_store->bufferobj, NULL);
}
- FREE(vertex_store);
+ free(vertex_store);
}
@@ -353,7 +353,7 @@ _save_compile_vertex_list(struct gl_context *ctx)
/* If the malloc fails, we just pull the data out of the VBO
* later instead.
*/
- node->current_data = MALLOC(node->current_size * sizeof(GLfloat));
+ node->current_data = malloc(node->current_size * sizeof(GLfloat));
if (node->current_data) {
const char *buffer = (const char *) save->vertex_store->buffer;
unsigned attr_offset = node->attrsz[0] * sizeof(GLfloat);
@@ -1575,10 +1575,10 @@ vbo_destroy_vertex_list(struct gl_context *ctx, void *data)
free_vertex_store(ctx, node->vertex_store);
if (--node->prim_store->refcount == 0)
- FREE(node->prim_store);
+ free(node->prim_store);
if (node->current_data) {
- FREE(node->current_data);
+ free(node->current_data);
node->current_data = NULL;
}
}