OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nir/opt_shrink_vectors: fix re-using of components for vecN

Browse Source 
Cc: mesa-stable
Reviewed-by: Emma Anholt <emma@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17276>
This commit is contained in:
Daniel Schürmann
2022-06-28 11:13:54 +02:00
committed by Marge Bot
parent c655387a02
commit 862f1eacb2
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/compiler/nir/nir_opt_shrink_vectors.c
View File

@@ -120,10 +120,12 @@ opt_shrink_vector(nir_builder *b, nir_alu_instr *instr)
if (!((mask >> i) & 0x1)) if (!((mask >> i) & 0x1))
continue; continue;
nir_ssa_scalar scalar = nir_get_ssa_scalar(instr->src[i].src.ssa, instr->src[i].swizzle[0]);
/* Try reuse a component with the same value */ /* Try reuse a component with the same value */
unsigned j; unsigned j;
for (j = 0; j < num_components; j++) { for (j = 0; j < num_components; j++) {
if (nir_alu_srcs_equal(instr, instr, i, j)) { if (scalar.def == srcs[j].def && scalar.comp == srcs[j].comp) {
reswizzle[i] = j; reswizzle[i] = j;
break; break;
} }
@@ -131,7 +133,7 @@ opt_shrink_vector(nir_builder *b, nir_alu_instr *instr)
/* Otherwise, just append the value */ /* Otherwise, just append the value */
if (j == num_components) { if (j == num_components) {
srcs[num_components] = nir_get_ssa_scalar(instr->src[i].src.ssa, instr->src[i].swizzle[0]); srcs[num_components] = scalar;
reswizzle[i] = num_components++; reswizzle[i] = num_components++;
} }
} }