X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fvbo%2Fvbo_save_draw.c;h=bbc2d0dfedf30782aa3aae17090c29103b392fae;hb=38b41fd718cfffd11dab637d9d0cbd6c2a30b2c2;hp=486247f744150e318f7f495d742ccad4efb012bb;hpb=f37e29ac224887f1b4f0cb7c61e47fb4bc6671e1;p=mesa.git

diff --git a/src/mesa/vbo/vbo_save_draw.c b/src/mesa/vbo/vbo_save_draw.c
index 486247f7441..bbc2d0dfedf 100644
--- a/src/mesa/vbo/vbo_save_draw.c
+++ b/src/mesa/vbo/vbo_save_draw.c
@@ -151,11 +151,14 @@ bind_vertex_list(struct gl_context *ctx,
    /* Overlay other active attributes */
    switch (get_vp_mode(ctx)) {
    case VP_FF:
-      /* Point the generic attributes at the legacy material values */
-      for (attr = 0; attr < MAT_ATTRIB_MAX; attr++) {
-         save->inputs[VERT_ATTRIB_GENERIC(attr)] =
+      for (attr = 0; attr < VERT_ATTRIB_MAT_MAX; attr++) {
+         save->inputs[VERT_ATTRIB_MAT(attr)] =
             &vbo->currval[VBO_ATTRIB_MAT_FRONT_AMBIENT+attr];
       }
+      for (attr = VERT_ATTRIB_MAT_MAX; attr < VERT_ATTRIB_GENERIC_MAX; attr++) {
+         save->inputs[VERT_ATTRIB_GENERIC(attr)] =
+            &vbo->currval[VBO_ATTRIB_GENERIC0+attr];
+      }
       map = vbo->map_vp_none;
       break;
    case VP_SHADER: