Module: Mesa
Branch: master
Commit: ce193d4f01baa7f88692164f5673606de162f483
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=ce193d4f01baa7f88692164f5673606de162f483
Author: Brian Paul <bri...@vmware.com>
Date: Mon Nov 11 15:06:13 2013 -0700
mesa: call update_array_format() after error checking
We try to do all error checking before changing any GL state.
Cc: "10.0" <mesa-sta...@lists.freedesktop.org>
Jordan Justen <jordan.l.jus...@intel.com>
---
src/mesa/main/varray.c | 10 +++++-----
1 files 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);
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
