mesa: make the array object save/remove functions static

This commit is contained in:
Brian Paul 2009-05-07 14:33:18 -06:00
parent 32b851c807
commit fa95ecb467
2 changed files with 7 additions and 14 deletions

View file

@ -243,8 +243,8 @@ _mesa_initialize_array_object( GLcontext *ctx,
/** /**
* Add the given array object to the array object pool. * Add the given array object to the array object pool.
*/ */
void static void
_mesa_save_array_object( GLcontext *ctx, struct gl_array_object *obj ) save_array_object( GLcontext *ctx, struct gl_array_object *obj )
{ {
if (obj->Name > 0) { if (obj->Name > 0) {
/* insert into hash table */ /* insert into hash table */
@ -257,8 +257,8 @@ _mesa_save_array_object( GLcontext *ctx, struct gl_array_object *obj )
* Remove the given array object from the array object pool. * Remove the given array object from the array object pool.
* Do not deallocate the array object though. * Do not deallocate the array object though.
*/ */
void static void
_mesa_remove_array_object( GLcontext *ctx, struct gl_array_object *obj ) remove_array_object( GLcontext *ctx, struct gl_array_object *obj )
{ {
if (obj->Name > 0) { if (obj->Name > 0) {
/* remove from hash table */ /* remove from hash table */
@ -312,7 +312,7 @@ _mesa_BindVertexArrayAPPLE( GLuint id )
_mesa_error(ctx, GL_OUT_OF_MEMORY, "glBindVertexArrayAPPLE"); _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBindVertexArrayAPPLE");
return; return;
} }
_mesa_save_array_object(ctx, newObj); save_array_object(ctx, newObj);
} }
} }
@ -361,7 +361,7 @@ _mesa_DeleteVertexArraysAPPLE(GLsizei n, const GLuint *ids)
} }
/* The ID is immediately freed for re-use */ /* The ID is immediately freed for re-use */
_mesa_remove_array_object(ctx, obj); remove_array_object(ctx, obj);
/* Unreference the array object. /* Unreference the array object.
* If refcount hits zero, the object will be deleted. * If refcount hits zero, the object will be deleted.
@ -415,7 +415,7 @@ _mesa_GenVertexArraysAPPLE(GLsizei n, GLuint *arrays)
_mesa_error(ctx, GL_OUT_OF_MEMORY, "glGenVertexArraysAPPLE"); _mesa_error(ctx, GL_OUT_OF_MEMORY, "glGenVertexArraysAPPLE");
return; return;
} }
_mesa_save_array_object(ctx, obj); save_array_object(ctx, obj);
arrays[i] = first + i; arrays[i] = first + i;
} }

View file

@ -56,13 +56,6 @@ extern void
_mesa_initialize_array_object( GLcontext *ctx, _mesa_initialize_array_object( GLcontext *ctx,
struct gl_array_object *obj, GLuint name ); struct gl_array_object *obj, GLuint name );
extern void
_mesa_save_array_object( GLcontext *ctx, struct gl_array_object *obj );
extern void
_mesa_remove_array_object( GLcontext *ctx, struct gl_array_object *obj );
/* /*
* API functions * API functions