diff options
Diffstat (limited to 'src/mesa/main/arrayobj.h')
| -rw-r--r-- | src/mesa/main/arrayobj.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/mesa/main/arrayobj.h b/src/mesa/main/arrayobj.h index 7c3720242b0..cc3360cbb5c 100644 --- a/src/mesa/main/arrayobj.h +++ b/src/mesa/main/arrayobj.h @@ -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)); } |