From e7a4536e648b37f10a4501f9d295be70b8900269 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Mon, 5 Feb 2018 09:33:58 -0700 Subject: mesa: rename gl_vertex_array_object::_VertexAttrib -> _VertexArray MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since the type is gl_vertex_array. Update comment to explain that these arrays are only used by the VBO module. Also rename some local variables in _mesa_update_vao_derived_arrays(). Reviewed-by: Mathias Fröhlich --- src/mesa/main/arrayobj.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'src/mesa/main/arrayobj.c') diff --git a/src/mesa/main/arrayobj.c b/src/mesa/main/arrayobj.c index 360d097ec1d..a6fa33c82c8 100644 --- a/src/mesa/main/arrayobj.c +++ b/src/mesa/main/arrayobj.c @@ -283,8 +283,8 @@ unbind_array_object_vbos(struct gl_context *ctx, struct gl_vertex_array_object * for (i = 0; i < ARRAY_SIZE(obj->BufferBinding); i++) _mesa_reference_buffer_object(ctx, &obj->BufferBinding[i].BufferObj, NULL); - for (i = 0; i < ARRAY_SIZE(obj->_VertexAttrib); i++) - _mesa_reference_buffer_object(ctx, &obj->_VertexAttrib[i].BufferObj, NULL); + for (i = 0; i < ARRAY_SIZE(obj->_VertexArray); i++) + _mesa_reference_buffer_object(ctx, &obj->_VertexArray[i].BufferObj, NULL); } @@ -453,14 +453,13 @@ _mesa_update_vao_derived_arrays(struct gl_context *ctx, while (arrays) { const int attrib = u_bit_scan(&arrays); - struct gl_vertex_array *client_array = &vao->_VertexAttrib[attrib]; - const struct gl_array_attributes *attrib_array = + struct gl_vertex_array *array = &vao->_VertexArray[attrib]; + const struct gl_array_attributes *attribs = &vao->VertexAttrib[attrib]; const struct gl_vertex_buffer_binding *buffer_binding = - &vao->BufferBinding[attrib_array->BufferBindingIndex]; + &vao->BufferBinding[attribs->BufferBindingIndex]; - _mesa_update_vertex_array(ctx, client_array, attrib_array, - buffer_binding); + _mesa_update_vertex_array(ctx, array, attribs, buffer_binding); } } -- cgit v1.2.3