From 738482eec91f0898749d73bd97c5e864dd36bfb8 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Mon, 27 Feb 2012 20:28:09 -0700 Subject: [PATCH] mesa: check for no state change in VertexAttribDivisor() MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Reviewed-by: José Fonseca --- src/mesa/main/varray.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c index 39d3a27..a402c7b 100644 --- a/src/mesa/main/varray.c +++ b/src/mesa/main/varray.c @@ -1117,8 +1117,9 @@ _mesa_PrimitiveRestartIndex(GLuint index) void GLAPIENTRY _mesa_VertexAttribDivisor(GLuint index, GLuint divisor) { + struct gl_client_array *array; GET_CURRENT_CONTEXT(ctx); - ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx); + ASSERT_OUTSIDE_BEGIN_END(ctx); if (!ctx->Extensions.ARB_instanced_arrays) { _mesa_error(ctx, GL_INVALID_OPERATION, "glVertexAttribDivisor()"); @@ -1133,7 +1134,12 @@ _mesa_VertexAttribDivisor(GLuint index, GLuint divisor) ASSERT(VERT_ATTRIB_GENERIC(index) < Elements(ctx->Array.ArrayObj->VertexAttrib)); - ctx->Array.ArrayObj->VertexAttrib[VERT_ATTRIB_GENERIC(index)].InstanceDivisor = divisor; + array = &ctx->Array.ArrayObj->VertexAttrib[VERT_ATTRIB_GENERIC(index)]; + if (array->InstanceDivisor != divisor) { + FLUSH_VERTICES(ctx, _NEW_ARRAY); + array->InstanceDivisor = divisor; + ctx->Array.NewState |= VERT_BIT(VERT_ATTRIB_GENERIC(index)); + } } -- 2.7.4