Mesa (10.1): nv50/ir: clear subop when folding constant expressions

[Carl Worth]

Module: Mesa
Branch: 10.1
Commit: f9b645798606000846d15cc6dbfaf3e6d8973e0c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f9b645798606000846d15cc6dbfaf3e6d8973e0c

Author: Tobias Klausmann <tobias.johannes.klausmann at mni.thm.de>
Date:   Wed Jun  4 00:35:47 2014 +0200

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 at mni.thm.de>
Reviewed-by: Ilia Mirkin <imirkin at alum.mit.edu>
Cc: "10.1 10.2" <mesa-stable at lists.freedesktop.org>

(cherry picked from commit 3164bfc73418e2e046c7a750eaac8a6d66dfe02d)

---

 src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp |    1 +
 1 file changed, 1 insertion(+)

diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp
index 1ea278b..fde5616 100644
--- a/src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp
+++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp
@@ -535,6 +535,7 @@ ConstantFolding::expr(Instruction *i,
    } else {
       i->op = OP_MOV;
    }
+   i->subOp = 0;
 }
 
 void