Revert "r600: fix dst reg indexing"

This reverts commit cc893d9a98255d3c26df7123ba5cc02e478c9328.

Richard has the proper fix.

diff --git a/src/mesa/drivers/dri/r600/r700_assembler.c b/src/mesa/drivers/dri/r600/r700_assembler.c
index 2d40dfa708e2ae6da64602d616cfb1a501a116c4..1d41c5cf785b409ca07bd615e6dce7b38dd5a290 100644 (file)
--- a/src/mesa/drivers/dri/r600/r700_assembler.c
+++ b/src/mesa/drivers/dri/r600/r700_assembler.c
@@ -2193,7 +2193,6 @@ GLboolean assemble_alu_instruction(r700_AssemblerBase *pAsm)
 GLboolean next_ins(r700_AssemblerBase *pAsm)
 {
     struct prog_instruction *pILInst = &(pAsm->pILInst[pAsm->uiCurInst]);
-    uint index;
 
     if( GL_TRUE == IsTex(pILInst->Opcode) )
     {
@@ -2214,20 +2213,14 @@ GLboolean next_ins(r700_AssemblerBase *pAsm)
       
     if(pAsm->D.dst.rtype == DST_REG_OUT) 
     {
-           if (pAsm->starting_export_register_number >= pAsm->D.dst.reg) {
-                   index = 0;
-           } else {
-                   index = pAsm->D.dst.reg - pAsm->starting_export_register_number;
-           }
-
         if(pAsm->D.dst.op3) 
         {        
             // There is no mask for OP3 instructions, so all channels are written        
-            pAsm->pucOutMask[index] = 0xF;
+            pAsm->pucOutMask[pAsm->D.dst.reg - pAsm->starting_export_register_number] = 0xF;
         }
         else 
         {
-            pAsm->pucOutMask[index]
+            pAsm->pucOutMask[pAsm->D.dst.reg - pAsm->starting_export_register_number] 
                |= (unsigned char)pAsm->pILInst[pAsm->uiCurInst].DstReg.WriteMask;
         }
     }