summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChristoph Bumiller <[email protected]>2012-05-05 16:35:49 +0200
committerChristoph Bumiller <[email protected]>2012-05-06 22:03:06 +0200
commit28d6a268af3587cedb6a0e9deee7a98ecc8f82ba (patch)
tree20d68860b43cd72f71159033c0dd69c6e4163f6a /src
parent38a20281fcc2ed244aea0aaa268035533f48a183 (diff)
nv50/ir/opt: don't lose saturation in tryCollapseChainedMULs
Diffstat (limited to 'src')
-rw-r--r--src/gallium/drivers/nv50/codegen/nv50_ir_peephole.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gallium/drivers/nv50/codegen/nv50_ir_peephole.cpp b/src/gallium/drivers/nv50/codegen/nv50_ir_peephole.cpp
index db5195cd582..10382d9cac6 100644
--- a/src/gallium/drivers/nv50/codegen/nv50_ir_peephole.cpp
+++ b/src/gallium/drivers/nv50/codegen/nv50_ir_peephole.cpp
@@ -564,7 +564,7 @@ ConstantFolding::tryCollapseChainedMULs(Instruction *mul2,
insn = mul2->getSrc(t)->getInsn();
if (!mul2->src(t).mod && insn->op == OP_MUL && insn->dType == TYPE_F32)
mul1 = insn;
- if (mul1) {
+ if (mul1 && !mul1->saturate) {
int s1;
if (mul1->src(s1 = 0).getImmediate(imm1) ||
@@ -584,10 +584,11 @@ ConstantFolding::tryCollapseChainedMULs(Instruction *mul2,
if (f < 0)
mul1->src(0).mod *= Modifier(NV50_IR_MOD_NEG);
}
+ mul1->saturate = mul2->saturate;
return;
}
}
- if (mul2->getDef(0)->refCount() == 1) {
+ if (mul2->getDef(0)->refCount() == 1 && !mul2->saturate) {
// b = mul a, imm
// d = mul b, c -> d = mul_x_imm a, c
int s2, t2;