Mesa (r6xx-rewrite): Fix color data can't be fetched issue

Cooper Yuan cooperyuan at kemper.freedesktop.org
Thu Jun 25 11:50:03 UTC 2009


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

Author: Cooper Yuan <cooperyuan at gmail.com>
Date:   Thu Jun 25 19:48:43 2009 +0800

Fix color data can't be fetched issue

---

 src/mesa/drivers/dri/r600/r600_cmdbuf.c |    2 +-
 src/mesa/drivers/dri/r600/r700_clear.c  |    3 ---
 2 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/src/mesa/drivers/dri/r600/r600_cmdbuf.c b/src/mesa/drivers/dri/r600/r600_cmdbuf.c
index 5edc42b..90f546e 100644
--- a/src/mesa/drivers/dri/r600/r600_cmdbuf.c
+++ b/src/mesa/drivers/dri/r600/r600_cmdbuf.c
@@ -288,7 +288,7 @@ restart:
                         relocs[i].base.bo, soffset, eoffset);
                 return r;
             }
-            asicoffset = cs->packets[relocs[i].indices[j]] + soffset;
+            asicoffset = soffset;
             if (asicoffset >= eoffset) 
             {
 	      /*                radeon_bo_debug(relocs[i].base.bo, 12); */
diff --git a/src/mesa/drivers/dri/r600/r700_clear.c b/src/mesa/drivers/dri/r600/r700_clear.c
index f142aaf..b04441d 100644
--- a/src/mesa/drivers/dri/r600/r700_clear.c
+++ b/src/mesa/drivers/dri/r600/r700_clear.c
@@ -63,9 +63,6 @@ void r700Clear(GLcontext * ctx, GLbitfield mask)
     int i;
     struct gl_framebuffer *fb = ctx->DrawBuffer;
 
-    /* XXX FIXME */
-    return;
-
     if( GL_TRUE == r700ClearFast(context, mask) )
     {
         return;




More information about the mesa-commit mailing list