Mesa (master): vbo: s/cl/array/ in vbo_context.c
Brian Paul
brianp at kemper.freedesktop.org
Mon Jan 29 16:06:24 UTC 2018
Module: Mesa
Branch: master
Commit: 35e0ff5bd5cf4e8c5755b0f93cc739a4b68b91e1
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=35e0ff5bd5cf4e8c5755b0f93cc739a4b68b91e1
Author: Brian Paul <brianp at vmware.com>
Date: Fri Jan 19 10:52:57 2018 -0700
vbo: s/cl/array/ in vbo_context.c
I think 'cl' used to mean client array.
Reviewed-by: Mathias Fröhlich <mathias.froehlich at web.de>
---
src/mesa/vbo/vbo_context.c | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/mesa/vbo/vbo_context.c b/src/mesa/vbo/vbo_context.c
index dbeb6871e7..f516c67843 100644
--- a/src/mesa/vbo/vbo_context.c
+++ b/src/mesa/vbo/vbo_context.c
@@ -51,19 +51,19 @@ check_size(const GLfloat *attr)
* Helper for initializing a vertex array.
*/
static void
-init_array(struct gl_context *ctx, struct gl_vertex_array *cl,
+init_array(struct gl_context *ctx, struct gl_vertex_array *array,
unsigned size, const void *pointer)
{
- memset(cl, 0, sizeof(*cl));
+ memset(array, 0, sizeof(*array));
- cl->Size = size;
- cl->Type = GL_FLOAT;
- cl->Format = GL_RGBA;
- cl->StrideB = 0;
- cl->_ElementSize = cl->Size * sizeof(GLfloat);
- cl->Ptr = pointer;
+ array->Size = size;
+ array->Type = GL_FLOAT;
+ array->Format = GL_RGBA;
+ array->StrideB = 0;
+ array->_ElementSize = array->Size * sizeof(GLfloat);
+ array->Ptr = pointer;
- _mesa_reference_buffer_object(ctx, &cl->BufferObj,
+ _mesa_reference_buffer_object(ctx, &array->BufferObj,
ctx->Shared->NullBufferObj);
}
@@ -82,9 +82,9 @@ init_legacy_currval(struct gl_context *ctx)
* attribute:
*/
for (i = 0; i < VERT_ATTRIB_FF_MAX; i++) {
- struct gl_vertex_array *cl = &vbo->currval[VERT_ATTRIB_FF(i)];
+ struct gl_vertex_array *array = &vbo->currval[VERT_ATTRIB_FF(i)];
- init_array(ctx, cl,
+ init_array(ctx, array,
check_size(ctx->Current.Attrib[i]),
ctx->Current.Attrib[i]);
}
@@ -98,9 +98,9 @@ init_generic_currval(struct gl_context *ctx)
GLuint i;
for (i = 0; i < VERT_ATTRIB_GENERIC_MAX; i++) {
- struct gl_vertex_array *cl = &vbo->currval[VBO_ATTRIB_GENERIC0 + i];
+ struct gl_vertex_array *array = &vbo->currval[VBO_ATTRIB_GENERIC0 + i];
- init_array(ctx, cl, 1, ctx->Current.Attrib[VERT_ATTRIB_GENERIC0 + i]);
+ init_array(ctx, array, 1, ctx->Current.Attrib[VERT_ATTRIB_GENERIC0 + i]);
}
}
@@ -115,7 +115,7 @@ init_mat_currval(struct gl_context *ctx)
* attribute:
*/
for (i = 0; i < MAT_ATTRIB_MAX; i++) {
- struct gl_vertex_array *cl =
+ struct gl_vertex_array *array =
&vbo->currval[VBO_ATTRIB_MAT_FRONT_AMBIENT + i];
unsigned size;
@@ -136,7 +136,7 @@ init_mat_currval(struct gl_context *ctx)
break;
}
- init_array(ctx, cl, size, ctx->Light.Material.Attrib[i]);
+ init_array(ctx, array, size, ctx->Light.Material.Attrib[i]);
}
}
More information about the mesa-commit
mailing list