mesa: Branch 'master'

[Ben Skeggs]

 src/mesa/drivers/dri/nouveau/nv10_swtcl.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

New commits:
diff-tree 4b3679c6c5b8b47e8071a253bcea570b91e30b17 (from eab92fcdc23a8a9d333227e4c98e6a33a9cc1183)
Author: Ben Skeggs <darktama at iinet.net.au>
Date:   Tue Feb 6 02:28:55 2007 +1100

    nouveau: OUT_RINGp expects the size in dwords, not bytes.
    
    This fixes the *actual* bug that the previous commit was supposed to fix..

diff --git a/src/mesa/drivers/dri/nouveau/nv10_swtcl.c b/src/mesa/drivers/dri/nouveau/nv10_swtcl.c
index 6f57b77..eec67bd 100644
--- a/src/mesa/drivers/dri/nouveau/nv10_swtcl.c
+++ b/src/mesa/drivers/dri/nouveau/nv10_swtcl.c
@@ -196,9 +196,9 @@ static inline void nv10_render_generic_p
 	GLuint j;
 
 	nv10ExtendPrimitive(nmesa, size_dword);
-	nv10StartPrimitive(nmesa,prim+1,size_dword*count);
+	nv10StartPrimitive(nmesa,prim+1,size_dword);
 	for (j=start; j<count; j++ ) {
-		OUT_RINGp((nouveauVertex*)(vertptr+(elt[j]*vertsize)),vertsize);
+		OUT_RINGp((nouveauVertex*)(vertptr+(elt[j]*vertsize)),vertsize/4);
 	}
 	nv10FinishPrimitive(nmesa);
 }