mesa: Branch 'master'

[Ben Skeggs]

 src/mesa/drivers/dri/nouveau/nv10_swtcl.c |    9 +++++++++
 1 files changed, 9 insertions(+)

New commits:
diff-tree ea3d11a3d8901d650eb2a858ce30abae2d20d278 (from 8e1c3bd0b4c599bae5b64cd51cec1d74266f30fb)
Author: Ben Skeggs <skeggsb at gmail.com>
Date:   Sat Mar 24 22:22:27 2007 +1100

    nouveau: some swtcl fixes

diff --git a/src/mesa/drivers/dri/nouveau/nv10_swtcl.c b/src/mesa/drivers/dri/nouveau/nv10_swtcl.c
index 32da406..3bc84d8 100644
--- a/src/mesa/drivers/dri/nouveau/nv10_swtcl.c
+++ b/src/mesa/drivers/dri/nouveau/nv10_swtcl.c
@@ -315,6 +315,9 @@ static inline void nv10_render_line(GLco
 	GLuint vertsize = nmesa->vertex_size;
 	GLuint size_dword = vertsize*(2)/4;
 
+	/* OUT_RINGp wants size in DWORDS */
+	vertsize >>= 2;
+
 	nv10ExtendPrimitive(nmesa, size_dword);
 	nv10StartPrimitive(nmesa,GL_LINES+1,size_dword);
 	OUT_RINGp((nouveauVertex*)(vertptr+(v1*vertsize)),vertsize);
@@ -329,6 +332,9 @@ static inline void nv10_render_triangle(
 	GLuint vertsize = nmesa->vertex_size;
 	GLuint size_dword = vertsize*(3)/4;
 
+	/* OUT_RINGp wants size in DWORDS */
+	vertsize >>= 2;
+
 	nv10ExtendPrimitive(nmesa, size_dword);
 	nv10StartPrimitive(nmesa,GL_TRIANGLES+1,size_dword);
 	OUT_RINGp((nouveauVertex*)(vertptr+(v1*vertsize)),vertsize);
@@ -344,6 +350,9 @@ static inline void nv10_render_quad(GLco
 	GLuint vertsize = nmesa->vertex_size;
 	GLuint size_dword = vertsize*(4)/4;
 
+	/* OUT_RINGp wants size in DWORDS */
+	vertsize >>= 2;
+
 	nv10ExtendPrimitive(nmesa, size_dword);
 	nv10StartPrimitive(nmesa,GL_QUADS+1,size_dword);
 	OUT_RINGp((nouveauVertex*)(vertptr+(v1*vertsize)),vertsize);