i965: Fixup for don't dead-code eliminate instructions that write to the accumulator.

Accidentally pushed an old version of the patch.

v2: Set destination register using brw_null_reg().
Reviewed-by: Paul Berry <stereotype441@gmail.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>

diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp
index b83aca447e58b6d7f35397656f526b261f85d97a..d287bfdbd10264755f65949f95dec6e391239ba3 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_fs.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs.cpp
@@ -1854,8 +1854,7 @@ fs_visitor::dead_code_eliminate()
             case BRW_OPCODE_ADDC:
             case BRW_OPCODE_SUBB:
             case BRW_OPCODE_MACH:
-               inst->dst.file = ARF;
-               inst->dst.reg = BRW_ARF_NULL;
+               inst->dst = fs_reg(retype(brw_null_reg(), inst->dst.type));
                break;
             default:
                inst->remove();

diff --git a/src/mesa/drivers/dri/i965/brw_vec4.cpp b/src/mesa/drivers/dri/i965/brw_vec4.cpp
index 790ff2ebc721518ad67df5ba8f9f83106277aa7a..149a1a0e16519120ee1b5f941870703f3b000900 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_vec4.cpp
+++ b/src/mesa/drivers/dri/i965/brw_vec4.cpp
@@ -322,8 +322,7 @@ vec4_visitor::dead_code_eliminate()
             case BRW_OPCODE_ADDC:
             case BRW_OPCODE_SUBB:
             case BRW_OPCODE_MACH:
-               inst->dst.file = ARF;
-               inst->dst.reg = BRW_ARF_NULL;
+               inst->dst = dst_reg(retype(brw_null_reg(), inst->dst.type));
                break;
             default:
                inst->remove();