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 <mathias.froehlich@web.de>

1 files changed, 10 insertions, 10 deletions

diff --git a/src/mesa/main/api_arrayelt.c b/src/mesa/main/api_arrayelt.c
index 15fbb8c..cc7dee3 100644
--- a/src/mesa/main/api_arrayelt.c
+++ b/src/mesa/main/api_arrayelt.c
@@ -1566,7 +1566,7 @@ _ae_update_state(struct gl_context *ctx)
    /* conventional vertex arrays */
    if (vao->VertexAttrib[VERT_ATTRIB_COLOR_INDEX].Enabled) {
       aa->array = &vao->VertexAttrib[VERT_ATTRIB_COLOR_INDEX];
-      aa->binding = &vao->VertexBinding[aa->array->VertexBinding];
+      aa->binding = &vao->VertexBinding[aa->array->BufferBindingIndex];
       aa->offset = IndexFuncs[TYPE_IDX(aa->array->Type)];
       check_vbo(actx, aa->binding->BufferObj);
       aa++;
@@ -1574,7 +1574,7 @@ _ae_update_state(struct gl_context *ctx)
 
    if (vao->VertexAttrib[VERT_ATTRIB_EDGEFLAG].Enabled) {
       aa->array = &vao->VertexAttrib[VERT_ATTRIB_EDGEFLAG];
-      aa->binding = &vao->VertexBinding[aa->array->VertexBinding];
+      aa->binding = &vao->VertexBinding[aa->array->BufferBindingIndex];
       aa->offset = _gloffset_EdgeFlagv;
       check_vbo(actx, aa->binding->BufferObj);
       aa++;
@@ -1582,7 +1582,7 @@ _ae_update_state(struct gl_context *ctx)
 
    if (vao->VertexAttrib[VERT_ATTRIB_NORMAL].Enabled) {
       aa->array = &vao->VertexAttrib[VERT_ATTRIB_NORMAL];
-      aa->binding = &vao->VertexBinding[aa->array->VertexBinding];
+      aa->binding = &vao->VertexBinding[aa->array->BufferBindingIndex];
       aa->offset = NormalFuncs[TYPE_IDX(aa->array->Type)];
       check_vbo(actx, aa->binding->BufferObj);
       aa++;
@@ -1590,7 +1590,7 @@ _ae_update_state(struct gl_context *ctx)
 
    if (vao->VertexAttrib[VERT_ATTRIB_COLOR0].Enabled) {
       aa->array = &vao->VertexAttrib[VERT_ATTRIB_COLOR0];
-      aa->binding = &vao->VertexBinding[aa->array->VertexBinding];
+      aa->binding = &vao->VertexBinding[aa->array->BufferBindingIndex];
       aa->offset = ColorFuncs[aa->array->Size-3][TYPE_IDX(aa->array->Type)];
       check_vbo(actx, aa->binding->BufferObj);
       aa++;
@@ -1598,7 +1598,7 @@ _ae_update_state(struct gl_context *ctx)
 
    if (vao->VertexAttrib[VERT_ATTRIB_COLOR1].Enabled) {
       aa->array = &vao->VertexAttrib[VERT_ATTRIB_COLOR1];
-      aa->binding = &vao->VertexBinding[aa->array->VertexBinding];
+      aa->binding = &vao->VertexBinding[aa->array->BufferBindingIndex];
       aa->offset = SecondaryColorFuncs[TYPE_IDX(aa->array->Type)];
       check_vbo(actx, aa->binding->BufferObj);
       aa++;
@@ -1606,7 +1606,7 @@ _ae_update_state(struct gl_context *ctx)
 
    if (vao->VertexAttrib[VERT_ATTRIB_FOG].Enabled) {
       aa->array = &vao->VertexAttrib[VERT_ATTRIB_FOG];
-      aa->binding = &vao->VertexBinding[aa->array->VertexBinding];
+      aa->binding = &vao->VertexBinding[aa->array->BufferBindingIndex];
       aa->offset = FogCoordFuncs[TYPE_IDX(aa->array->Type)];
       check_vbo(actx, aa->binding->BufferObj);
       aa++;
@@ -1620,7 +1620,7 @@ _ae_update_state(struct gl_context *ctx)
           * If we ever remove GL_NV_vertex_program this will have to change.
           */
          at->array = attribArray;
-         at->binding = &vao->VertexBinding[attribArray->VertexBinding];
+         at->binding = &vao->VertexBinding[attribArray->BufferBindingIndex];
          assert(!at->array->Normalized);
          at->func = AttribFuncsNV[at->array->Normalized]
                                  [at->array->Size-1]
@@ -1638,7 +1638,7 @@ _ae_update_state(struct gl_context *ctx)
       if (attribArray->Enabled) {
          GLint intOrNorm;
          at->array = attribArray;
-         at->binding = &vao->VertexBinding[attribArray->VertexBinding];
+         at->binding = &vao->VertexBinding[attribArray->BufferBindingIndex];
          /* Note: we can't grab the _glapi_Dispatch->VertexAttrib1fvNV
           * function pointer here (for float arrays) since the pointer may
           * change from one execution of _ae_ArrayElement() to
@@ -1669,7 +1669,7 @@ _ae_update_state(struct gl_context *ctx)
        * issued as the last (provoking) attribute).
        */
       aa->array = &vao->VertexAttrib[VERT_ATTRIB_GENERIC0];
-      aa->binding = &vao->VertexBinding[aa->array->VertexBinding];
+      aa->binding = &vao->VertexBinding[aa->array->BufferBindingIndex];
       assert(aa->array->Size >= 2); /* XXX fix someday? */
       aa->offset = VertexFuncs[aa->array->Size-2][TYPE_IDX(aa->array->Type)];
       check_vbo(actx, aa->binding->BufferObj);
@@ -1677,7 +1677,7 @@ _ae_update_state(struct gl_context *ctx)
    }
    else if (vao->VertexAttrib[VERT_ATTRIB_POS].Enabled) {
       aa->array = &vao->VertexAttrib[VERT_ATTRIB_POS];
-      aa->binding = &vao->VertexBinding[aa->array->VertexBinding];
+      aa->binding = &vao->VertexBinding[aa->array->BufferBindingIndex];
       aa->offset = VertexFuncs[aa->array->Size-2][TYPE_IDX(aa->array->Type)];
       check_vbo(actx, aa->binding->BufferObj);
       aa++;