[Mesa-dev] [PATCH 05/11] vbo: use a new local 'array' variable in bind_vertex_list() loop

Brian Paul brianp at vmware.com
Wed Jan 17 05:17:56 UTC 2018


Make the code a bit more concise.
---
 src/mesa/vbo/vbo_save_draw.c | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/mesa/vbo/vbo_save_draw.c b/src/mesa/vbo/vbo_save_draw.c
index c1298f9..5d299d8 100644
--- a/src/mesa/vbo/vbo_save_draw.c
+++ b/src/mesa/vbo/vbo_save_draw.c
@@ -201,22 +201,23 @@ bind_vertex_list(struct gl_context *ctx,
       const GLuint src = map[attr];
 
       if (node_attrsz[src]) {
+         struct gl_vertex_array *array = &arrays[attr];
+
          /* override the default array set above */
-         save->inputs[attr] = &arrays[attr];
-
-         arrays[attr].Ptr = (const GLubyte *) NULL + buffer_offset;
-         arrays[attr].Size = node_attrsz[src];
-         arrays[attr].StrideB = node->vertex_size * sizeof(GLfloat);
-         arrays[attr].Type = node_attrtype[src];
-         arrays[attr].Integer =
-               vbo_attrtype_to_integer_flag(node_attrtype[src]);
-         arrays[attr].Format = GL_RGBA;
-         arrays[attr]._ElementSize = arrays[attr].Size * sizeof(GLfloat);
+         save->inputs[attr] = array;
+
+         array->Ptr = (const GLubyte *) NULL + buffer_offset;
+         array->Size = node_attrsz[src];
+         array->StrideB = node->vertex_size * sizeof(GLfloat);
+         array->Type = node_attrtype[src];
+         array->Integer = vbo_attrtype_to_integer_flag(node_attrtype[src]);
+         array->Format = GL_RGBA;
+         array->_ElementSize = array->Size * sizeof(GLfloat);
          _mesa_reference_buffer_object(ctx,
-                                       &arrays[attr].BufferObj,
+                                       &array->BufferObj,
                                        node->vertex_store->bufferobj);
 
-         assert(arrays[attr].BufferObj->Name);
+         assert(array->BufferObj->Name);
 
          buffer_offset += node_attrsz[src] * sizeof(GLfloat);
          varying_inputs |= VERT_BIT(attr);
-- 
2.7.4



More information about the mesa-dev mailing list