From: Fredrik Höglund Date: Mon, 2 Mar 2015 17:50:49 +0000 (+0100) Subject: mesa: Add a vao parameter to vertex_binding_divisor X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f2ef09d44adc4a00ed6ae18377c588320022d284;p=mesa.git mesa: Add a vao parameter to vertex_binding_divisor This is needed to implement VertexArrayBindingDivisor. Reviewed-by: Laura Ekstrand --- 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); }