summaryrefslogtreecommitdiffstats
path: root/src/mesa/vbo
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2016-10-06 17:21:09 -0600
committerBrian Paul <[email protected]>2016-10-13 17:38:49 -0600
commitc89802aeeaee35e06c98a41dd630a60e8e7e4123 (patch)
treed6bcc7383a29e5a2ac48c519ecc92a68c516f673 /src/mesa/vbo
parentc328268b9292664bd5de73ee39ed8b91ccfb38d1 (diff)
mesa: rename gl_vertex_attrib_array::VertexBinding
Rename to gl_vertex_attrib_array::BufferBindingIndex because this field is an index into the array of buffer binding points. This makes some code a little easier to follow since there's also a "VertexBinding" field in gl_vertex_array_object. Reviewed-by: Mathias Fröhlich <[email protected]>
Diffstat (limited to 'src/mesa/vbo')
-rw-r--r--src/mesa/vbo/vbo_exec_array.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/vbo/vbo_exec_array.c b/src/mesa/vbo/vbo_exec_array.c
index 46543f8ab00..b5ed210f668 100644
--- a/src/mesa/vbo/vbo_exec_array.c
+++ b/src/mesa/vbo/vbo_exec_array.c
@@ -54,7 +54,7 @@ check_array_data(struct gl_context *ctx, struct gl_vertex_array_object *vao,
const struct gl_vertex_attrib_array *array = &vao->VertexAttrib[attrib];
if (array->Enabled) {
const struct gl_vertex_buffer_binding *binding =
- &vao->VertexBinding[array->VertexBinding];
+ &vao->VertexBinding[array->BufferBindingIndex];
struct gl_buffer_object *bo = binding->BufferObj;
const void *data = array->Ptr;
if (_mesa_is_bufferobj(bo)) {
@@ -106,7 +106,7 @@ unmap_array_buffer(struct gl_context *ctx, struct gl_vertex_array_object *vao,
const struct gl_vertex_attrib_array *array = &vao->VertexAttrib[attrib];
if (array->Enabled) {
const struct gl_vertex_buffer_binding *binding =
- &vao->VertexBinding[array->VertexBinding];
+ &vao->VertexBinding[array->BufferBindingIndex];
struct gl_buffer_object *bo = binding->BufferObj;
if (_mesa_is_bufferobj(bo) && _mesa_bufferobj_mapped(bo, MAP_INTERNAL)) {
ctx->Driver.UnmapBuffer(ctx, bo, MAP_INTERNAL);
@@ -201,7 +201,7 @@ print_draw_arrays(struct gl_context *ctx,
continue;
const struct gl_vertex_buffer_binding *binding =
- &vao->VertexBinding[array->VertexBinding];
+ &vao->VertexBinding[array->BufferBindingIndex];
struct gl_buffer_object *bufObj = binding->BufferObj;
printf("attr %s: size %d stride %d enabled %d "