diff options
| -rw-r--r-- | src/mesa/main/arrayobj.c | 8 | ||||
| -rw-r--r-- | src/mesa/main/arrayobj.h | 2 | ||||
| -rw-r--r-- | src/mesa/main/objectlabel.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/mesa/main/arrayobj.c b/src/mesa/main/arrayobj.c index dde9cf956c3..0caae43a35b 100644 --- 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 6511e0810ab..d72761db15f 100644 --- 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 c87fcfd66bf..8efc33e0dd0 100644 --- 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; } |