summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/mesa/drivers/dri/i965/brw_fs_copy_propagation.cpp18
1 files changed, 12 insertions, 6 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_fs_copy_propagation.cpp b/src/mesa/drivers/dri/i965/brw_fs_copy_propagation.cpp
index 5dd72559298..68a266c7331 100644
--- a/src/mesa/drivers/dri/i965/brw_fs_copy_propagation.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs_copy_propagation.cpp
@@ -448,16 +448,22 @@ fs_visitor::try_constant_propagate(fs_inst *inst, acp_entry *entry)
(entry->dst.reg_offset + entry->regs_written) * 32)
continue;
- /* Don't bother with cases that should have been taken care of by the
- * GLSL compiler's constant folding pass.
- */
- if (inst->src[i].negate || inst->src[i].abs)
- continue;
-
fs_reg val = entry->src;
val.effective_width = inst->src[i].effective_width;
val.type = inst->src[i].type;
+ if (inst->src[i].abs) {
+ if (!brw_abs_immediate(val.type, &val.fixed_hw_reg)) {
+ continue;
+ }
+ }
+
+ if (inst->src[i].negate) {
+ if (!brw_negate_immediate(val.type, &val.fixed_hw_reg)) {
+ continue;
+ }
+ }
+
switch (inst->opcode) {
case BRW_OPCODE_MOV:
case SHADER_OPCODE_LOAD_PAYLOAD: