KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mesa: Add a vao parameter to vertex_attrib_binding 

This is needed to implement VertexArrayAttribBinding.

Reviewed-by: Laura Ekstrand <laura@jlekstrand.net>
This commit is contained in:
Fredrik Höglund 2015-03-02 18:46:42 +01:00
parent f0030b0f1f
commit ade0179f77
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/mesa/main/varray.c
View File

@ -128,10 +128,11 @@ type_to_bit(const struct gl_context *ctx, GLenum type)
* Sets the VertexBinding field in the vertex attribute given by attribIndex. * Sets the VertexBinding field in the vertex attribute given by attribIndex.
*/ */
static void static void
vertex_attrib_binding(struct gl_context *ctx, GLuint attribIndex, vertex_attrib_binding(struct gl_context *ctx,
struct gl_vertex_array_object *vao,
GLuint attribIndex,
GLuint bindingIndex) GLuint bindingIndex)
{ {
struct gl_vertex_array_object *vao = ctx->Array.VAO;
struct gl_vertex_attrib_array *array = &vao->VertexAttrib[attribIndex]; struct gl_vertex_attrib_array *array = &vao->VertexAttrib[attribIndex];
if (array->VertexBinding != bindingIndex) { if (array->VertexBinding != bindingIndex) {
@ -480,7 +481,7 @@ update_array(struct gl_context *ctx,
} }
/* Reset the vertex attrib binding */ /* Reset the vertex attrib binding */
vertex_attrib_binding(ctx, attrib, attrib); vertex_attrib_binding(ctx, ctx->Array.VAO, attrib, attrib);
/* The Stride and Ptr fields are not set by update_array_format() */ /* The Stride and Ptr fields are not set by update_array_format() */
array = &ctx->Array.VAO->VertexAttrib[attrib]; array = &ctx->Array.VAO->VertexAttrib[attrib];
@ -1446,6 +1447,7 @@ _mesa_VertexAttribDivisor(GLuint index, GLuint divisor)
GET_CURRENT_CONTEXT(ctx); GET_CURRENT_CONTEXT(ctx);
const GLuint genericIndex = VERT_ATTRIB_GENERIC(index); const GLuint genericIndex = VERT_ATTRIB_GENERIC(index);
struct gl_vertex_array_object * const vao = ctx->Array.VAO;
if (!ctx->Extensions.ARB_instanced_arrays) { if (!ctx->Extensions.ARB_instanced_arrays) {
_mesa_error(ctx, GL_INVALID_OPERATION, "glVertexAttribDivisor()"); _mesa_error(ctx, GL_INVALID_OPERATION, "glVertexAttribDivisor()");
@ -1458,7 +1460,7 @@ _mesa_VertexAttribDivisor(GLuint index, GLuint divisor)
return; return;
} }
assert(genericIndex < ARRAY_SIZE(ctx->Array.VAO->VertexAttrib)); assert(genericIndex < ARRAY_SIZE(vao->VertexAttrib));
/* The ARB_vertex_attrib_binding spec says: /* The ARB_vertex_attrib_binding spec says:
* *
@ -1471,7 +1473,7 @@ _mesa_VertexAttribDivisor(GLuint index, GLuint divisor)
* VertexAttribBinding(index, index); * VertexAttribBinding(index, index);
* VertexBindingDivisor(index, divisor);" * VertexBindingDivisor(index, divisor);"
*/ */
vertex_attrib_binding(ctx, genericIndex, genericIndex); vertex_attrib_binding(ctx, vao, genericIndex, genericIndex);
vertex_binding_divisor(ctx, genericIndex, divisor); vertex_binding_divisor(ctx, genericIndex, divisor);
} }
@ -1999,7 +2001,8 @@ _mesa_VertexAttribBinding(GLuint attribIndex, GLuint bindingIndex)
assert(VERT_ATTRIB_GENERIC(attribIndex) < assert(VERT_ATTRIB_GENERIC(attribIndex) <
ARRAY_SIZE(ctx->Array.VAO->VertexAttrib)); ARRAY_SIZE(ctx->Array.VAO->VertexAttrib));
vertex_attrib_binding(ctx, VERT_ATTRIB_GENERIC(attribIndex), vertex_attrib_binding(ctx, ctx->Array.VAO,
VERT_ATTRIB_GENERIC(attribIndex),
VERT_ATTRIB_GENERIC(bindingIndex)); VERT_ATTRIB_GENERIC(bindingIndex));
} }