OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa: Rename _mesa_lookup_arrayobj to _mesa_lookup_vao.

Browse Source 
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>
This commit is contained in:
Kenneth Graunke
2014-02-01 21:28:03 -08:00
parent de47fd2668
commit 0354e50798
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/mesa/main/arrayobj.c
View File

@@ -61,7 +61,7 @@
*/ */
struct gl_vertex_array_object * 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) if (id == 0)
return NULL; return NULL;
@@ -395,7 +395,7 @@ bind_vertex_array(struct gl_context *ctx, GLuint id, GLboolean genRequired)
} }
else { else {
/* non-default array object */ /* non-default array object */
newObj = _mesa_lookup_arrayobj(ctx, id); newObj = _mesa_lookup_vao(ctx, id);
if (!newObj) { if (!newObj) {
if (genRequired) { if (genRequired) {
_mesa_error(ctx, GL_INVALID_OPERATION, _mesa_error(ctx, GL_INVALID_OPERATION,
@@ -482,7 +482,7 @@ _mesa_DeleteVertexArrays(GLsizei n, const GLuint *ids)
} }
for (i = 0; i < n; i++) { 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 ) { if ( obj != NULL ) {
ASSERT( obj->Name == ids[i] ); ASSERT( obj->Name == ids[i] );
@@ -588,7 +588,7 @@ _mesa_IsVertexArray( GLuint id )
if (id == 0) if (id == 0)
return GL_FALSE; return GL_FALSE;
obj = _mesa_lookup_arrayobj(ctx, id); obj = _mesa_lookup_vao(ctx, id);
if (obj == NULL) if (obj == NULL)
return GL_FALSE; return GL_FALSE;

2
src/mesa/main/arrayobj.h
View File

@@ -46,7 +46,7 @@ struct gl_context;
*/ */
extern struct gl_vertex_array_object * 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 * extern struct gl_vertex_array_object *
_mesa_new_vao(struct gl_context *ctx, GLuint name); _mesa_new_vao(struct gl_context *ctx, GLuint name);

2
src/mesa/main/objectlabel.c
View File

@@ -158,7 +158,7 @@ get_label_pointer(struct gl_context *ctx, GLenum identifier, GLuint name,
break; break;
case GL_VERTEX_ARRAY: 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) if (obj)
labelPtr = &obj->Label; labelPtr = &obj->Label;
} }