diff options
| author | Tobias Klausmann <tobias.johannes.klausmann@mni.thm.de> | 2014-06-04 00:35:47 +0200 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2014-06-06 18:14:22 -0700 |
| commit | 203bc289a0aa7e78eaa8ea40ed7dcb84dc4d87b2 (patch) | |
| tree | ea77b8d47d2b59d92ef3a7f006a2c29d8523e7cd /src/gallium | |
| parent | 11b3011805a5f1d59ea8a025313d109bf25f50c4 (diff) | |
nv50/ir: clear subop when folding constant expressions
Some operations (e.g. OP_MUL/OP_MAD/OP_EXTBF) might have a subop set.
After folding, make sure that it is cleared
Signed-off-by: Tobias Klausmann <tobias.johannes.klausmann@mni.thm.de>
Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
Cc: "10.1 10.2" <mesa-stable@lists.freedesktop.org>
(cherry picked from commit 3164bfc73418e2e046c7a750eaac8a6d66dfe02d)
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp index 31f85583cdd..6e5b66c3bca 100644 --- a/src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp @@ -563,6 +563,7 @@ ConstantFolding::expr(Instruction *i, } else { i->op = i->saturate ? OP_SAT : OP_MOV; /* SAT handled by unary() */ } + i->subOp = 0; } void |