From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Fri, 16 May 2008 21:23:04 +0000 (-0600)
Subject: fix an attr/src mix-up when setting-up/binding vertex arrays
X-Git-Tag: 062012170305~18655
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a2e6beade196aef269bda6bb3efb68809f85a683;p=profile%2Fivi%2Fmesa.git

fix an attr/src mix-up when setting-up/binding vertex arrays

This fixes problems with incorrect material coefficients when glMaterial
is called per-vertex.
---

diff --git a/src/mesa/vbo/vbo_exec_draw.c b/src/mesa/vbo/vbo_exec_draw.c
index 0ef26cd..68ce7ba 100644
--- a/src/mesa/vbo/vbo_exec_draw.c
+++ b/src/mesa/vbo/vbo_exec_draw.c
@@ -187,7 +187,7 @@ static void vbo_exec_bind_arrays( GLcontext *ctx )
 	 arrays[attr].BufferObj = exec->vtx.bufferobj; /* NullBufferObj */
 	 arrays[attr]._MaxElement = count; /* ??? */
 
-	 data += exec->vtx.attrsz[attr] * sizeof(GLfloat);
+	 data += exec->vtx.attrsz[src] * sizeof(GLfloat);
       }
    }
 }
diff --git a/src/mesa/vbo/vbo_save_draw.c b/src/mesa/vbo/vbo_save_draw.c
index ee6df22..bf5c6d4 100644
--- a/src/mesa/vbo/vbo_save_draw.c
+++ b/src/mesa/vbo/vbo_save_draw.c
@@ -146,7 +146,7 @@ static void vbo_bind_vertex_list( GLcontext *ctx,
 	 
 	 assert(arrays[attr].BufferObj->Name);
 
-	 data += node->attrsz[attr] * sizeof(GLfloat);
+	 data += node->attrsz[src] * sizeof(GLfloat);
       }
    }
 }