More work on the swtcl

2 files changed, 4 insertions, 6 deletions

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_fifo.h b/src/mesa/drivers/dri/nouveau/nouveau_fifo.h
index b738fa8ee1c..da2dadada74 100644
--- a/src/mesa/drivers/dri/nouveau/nouveau_fifo.h
+++ b/src/mesa/drivers/dri/nouveau/nouveau_fifo.h
@@ -60,7 +60,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #define OUT_RINGp(ptr,sz) do {                                                  \
 uint32_t* p=(uint32_t*)ptr;							\
-int i; printf("OUT_RINGp:\n"); for(i=0;i<sz;i++) printf(" 0x%08x\n", *(p+i)); 	\
+int i; printf("OUT_RINGp: (size 0x%x dwords)\n",sz); for(i=0;i<sz;i++) printf(" 0x%08x\n", *(p+i)); 	\
 }while(0)
 
 #define OUT_RING(n) do {                                                        \
@@ -74,8 +74,8 @@ int i; printf("OUT_RINGp:\n"); for(i=0;i<sz;i++) printf(" 0x%08x\n", *(p+i)); 	\
 #else
 
 #define OUT_RINGp(ptr,sz) do{							\
-	memcpy(nmesa->fifo.buffer+nmesa->fifo.current,ptr,sz);			\
-	nmesa->fifo.current+=(sz/4);						\
+	memcpy(nmesa->fifo.buffer+nmesa->fifo.current,ptr,sz*4);		\
+	nmesa->fifo.current+=sz;						\
 }while(0)
 
 #define OUT_RING(n) do {							\
diff --git a/src/mesa/drivers/dri/nouveau/nv10_swtcl.c b/src/mesa/drivers/dri/nouveau/nv10_swtcl.c
index c1348b1363a..48f41cf2fa7 100644
--- a/src/mesa/drivers/dri/nouveau/nv10_swtcl.c
+++ b/src/mesa/drivers/dri/nouveau/nv10_swtcl.c
@@ -549,8 +549,6 @@ static void nv10RenderStart(GLcontext *ctx)
 
 static void nv10RenderFinish(GLcontext *ctx)
 {
-	struct nouveau_context *nmesa = NOUVEAU_CONTEXT(ctx);
-	nv10FinishPrimitive(nmesa);
 }
 
 
@@ -618,7 +616,7 @@ void nv10TriInitFunctions(GLcontext *ctx)
 	tnl->Driver.Render.Interp = _tnl_interp;
 
 	_tnl_init_vertices( ctx, ctx->Const.MaxArrayLockSize + 12, 
-			16 * sizeof(GLfloat) );
+			64 * sizeof(GLfloat) );
 
 	nmesa->verts = (GLubyte *)tnl->clipspace.vertex_buf;
 }