Mesa (master): mesa/vbo: fix check for zero aliases with 2/10/10/10

[Dave Airlie]

Module: Mesa
Branch: master
Commit: 13c68e1447f90d067462ec4fa3186c5c871a56fe
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=13c68e1447f90d067462ec4fa3186c5c871a56fe

Author: Dave Airlie <airlied at redhat.com>
Date:   Tue May 10 11:06:47 2016 +1000

mesa/vbo: fix check for zero aliases with 2/10/10/10

This fixes:
GL33-CTS.gtf33.GL3Tests.vertex_type_2_10_10_10_rev.vertex_type_2_10_10_10_rev_attrib

Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Cc: mesa-stable at lists.freedesktop.org
Signed-off-by: Dave Airlie <airlied at redhat.com>

---

 src/mesa/vbo/vbo_attrib_tmp.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mesa/vbo/vbo_attrib_tmp.h b/src/mesa/vbo/vbo_attrib_tmp.h
index e73b8fb..ed0b2de 100644
--- a/src/mesa/vbo/vbo_attrib_tmp.h
+++ b/src/mesa/vbo/vbo_attrib_tmp.h
@@ -226,7 +226,7 @@ static inline float conv_i2_to_norm_float(const struct gl_context *ctx, int i2)
    } while(0)
 
 #define ATTR_UI_INDEX(ctx, val, type, normalized, index, arg) do {	\
-      if ((index) == 0) {					\
+      if ((index) == 0 && _mesa_attr_zero_aliases_vertex(ctx)) {	\
 	 ATTR_UI(ctx, val, (type), normalized, 0, (arg));		\
       } else if ((index) < MAX_VERTEX_GENERIC_ATTRIBS) {		\
 	 ATTR_UI(ctx, val, (type), normalized, VBO_ATTRIB_GENERIC0 + (index), (arg)); \