summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAlex Deucher <[email protected]>2009-07-21 17:44:36 -0400
committerAlex Deucher <[email protected]>2009-07-21 17:44:36 -0400
commit7edb2a9eef698c386042e6cead68ac516ec15616 (patch)
tree789db99eb640ce941dafc9fbe8bfd2b25da34ac7 /src
parent72a3d8845f55b4a82f7e3734c8b3aa51b65e220d (diff)
Revert "r600: fix dst reg indexing"
This reverts commit cc893d9a98255d3c26df7123ba5cc02e478c9328. Richard has the proper fix.
Diffstat (limited to 'src')
-rw-r--r--src/mesa/drivers/dri/r600/r700_assembler.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/src/mesa/drivers/dri/r600/r700_assembler.c b/src/mesa/drivers/dri/r600/r700_assembler.c
index 2d40dfa708e..1d41c5cf785 100644
--- 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;
}
}