[Mesa-dev] [PATCH 05/15] mesa: make _mesa_lookup_arrayobj() non-static

[Timothy Arceri]

Signed-off-by: Timothy Arceri <t_arc...@yahoo.com.au>
---
 src/mesa/main/arrayobj.c |   10 +++++-----
 src/mesa/main/arrayobj.h |    3 +++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/mesa/main/arrayobj.c b/src/mesa/main/arrayobj.c
index 9226050..006a2ea 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 6dee1af..492ef35 100644
--- a/src/mesa/main/arrayobj.h
+++ b/src/mesa/main/arrayobj.h
@@ -46,6 +46,9 @@ struct gl_context;
  */
 
 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 );
 
 extern void
-- 
1.7.9.5

_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev