KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nir/copy_propagate: Don't cause size mismatches on phi node sources 

Reviewed-by: Connor Abbott <cwabbott0@gmail.com>
This commit is contained in:
Jason Ekstrand 2014-11-24 22:42:16 -08:00
parent 6a52d2af2f
commit 24249599b1
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/glsl/nir/nir_opt_copy_propagate.c
View File

@ -157,6 +157,18 @@ copy_prop_src(nir_src *src, nir_instr *parent_instr, nir_if *parent_if)
if (!is_swizzleless_move(alu_instr))
return false;
/* Don't let copy propagation land us with a phi that has more
* components in its source than it has in its destination. That badly
* messes up out-of-ssa.
*/
if (parent_instr && parent_instr->type == nir_instr_type_phi) {
nir_phi_instr *phi = nir_instr_as_phi(parent_instr);
assert(phi->dest.is_ssa);
if (phi->dest.ssa.num_components !=
alu_instr->src[0].src.ssa->num_components)
return false;
}
if (parent_instr)
rewrite_src_instr(src, alu_instr->src[0].src.ssa, parent_instr);
else