diff options
| author | Christoph Bumiller <e0425955@student.tuwien.ac.at> | 2013-06-11 22:57:31 +0200 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2014-05-29 15:16:03 -0700 |
| commit | 4e5296208d6e6da53280b9485a2539d44a592516 (patch) | |
| tree | 1f02858780aad910911b9863b1ea7ef1b930ffac /src | |
| parent | 1ced95268655de46e595c13da6dad03e0b86e009 (diff) | |
nv50/ir/opt: fix constant folding with saturate modifier
Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
Cc: "10.2" <mesa-stable@lists.freedesktop.org>
(cherry picked from commit 3b0867f35b5b294eb0d40524a6bc4c8de888a96f)
Diffstat (limited to 'src')
| -rw-r--r-- | src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp index bb88b18b609..31f85583cdd 100644 --- a/src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp @@ -561,7 +561,7 @@ ConstantFolding::expr(Instruction *i, if (i->src(0).getImmediate(src0)) expr(i, src0, *i->getSrc(1)->asImm()); } else { - i->op = OP_MOV; + i->op = i->saturate ? OP_SAT : OP_MOV; /* SAT handled by unary() */ } } @@ -612,6 +612,7 @@ ConstantFolding::unary(Instruction *i, const ImmediateValue &imm) switch (i->op) { case OP_NEG: res.data.f32 = -imm.reg.data.f32; break; case OP_ABS: res.data.f32 = fabsf(imm.reg.data.f32); break; + case OP_SAT: res.data.f32 = CLAMP(imm.reg.data.f32, 0.0f, 1.0f); break; case OP_RCP: res.data.f32 = 1.0f / imm.reg.data.f32; break; case OP_RSQ: res.data.f32 = 1.0f / sqrtf(imm.reg.data.f32); break; case OP_LG2: res.data.f32 = log2f(imm.reg.data.f32); break; @@ -922,6 +923,7 @@ ConstantFolding::opnd(Instruction *i, ImmediateValue &imm0, int s) case OP_ABS: case OP_NEG: + case OP_SAT: case OP_LG2: case OP_RCP: case OP_SQRT: |