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

mesa: Rename "arrayObj" local variables to "vao".

Browse Source 
Now that the field is named "VAO" instead of "ArrayObj", it makes sense
to call the local variables "vao" instead of "arrayObj".

Completely generated by:
$ find . -type f -print0 | xargs 0 sed -i 's/arrayObj/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 19:31:22 -08:00
parent 0dfe50f1a6
commit 94e07c1960
7 changed files with 130 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -57,15 +57,15 @@ _mesa_delete_array_object( struct gl_context *ctx, struct gl_array_object *obj )
extern void
_mesa_reference_array_object_(struct gl_context *ctx,
struct gl_array_object **ptr,
struct gl_array_object *arrayObj);
struct gl_array_object *vao);
static inline void
_mesa_reference_array_object(struct gl_context *ctx,
struct gl_array_object **ptr,
struct gl_array_object *arrayObj)
struct gl_array_object *vao)
{
if (*ptr != arrayObj)
_mesa_reference_array_object_(ctx, ptr, arrayObj);
if (*ptr != vao)
_mesa_reference_array_object_(ctx, ptr, vao);
}
@@ -76,11 +76,11 @@ _mesa_initialize_array_object( struct gl_context *ctx,
extern void
_mesa_update_array_object_max_element(struct gl_context *ctx,
struct gl_array_object *arrayObj);
struct gl_array_object *vao);
extern void
_mesa_update_array_object_client_arrays(struct gl_context *ctx,
struct gl_array_object *arrayObj);
struct gl_array_object *vao);
/** Returns the bitmask of all enabled arrays in fixed function mode.
@@ -89,9 +89,9 @@ _mesa_update_array_object_client_arrays(struct gl_context *ctx,
* are available.
*/
static inline GLbitfield64
_mesa_array_object_get_enabled_ff(const struct gl_array_object *arrayObj)
_mesa_array_object_get_enabled_ff(const struct gl_array_object *vao)
{
return arrayObj->_Enabled & VERT_BIT_FF_ALL;
return vao->_Enabled & VERT_BIT_FF_ALL;
}
/** Returns the bitmask of all enabled arrays in arb/glsl shader mode.
@@ -101,9 +101,9 @@ _mesa_array_object_get_enabled_ff(const struct gl_array_object *arrayObj)
* precedence over the legacy position array.
*/
static inline GLbitfield64
_mesa_array_object_get_enabled_arb(const struct gl_array_object *arrayObj)
_mesa_array_object_get_enabled_arb(const struct gl_array_object *vao)
{
GLbitfield64 enabled = arrayObj->_Enabled;
GLbitfield64 enabled = vao->_Enabled;
return enabled & ~(VERT_BIT_POS & (enabled >> VERT_ATTRIB_GENERIC0));
}