Mesa (r6xx-rewrite): Fix nop insertion bug. redbook hello can run.

[Richard Li]

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

Author: Richard Li <richardradeon at gmail.com>
Date:   Tue May 19 10:28:40 2009 -0400

Fix nop insertion bug. redbook hello can run.

---

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

diff --git a/src/mesa/drivers/dri/r600/r700_chip.c b/src/mesa/drivers/dri/r600/r700_chip.c
index 1f16036..9395bae 100644
--- a/src/mesa/drivers/dri/r600/r700_chip.c
+++ b/src/mesa/drivers/dri/r600/r700_chip.c
@@ -680,7 +680,7 @@ GLboolean r700SendContextStates(context_t *context, GLboolean bUseStockShader)
         R600_OUT_BATCH_REGSEQ(((pInit->unOffset + ASIC_CONTEXT_BASE_INDEX)<<2), toSend);
         for(ui=0; ui<toSend; ui++)
         {
-            if( GL_FALSE == setRelocReg(context, (pInit->unOffset+ui), bUseStockShader) )
+            if( GL_FALSE == setRelocReg(context, pInit->unOffset, bUseStockShader) )
             {
                 /* for not reloc reg. */
                 R600_OUT_BATCH(*(pInit->puiValue));
diff --git a/src/mesa/drivers/dri/r600/r700_clear.c b/src/mesa/drivers/dri/r600/r700_clear.c
index 9a7cc00..e257162 100644
--- a/src/mesa/drivers/dri/r600/r700_clear.c
+++ b/src/mesa/drivers/dri/r600/r700_clear.c
@@ -262,7 +262,7 @@ void r700Clear(GLcontext * ctx, GLbitfield mask)
         return;
     }
 
-    r700ClearWithDraw(context, mask);
+    //r700ClearWithDraw(context, mask);
 }