mesa: Rename _mesa_lookup_arrayobj to _mesa_lookup_vao.

For consistency with the previous renames.

Completely generated by:
$ find . -type f -print0 | xargs -0 sed -i \
  's/_mesa_lookup_arrayobj/_mesa_lookup_vao/g'

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>

diff --git a/src/mesa/main/arrayobj.c b/src/mesa/main/arrayobj.c
index dde9cf956c3a860058f74406db886ea1e410f9ad..0caae43a35b8042d159291b6d1cd8e260de7a2e4 100644 (file)
--- a/src/mesa/main/arrayobj.c
+++ b/src/mesa/main/arrayobj.c
@@ -61,7 +61,7 @@
  */
 
 struct gl_vertex_array_object *
-_mesa_lookup_arrayobj(struct gl_context *ctx, GLuint id)
+_mesa_lookup_vao(struct gl_context *ctx, GLuint id)
 {
    if (id == 0)
       return NULL;
@@ -395,7 +395,7 @@ bind_vertex_array(struct gl_context *ctx, GLuint id, GLboolean genRequired)
    }
    else {
       /* non-default array object */
-      newObj = _mesa_lookup_arrayobj(ctx, id);
+      newObj = _mesa_lookup_vao(ctx, id);
       if (!newObj) {
          if (genRequired) {
             _mesa_error(ctx, GL_INVALID_OPERATION,
@@ -482,7 +482,7 @@ _mesa_DeleteVertexArrays(GLsizei n, const GLuint *ids)
    }
 
    for (i = 0; i < n; i++) {
-      struct gl_vertex_array_object *obj = _mesa_lookup_arrayobj(ctx, ids[i]);
+      struct gl_vertex_array_object *obj = _mesa_lookup_vao(ctx, ids[i]);
 
       if ( obj != NULL ) {
         ASSERT( obj->Name == ids[i] );
@@ -588,7 +588,7 @@ _mesa_IsVertexArray( GLuint id )
    if (id == 0)
       return GL_FALSE;
 
-   obj = _mesa_lookup_arrayobj(ctx, id);
+   obj = _mesa_lookup_vao(ctx, id);
    if (obj == NULL)
       return GL_FALSE;
 

diff --git a/src/mesa/main/arrayobj.h b/src/mesa/main/arrayobj.h
index 6511e0810ab887fae020eaf3566fd800eae74739..d72761db15f368feef90299411978e0a5445301f 100644 (file)
--- a/src/mesa/main/arrayobj.h
+++ b/src/mesa/main/arrayobj.h
@@ -46,7 +46,7 @@ struct gl_context;
  */
 
 extern struct gl_vertex_array_object *
-_mesa_lookup_arrayobj(struct gl_context *ctx, GLuint id);
+_mesa_lookup_vao(struct gl_context *ctx, GLuint id);
 
 extern struct gl_vertex_array_object *
 _mesa_new_vao(struct gl_context *ctx, GLuint name);

diff --git a/src/mesa/main/objectlabel.c b/src/mesa/main/objectlabel.c
index c87fcfd66bff376d18e164b49735a6f40062ead0..8efc33e0dd0799bdd3271718fecd26824ad366f7 100644 (file)
--- a/src/mesa/main/objectlabel.c
+++ b/src/mesa/main/objectlabel.c
@@ -158,7 +158,7 @@ get_label_pointer(struct gl_context *ctx, GLenum identifier, GLuint name,
       break;
    case GL_VERTEX_ARRAY:
       {
-         struct gl_vertex_array_object *obj = _mesa_lookup_arrayobj(ctx, name);
+         struct gl_vertex_array_object *obj = _mesa_lookup_vao(ctx, name);
          if (obj)
             labelPtr = &obj->Label;
       }