Mesa (mesa_7_7_branch): r200: Fix emit size prediction to account elt splitting.

[Pauli Nieminen]

Module: Mesa
Branch: mesa_7_7_branch
Commit: 415d0326bb9eea0d8c2b837ca767dc9b829d917c
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=415d0326bb9eea0d8c2b837ca767dc9b829d917c

Author: Pauli Nieminen <suok...@gmail.com>
Date:   Sun Mar 21 23:23:21 2010 +0200

r200: Fix emit size prediction to account elt splitting.

Emit sizes prediction didn't account for render splitting in
hwtnl path.

---

 src/mesa/drivers/dri/r200/r200_cmdbuf.c |    2 +-
 src/mesa/drivers/dri/r200/r200_tcl.c    |    5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/mesa/drivers/dri/r200/r200_cmdbuf.c 
b/src/mesa/drivers/dri/r200/r200_cmdbuf.c
index 39748a2..6170128 100644
--- a/src/mesa/drivers/dri/r200/r200_cmdbuf.c
+++ b/src/mesa/drivers/dri/r200/r200_cmdbuf.c
@@ -194,7 +194,7 @@ void r200FlushElts(GLcontext *ctx)
      radeonReturnDmaRegion(&rmesa->radeon, R200_ELT_BUF_SZ - elt_used);
 
    if (radeon_is_debug_enabled(RADEON_SYNC, RADEON_CRITICAL)
-       && !rmesa->radeon.radeonScreen->kernel_mm) {
+         && !rmesa->radeon.radeonScreen->kernel_mm) {
       radeon_print(RADEON_SYNC, RADEON_NORMAL, "%s: Syncing\n", __FUNCTION__);
       radeonFinish( rmesa->radeon.glCtx );
    }
diff --git a/src/mesa/drivers/dri/r200/r200_tcl.c 
b/src/mesa/drivers/dri/r200/r200_tcl.c
index 46dce98..be72627 100644
--- a/src/mesa/drivers/dri/r200/r200_tcl.c
+++ b/src/mesa/drivers/dri/r200/r200_tcl.c
@@ -405,8 +405,9 @@ static GLuint r200EnsureEmitSize( GLcontext * ctx , 
GLubyte* vimap_rev )
          rendering code may decide convert to elts.
         In that case we have to make pessimistic prediction.
         and use larger of 2 paths. */
-      const GLuint elts = ELTS_BUFSZ(nr_aos);
-      const GLuint index = INDEX_BUFSZ;
+      const GLuint elt_count =(VB->Primitive[i].count/GET_MAX_HW_ELTS() + 1);
+      const GLuint elts = ELTS_BUFSZ(nr_aos) * elt_count;
+      const GLuint index = INDEX_BUFSZ * elt_count;
       const GLuint vbuf = VBUF_BUFSZ;
       if ( (!VB->Elts && VB->Primitive[i].count >= MAX_CONVERSION_SIZE)
          || vbuf > index + elts)

_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit