diff options
| author | Roy Spliet <[email protected]> | 2015-01-05 00:22:17 +0100 |
|---|---|---|
| committer | Ilia Mirkin <[email protected]> | 2015-01-05 00:34:33 -0500 |
| commit | 44673512a84c0897c8eddabf4a56e79b7d5b3395 (patch) | |
| tree | ec479f02b1c91ddd21c01c92181580fa93b55c8c | |
| parent | ec3e1e61948d40927ebfe1fbd8efcab525647af0 (diff) | |
nv50/ir: Add sat modifier for mul
Signed-off-by: Roy Spliet <[email protected]>
Reviewed-by: Ilia Mirkin <[email protected]>
| -rw-r--r-- | src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nv50.cpp | 6 | ||||
| -rw-r--r-- | src/gallium/drivers/nouveau/codegen/nv50_ir_target_nv50.cpp | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nv50.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nv50.cpp index 3048f3d5f7f..20773884ad3 100644 --- a/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nv50.cpp +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nv50.cpp @@ -1059,16 +1059,22 @@ CodeEmitterNV50::emitFMUL(const Instruction *i) emitForm_IMM(i); if (neg) code[0] |= 0x8000; + if (i->saturate) + code[0] |= 1 << 8; } else if (i->encSize == 8) { code[1] = i->rnd == ROUND_Z ? 0x0000c000 : 0; if (neg) code[1] |= 0x08000000; + if (i->saturate) + code[1] |= 1 << 20; emitForm_MAD(i); } else { emitForm_MUL(i); if (neg) code[0] |= 0x8000; + if (i->saturate) + code[0] |= 1 << 8; } } diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nv50.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nv50.cpp index 36942091112..c13c565fa43 100644 --- a/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nv50.cpp +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nv50.cpp @@ -84,7 +84,7 @@ static const struct opProperties _initProps[] = // neg abs not sat c[] s[], a[], imm { OP_ADD, 0x3, 0x0, 0x0, 0x8, 0x2, 0x1, 0x1, 0x2 }, { OP_SUB, 0x3, 0x0, 0x0, 0x0, 0x2, 0x1, 0x1, 0x2 }, - { OP_MUL, 0x3, 0x0, 0x0, 0x0, 0x2, 0x1, 0x1, 0x2 }, + { OP_MUL, 0x3, 0x0, 0x0, 0x8, 0x2, 0x1, 0x1, 0x2 }, { OP_MAX, 0x3, 0x3, 0x0, 0x0, 0x2, 0x1, 0x1, 0x0 }, { OP_MIN, 0x3, 0x3, 0x0, 0x0, 0x2, 0x1, 0x1, 0x0 }, { OP_MAD, 0x7, 0x0, 0x0, 0x8, 0x6, 0x1, 0x1, 0x0 }, // special constraint |