Mesa (r6xx-rewrite): Properly set aos_count

Alex Deucher agd5f at kemper.freedesktop.org
Thu Jun 11 05:58:05 UTC 2009


Module: Mesa
Branch: r6xx-rewrite
Commit: 1d8d4cad6a30b994f5bea6873525966a965c5997
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=1d8d4cad6a30b994f5bea6873525966a965c5997

Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Thu Jun 11 01:54:40 2009 -0400

Properly set aos_count

This is used by radeonReleaseArrays to free AOS.

---

 src/mesa/drivers/dri/r600/r700_chip.c |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/mesa/drivers/dri/r600/r700_chip.c b/src/mesa/drivers/dri/r600/r700_chip.c
index 8e7787e..6e7adf7 100644
--- a/src/mesa/drivers/dri/r600/r700_chip.c
+++ b/src/mesa/drivers/dri/r600/r700_chip.c
@@ -301,7 +301,7 @@ int r700SetupStreams(GLcontext * ctx)
     END_BATCH();
     COMMIT_BATCH();
 
-    //context->aos_count = 0;
+    context->radeon.tcl.aos_count = 0;
 	for(i=0; i<VERT_ATTRIB_MAX; i++)
 	{
 		unBit = 1 << i;
@@ -314,13 +314,15 @@ int r700SetupStreams(GLcontext * ctx)
 					    vb->AttribPtr[i]->stride,
 					    vb->Count);
 
-            /* currently aos are packed */
-            r700SetupVTXConstants(ctx,
-                                 i,
-                                 (void*)(&context->radeon.tcl.aos[i]),
-                                 (unsigned int)vb->AttribPtr[i]->size,
-                                 (unsigned int)(vb->AttribPtr[i]->size * 4),
-                                 (unsigned int)vb->Count);
+			/* currently aos are packed */
+			r700SetupVTXConstants(ctx,
+					      i,
+					      (void*)(&context->radeon.tcl.aos[i]),
+					      (unsigned int)vb->AttribPtr[i]->size,
+					      (unsigned int)(vb->AttribPtr[i]->size * 4),
+					      (unsigned int)vb->Count);
+
+			context->radeon.tcl.aos_count++;
 		}
 	}
 




More information about the mesa-commit mailing list