[Mesa-stable] [Mesa-dev] [PATCH 3/3] mesa: call update_array_format() after error checking

[Jordan Justen]

Series Reviewed-by: Jordan Justen <jordan.l.justen at intel.com>

On Tue, Nov 12, 2013 at 7:57 AM, Brian Paul <brianp at vmware.com> wrote:
> We try to do all error checking before changing any GL state.
>
> Cc: "10.0" <mesa-stable at lists.freedesktop.org>
> ---
>  src/mesa/main/varray.c |   10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c
> index d17d698..0f38270 100644
> --- a/src/mesa/main/varray.c
> +++ b/src/mesa/main/varray.c
> @@ -390,11 +390,6 @@ update_array(struct gl_context *ctx,
>        return;
>     }
>
> -   if (!update_array_format(ctx, func, attrib, legalTypesMask, sizeMin, sizeMax,
> -                            size, type, normalized, integer, 0)) {
> -      return;
> -   }
> -
>     if (stride < 0) {
>        _mesa_error( ctx, GL_INVALID_VALUE, "%s(stride=%d)", func, stride );
>        return;
> @@ -418,6 +413,11 @@ update_array(struct gl_context *ctx,
>        return;
>     }
>
> +   if (!update_array_format(ctx, func, attrib, legalTypesMask, sizeMin,
> +                            sizeMax, size, type, normalized, integer, 0)) {
> +      return;
> +   }
> +
>     /* Reset the vertex attrib binding */
>     vertex_attrib_binding(ctx, attrib, attrib);
>
> --
> 1.7.10.4
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev