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 32da40661b4fccd42e8df5a9f152114e1553ba28..3bc84d862d3dcd691647f4f1e6a2601450396afd 100644 (file)
--- 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);