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 1f160364fae338b8fd78fc289c4ad9c5e85f1de7..9395bae2964af486b9c3f5f70f00b7278b687c8a 100644 (file)
--- 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 9a7cc000a67954e1ed85ed5db3d5ef62adbc853a..e2571626dc64057a0fee8e4d53dc18deadd28f11 100644 (file)
--- 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);
 }