diff options
| -rw-r--r-- | src/mesa/main/arrayobj.c | 6 | ||||
| -rw-r--r-- | src/mesa/main/arrayobj.h | 4 | ||||
| -rw-r--r-- | src/mesa/main/attrib.c | 2 | ||||
| -rw-r--r-- | src/mesa/main/state.c | 2 | ||||
| -rw-r--r-- | src/mesa/main/varray.c | 4 | ||||
| -rw-r--r-- | src/mesa/main/varray.h | 4 |
6 files changed, 11 insertions, 11 deletions
diff --git a/src/mesa/main/arrayobj.c b/src/mesa/main/arrayobj.c index 94ad07ca6cd..b95aeec9d71 100644 --- a/src/mesa/main/arrayobj.c +++ b/src/mesa/main/arrayobj.c @@ -315,8 +315,8 @@ _mesa_initialize_vao(struct gl_context *ctx, * or a gl_vertex_buffer_binding has changed. */ void -_mesa_update_vao_client_arrays(struct gl_context *ctx, - struct gl_vertex_array_object *vao) +_mesa_update_vao_derived_arrays(struct gl_context *ctx, + struct gl_vertex_array_object *vao) { GLbitfield arrays = vao->NewArrays; @@ -328,7 +328,7 @@ _mesa_update_vao_client_arrays(struct gl_context *ctx, const struct gl_vertex_buffer_binding *buffer_binding = &vao->BufferBinding[attrib_array->BufferBindingIndex]; - _mesa_update_client_array(ctx, client_array, attrib_array, + _mesa_update_vertex_array(ctx, client_array, attrib_array, buffer_binding); } } diff --git a/src/mesa/main/arrayobj.h b/src/mesa/main/arrayobj.h index 1b9900c6e55..ff26157c79e 100644 --- a/src/mesa/main/arrayobj.h +++ b/src/mesa/main/arrayobj.h @@ -78,8 +78,8 @@ _mesa_initialize_vao(struct gl_context *ctx, extern void -_mesa_update_vao_client_arrays(struct gl_context *ctx, - struct gl_vertex_array_object *vao); +_mesa_update_vao_derived_arrays(struct gl_context *ctx, + struct gl_vertex_array_object *vao); /* Returns true if all varying arrays reside in vbos */ extern bool diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c index 3c12fd6824d..0b4b63f712f 100644 --- a/src/mesa/main/attrib.c +++ b/src/mesa/main/attrib.c @@ -1503,7 +1503,7 @@ copy_array_object(struct gl_context *ctx, /* skip RefCount */ for (i = 0; i < ARRAY_SIZE(src->VertexAttrib); i++) { - _mesa_copy_client_array(ctx, &dest->_VertexAttrib[i], &src->_VertexAttrib[i]); + _mesa_copy_vertex_array(ctx, &dest->_VertexAttrib[i], &src->_VertexAttrib[i]); _mesa_copy_vertex_attrib_array(ctx, &dest->VertexAttrib[i], &src->VertexAttrib[i]); _mesa_copy_vertex_buffer_binding(ctx, &dest->BufferBinding[i], &src->BufferBinding[i]); } diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c index dd61cc7e643..df694d09092 100644 --- a/src/mesa/main/state.c +++ b/src/mesa/main/state.c @@ -357,7 +357,7 @@ _mesa_update_state_locked( struct gl_context *ctx ) } if (new_state & _NEW_ARRAY) - _mesa_update_vao_client_arrays(ctx, ctx->Array.VAO); + _mesa_update_vao_derived_arrays(ctx, ctx->Array.VAO); out: new_prog_state |= update_program_constants(ctx); diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c index 2801a6fa692..6c022b479f4 100644 --- a/src/mesa/main/varray.c +++ b/src/mesa/main/varray.c @@ -2794,10 +2794,10 @@ _mesa_VertexArrayBindingDivisor(GLuint vaobj, GLuint bindingIndex, /** - * Copy one client vertex array to another. + * Copy one vertex array to another. */ void -_mesa_copy_client_array(struct gl_context *ctx, +_mesa_copy_vertex_array(struct gl_context *ctx, struct gl_vertex_array *dst, struct gl_vertex_array *src) { diff --git a/src/mesa/main/varray.h b/src/mesa/main/varray.h index 19506bf8f0b..79ecd9a0374 100644 --- a/src/mesa/main/varray.h +++ b/src/mesa/main/varray.h @@ -53,7 +53,7 @@ _mesa_vertex_attrib_address(const struct gl_array_attributes *array, * gl_array_attributes and a gl_vertex_buffer_binding. */ static inline void -_mesa_update_client_array(struct gl_context *ctx, +_mesa_update_vertex_array(struct gl_context *ctx, struct gl_vertex_array *dst, const struct gl_array_attributes *attribs, const struct gl_vertex_buffer_binding *binding) @@ -475,7 +475,7 @@ _mesa_VertexArrayBindingDivisor(GLuint vaobj, GLuint bindingIndex, GLuint divisor); extern void -_mesa_copy_client_array(struct gl_context *ctx, +_mesa_copy_vertex_array(struct gl_context *ctx, struct gl_vertex_array *dst, struct gl_vertex_array *src); |