From: Ben Skeggs <skeggsb@gmail.com>
Date: Sat, 24 Mar 2007 11:22:27 +0000 (+1100)
Subject: nouveau: some swtcl fixes
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ea3d11a3d8901d650eb2a858ce30abae2d20d278;p=mesa.git

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 32da40661b4..3bc84d862d3 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(GLcontext *ctx,GLuint v1,GLuint v2)
 	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(GLcontext *ctx,GLuint v1,GLuint v2,GLuin
 	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(GLcontext *ctx,GLuint v1,GLuint v2,GLuint v3
 	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);