[Mesa-dev] [PATCH 2/3] nv50/ir: clean up src2 in ConstantFolding

Karol Herbst kherbst at redhat.com
Thu Jun 21 23:14:28 UTC 2018


Fixes a crash triggered by the next patch.

no changes in shader-db

Signed-off-by: Karol Herbst <kherbst at redhat.com>
---
 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 32c6f9ee7af..3a4d7e27ef7 100644
--- a/src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp
+++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp
@@ -730,6 +730,7 @@ ConstantFolding::expr(Instruction *i,
       i->op = i->saturate ? OP_SAT : OP_MOV;
       if (i->saturate)
          unary(i, *i->getSrc(0)->asImm());
+      i->setSrc(2, NULL);
       break;
    }
    i->subOp = 0;
-- 
2.17.1



More information about the mesa-dev mailing list