[Mesa-dev] [PATCH 5/7] mesa: check for no state change in VertexAttribDivisor()

[Jose Fonseca]

Looks good to me.

Jose

----- Original Message -----
> From: Brian Paul <brianp 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));
> +   }
>  }
>  
>  
> --
> 1.7.1
> 
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
>