mesa: Branch 'master'

[Nan hai Zou]

 src/mesa/vbo/vbo_exec_array.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

New commits:
diff-tree fcccf8943213a20957f305161e8aae7fef55baab (from 421ce180f52ff55b866066fabd861a51dd6d2b26)
Author: Zou Nan hai <nanhai.zou at intel.com>
Date:   Fri Feb 9 13:28:56 2007 +0800

      array overflow fix

diff --git a/src/mesa/vbo/vbo_exec_array.c b/src/mesa/vbo/vbo_exec_array.c
index f96df5f..7ea5547 100644
--- a/src/mesa/vbo/vbo_exec_array.c
+++ b/src/mesa/vbo/vbo_exec_array.c
@@ -147,8 +147,8 @@ static void recalculate_input_bindings( 
       /* Could use just about anything, just to fill in the empty
        * slots:
        */
-      for (i = MAT_ATTRIB_MAX; i < VERT_ATTRIB_MAX; i++)
-	 inputs[i] = &vbo->generic_currval[i - VERT_ATTRIB_GENERIC0];
+      for (i = MAT_ATTRIB_MAX; i < VERT_ATTRIB_MAX - VERT_ATTRIB_GENERIC0; i++)
+	 inputs[VERT_ATTRIB_GENERIC0 + i] = &vbo->generic_currval[i];
 
       break;
    case VP_NV: