From: Brian Paul <brianp@vmware.com>
Date: Mon, 11 Nov 2013 22:06:13 +0000 (-0700)
Subject: mesa: call update_array_format() after error checking
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ce193d4f01baa7f88692164f5673606de162f483;p=mesa.git

mesa: call update_array_format() after error checking

We try to do all error checking before changing any GL state.

Cc: "10.0" <mesa-stable@lists.freedesktop.org>

Jordan Justen <jordan.l.justen@intel.com>
---

diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c
index d17d698d3fb..0f38270d5d9 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);