summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorFredrik Höglund <[email protected]>2015-03-02 18:50:49 +0100
committerFredrik Höglund <[email protected]>2015-05-08 15:31:03 +0200
commitf2ef09d44adc4a00ed6ae18377c588320022d284 (patch)
tree48df590590ff2b30d04968c7a8761538f946409f /src/mesa
parentdc2eaaf912c342ee85c88dcc467a3c59875af874 (diff)
mesa: Add a vao parameter to vertex_binding_divisor
This is needed to implement VertexArrayBindingDivisor. Reviewed-by: Laura Ekstrand <[email protected]>
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/main/varray.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c
index 0cfa948a053..90d5bcbcb90 100644
--- a/src/mesa/main/varray.c
+++ b/src/mesa/main/varray.c
@@ -184,10 +184,11 @@ bind_vertex_buffer(struct gl_context *ctx,
* given by bindingIndex.
*/
static void
-vertex_binding_divisor(struct gl_context *ctx, GLuint bindingIndex,
+vertex_binding_divisor(struct gl_context *ctx,
+ struct gl_vertex_array_object *vao,
+ GLuint bindingIndex,
GLuint divisor)
{
- struct gl_vertex_array_object *vao = ctx->Array.VAO;
struct gl_vertex_buffer_binding *binding =
&vao->VertexBinding[bindingIndex];
@@ -1474,7 +1475,7 @@ _mesa_VertexAttribDivisor(GLuint index, GLuint divisor)
* VertexBindingDivisor(index, divisor);"
*/
vertex_attrib_binding(ctx, vao, genericIndex, genericIndex);
- vertex_binding_divisor(ctx, genericIndex, divisor);
+ vertex_binding_divisor(ctx, vao, genericIndex, divisor);
}
@@ -2076,7 +2077,8 @@ _mesa_VertexBindingDivisor(GLuint bindingIndex, GLuint divisor)
return;
}
- vertex_binding_divisor(ctx, VERT_ATTRIB_GENERIC(bindingIndex), divisor);
+ vertex_binding_divisor(ctx, ctx->Array.VAO,
+ VERT_ATTRIB_GENERIC(bindingIndex), divisor);
}