Mesa (master): mesa: check for no state change in VertexAttribDivisor()
Brian Paul
brianp at kemper.freedesktop.org
Wed Feb 29 15:40:29 UTC 2012
Module: Mesa
Branch: master
Commit: 738482eec91f0898749d73bd97c5e864dd36bfb8
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=738482eec91f0898749d73bd97c5e864dd36bfb8
Author: Brian Paul <brianp at vmware.com>
Date: Mon Feb 27 20:28:09 2012 -0700
mesa: check for no state change in VertexAttribDivisor()
Reviewed-by: José Fonseca <jfonseca at vmware.com>
---
src/mesa/main/varray.c | 10 ++++++++--
1 files 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));
+ }
}
More information about the mesa-commit
mailing list