From: Richard Li <richardradeon@gmail.com>
Date: Tue, 19 May 2009 14:28:40 +0000 (-0400)
Subject: Fix nop insertion bug. redbook hello can run.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=465588cd0e6451c758a12108787331d03ed52780;p=mesa.git

Fix nop insertion bug. redbook hello can run.
---

diff --git a/src/mesa/drivers/dri/r600/r700_chip.c b/src/mesa/drivers/dri/r600/r700_chip.c
index 1f160364fae..9395bae2964 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 9a7cc000a67..e2571626dc6 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);
 }