mesa: Use VertexArray, not _VertexArray, in array size expressions.
Both sizes are VERT_ATTRIB_MAX, so this has no effect. But it drops a few trivial uses of the derived state. Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Fredrik Höglund <fredrik@kde.org> Reviewed-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
parent
f81052dc9b
commit
23247e8059
|
@ -230,7 +230,7 @@ _mesa_initialize_vao(struct gl_context *ctx,
|
|||
obj->RefCount = 1;
|
||||
|
||||
/* Init the individual arrays */
|
||||
for (i = 0; i < Elements(obj->_VertexAttrib); i++) {
|
||||
for (i = 0; i < Elements(obj->VertexAttrib); i++) {
|
||||
switch (i) {
|
||||
case VERT_ATTRIB_WEIGHT:
|
||||
init_array(ctx, obj, VERT_ATTRIB_WEIGHT, 1, GL_FLOAT);
|
||||
|
|
|
@ -1449,7 +1449,7 @@ copy_array_object(struct gl_context *ctx,
|
|||
/* In theory must be the same anyway, but on recreate make sure it matches */
|
||||
dest->ARBsemantics = src->ARBsemantics;
|
||||
|
||||
for (i = 0; i < Elements(src->_VertexAttrib); i++) {
|
||||
for (i = 0; i < Elements(src->VertexAttrib); i++) {
|
||||
_mesa_copy_client_array(ctx, &dest->_VertexAttrib[i], &src->_VertexAttrib[i]);
|
||||
_mesa_copy_vertex_attrib_array(ctx, &dest->VertexAttrib[i], &src->VertexAttrib[i]);
|
||||
_mesa_copy_vertex_buffer_binding(ctx, &dest->VertexBinding[i], &src->VertexBinding[i]);
|
||||
|
|
|
@ -711,7 +711,7 @@ _mesa_EnableVertexAttribArray(GLuint index)
|
|||
|
||||
vao = ctx->Array.VAO;
|
||||
|
||||
ASSERT(VERT_ATTRIB_GENERIC(index) < Elements(vao->_VertexAttrib));
|
||||
ASSERT(VERT_ATTRIB_GENERIC(index) < Elements(vao->VertexAttrib));
|
||||
|
||||
if (!vao->VertexAttrib[VERT_ATTRIB_GENERIC(index)].Enabled) {
|
||||
/* was disabled, now being enabled */
|
||||
|
@ -737,7 +737,7 @@ _mesa_DisableVertexAttribArray(GLuint index)
|
|||
|
||||
vao = ctx->Array.VAO;
|
||||
|
||||
ASSERT(VERT_ATTRIB_GENERIC(index) < Elements(vao->_VertexAttrib));
|
||||
ASSERT(VERT_ATTRIB_GENERIC(index) < Elements(vao->VertexAttrib));
|
||||
|
||||
if (vao->VertexAttrib[VERT_ATTRIB_GENERIC(index)].Enabled) {
|
||||
/* was enabled, now being disabled */
|
||||
|
@ -831,7 +831,7 @@ get_current_attrib(struct gl_context *ctx, GLuint index, const char *function)
|
|||
return NULL;
|
||||
}
|
||||
|
||||
ASSERT(VERT_ATTRIB_GENERIC(index) < Elements(ctx->Array.VAO->_VertexAttrib));
|
||||
ASSERT(VERT_ATTRIB_GENERIC(index) < Elements(ctx->Array.VAO->VertexAttrib));
|
||||
|
||||
FLUSH_CURRENT(ctx, 0);
|
||||
return ctx->Current.Attrib[VERT_ATTRIB_GENERIC(index)];
|
||||
|
@ -953,7 +953,7 @@ _mesa_GetVertexAttribPointerv(GLuint index, GLenum pname, GLvoid **pointer)
|
|||
return;
|
||||
}
|
||||
|
||||
ASSERT(VERT_ATTRIB_GENERIC(index) < Elements(ctx->Array.VAO->_VertexAttrib));
|
||||
ASSERT(VERT_ATTRIB_GENERIC(index) < Elements(ctx->Array.VAO->VertexAttrib));
|
||||
|
||||
*pointer = (GLvoid *) ctx->Array.VAO->VertexAttrib[VERT_ATTRIB_GENERIC(index)].Ptr;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue