Merge branch 'mesa_7_5_branch'

2009-05-22 14:09:35 -06:00
parent 4b55e36952 1045481dd9
commit fac334e6d3
1 changed files with 2 additions and 2 deletions
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -194,9 +194,9 @@ update_arrays( GLcontext *ctx )

   /* 16..31 */
   if (ctx->VertexProgram._Current) {
-      for (i = VERT_ATTRIB_GENERIC0; i < VERT_ATTRIB_MAX; i++) {
+      for (i = 0; i < Elements(arrayObj->VertexAttrib); i++) {
         if (arrayObj->VertexAttrib[i].Enabled) {
-            min = update_min(min, &arrayObj->VertexAttrib[i]);
+            min = MIN2(min, arrayObj->VertexAttrib[i]._MaxElement);
         }
      }
   }