mesa: Use defines for the aliased material array attributes.

[mesa.git] / src / mesa / drivers / dri / nouveau / nouveau_vbo_t.c

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c b/src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c
index fdd135c5d7d1894b2ac98b0e7992f907a45aea0b..b9145e6851ad436f43400a2c9b6339ce11440ba5 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c
@@ -118,8 +118,8 @@ vbo_choose_render_mode(struct gl_context *ctx, const struct gl_vertex_array **ar
        render->mode = VBO;
 
        if (ctx->Light.Enabled) {
-               for (i = 0; i < MAT_ATTRIB_MAX; i++) {
-                       if (arrays[VERT_ATTRIB_GENERIC0 + i]->StrideB) {
+               for (i = 0; i < VERT_ATTRIB_MAT_MAX; i++) {
+                       if (arrays[VERT_ATTRIB_MAT(i)]->StrideB) {
                                render->mode = IMM;
                                break;
                        }
@@ -138,7 +138,7 @@ vbo_emit_attr(struct gl_context *ctx, const struct gl_vertex_array **arrays,
        RENDER_LOCALS(ctx);
 
        if (!array->StrideB) {
-               if (attr >= VERT_ATTRIB_GENERIC0)
+               if (attr >= VERT_ATTRIB_MAT(0))
                        /* nouveau_update_state takes care of materials. */
                        return;
 
@@ -165,7 +165,7 @@ vbo_emit_attr(struct gl_context *ctx, const struct gl_vertex_array **arrays,
        }
 }
 
-#define MAT(a) (VERT_ATTRIB_GENERIC0 + MAT_ATTRIB_##a)
+#define MAT(a) VERT_ATTRIB_MAT(MAT_ATTRIB_##a)
 
 static void
 vbo_choose_attrs(struct gl_context *ctx, const struct gl_vertex_array **arrays)