From: Timothy Arceri Date: Mon, 26 Aug 2013 07:05:42 +0000 (+1000) Subject: mesa: make _mesa_lookup_arrayobj() non-static X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=97f9f11ec48383a781d2e1671df9a55d39482fcd;p=mesa.git mesa: make _mesa_lookup_arrayobj() non-static Signed-off-by: Timothy Arceri Reviewed-by: Brian Paul --- diff --git a/src/mesa/main/arrayobj.c b/src/mesa/main/arrayobj.c index 922605034cc..006a2eaa051 100644 --- a/src/mesa/main/arrayobj.c +++ b/src/mesa/main/arrayobj.c @@ -60,8 +60,8 @@ * non-existent. */ -static inline struct gl_array_object * -lookup_arrayobj(struct gl_context *ctx, GLuint id) +struct gl_array_object * +_mesa_lookup_arrayobj(struct gl_context *ctx, GLuint id) { if (id == 0) return NULL; @@ -353,7 +353,7 @@ bind_vertex_array(struct gl_context *ctx, GLuint id, GLboolean genRequired) } else { /* non-default array object */ - newObj = lookup_arrayobj(ctx, id); + newObj = _mesa_lookup_arrayobj(ctx, id); if (!newObj) { if (genRequired) { _mesa_error(ctx, GL_INVALID_OPERATION, "glBindVertexArray(non-gen name)"); @@ -439,7 +439,7 @@ _mesa_DeleteVertexArrays(GLsizei n, const GLuint *ids) } for (i = 0; i < n; i++) { - struct gl_array_object *obj = lookup_arrayobj(ctx, ids[i]); + struct gl_array_object *obj = _mesa_lookup_arrayobj(ctx, ids[i]); if ( obj != NULL ) { ASSERT( obj->Name == ids[i] ); @@ -545,7 +545,7 @@ _mesa_IsVertexArray( GLuint id ) if (id == 0) return GL_FALSE; - obj = lookup_arrayobj(ctx, id); + obj = _mesa_lookup_arrayobj(ctx, id); if (obj == NULL) return GL_FALSE; diff --git a/src/mesa/main/arrayobj.h b/src/mesa/main/arrayobj.h index 6dee1af697c..492ef350161 100644 --- a/src/mesa/main/arrayobj.h +++ b/src/mesa/main/arrayobj.h @@ -45,6 +45,9 @@ struct gl_context; * Internal functions */ +extern struct gl_array_object * +_mesa_lookup_arrayobj(struct gl_context *ctx, GLuint id); + extern struct gl_array_object * _mesa_new_array_object( struct gl_context *ctx, GLuint name );