瀏覽代碼

mesa: make the array object save/remove functions static

tags/mesa_7_6_rc1
Brian Paul 16 年之前
父節點
當前提交
fa95ecb467
共有 2 個檔案被更改,包括 7 行新增14 行删除
  1. 7
    7
      src/mesa/main/arrayobj.c
  2. 0
    7
      src/mesa/main/arrayobj.h

+ 7
- 7
src/mesa/main/arrayobj.c 查看文件

@@ -243,8 +243,8 @@ _mesa_initialize_array_object( GLcontext *ctx,
/**
* Add the given array object to the array object pool.
*/
void
_mesa_save_array_object( GLcontext *ctx, struct gl_array_object *obj )
static void
save_array_object( GLcontext *ctx, struct gl_array_object *obj )
{
if (obj->Name > 0) {
/* 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.
* Do not deallocate the array object though.
*/
void
_mesa_remove_array_object( GLcontext *ctx, struct gl_array_object *obj )
static void
remove_array_object( GLcontext *ctx, struct gl_array_object *obj )
{
if (obj->Name > 0) {
/* remove from hash table */
@@ -312,7 +312,7 @@ _mesa_BindVertexArrayAPPLE( GLuint id )
_mesa_error(ctx, GL_OUT_OF_MEMORY, "glBindVertexArrayAPPLE");
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 */
_mesa_remove_array_object(ctx, obj);
remove_array_object(ctx, obj);

/* Unreference the array object.
* 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");
return;
}
_mesa_save_array_object(ctx, obj);
save_array_object(ctx, obj);
arrays[i] = first + i;
}


+ 0
- 7
src/mesa/main/arrayobj.h 查看文件

@@ -56,13 +56,6 @@ extern void
_mesa_initialize_array_object( GLcontext *ctx,
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

Loading…
取消
儲存