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

nir/cse: fix bug with comparing non-per-component sources 

We weren't comparing the right number of components when checking
swizzles. Use nir_ssa_alu_instr_num_src_components() to do the right
thing.

No piglit regressions, and no fixes either.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Jason Ekstrand <jason.ekstrand@intel.com>
Signed-off-by: Connor Abbott <cwabbott0@gmail.com>
This commit is contained in:
Connor Abbott 2015-04-14 15:44:24 -04:00
parent b069f9eafd
commit 47a1b4841d
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/glsl/nir/nir_opt_cse.c
View File

@ -37,20 +37,18 @@ struct cse_state {
}; };
static bool static bool
nir_alu_srcs_equal(nir_alu_src src1, nir_alu_src src2, uint8_t read_mask) nir_alu_srcs_equal(nir_alu_instr *alu1, nir_alu_instr *alu2, unsigned src)
{ {
if (src1.abs != src2.abs || src1.negate != src2.negate) if (alu1->src[src].abs != alu2->src[src].abs ||
alu1->src[src].negate != alu2->src[src].negate)
return false; return false;
for (int i = 0; i < 4; ++i) { for (unsigned i = 0; i < nir_ssa_alu_instr_src_components(alu1, src); i++) {
if (!(read_mask & (1 << i))) if (alu1->src[src].swizzle[i] != alu2->src[src].swizzle[i])
continue;
if (src1.swizzle[i] != src2.swizzle[i])
return false; return false;
} }
return nir_srcs_equal(src1.src, src2.src); return nir_srcs_equal(alu1->src[src].src, alu2->src[src].src);
} }
static bool static bool
@ -74,8 +72,7 @@ nir_instrs_equal(nir_instr *instr1, nir_instr *instr2)
return false; return false;
for (unsigned i = 0; i < nir_op_infos[alu1->op].num_inputs; i++) { for (unsigned i = 0; i < nir_op_infos[alu1->op].num_inputs; i++) {
if (!nir_alu_srcs_equal(alu1->src[i], alu2->src[i], if (!nir_alu_srcs_equal(alu1, alu2, i))
(1 << alu1->dest.dest.ssa.num_components) - 1))
return false; return false;
} }
return true; return true;