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

nir: More NIR_MAX_VEC_COMPONENTS fixes 

Cc: mesa-stable@lists.freedesktop.org
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6655>
This commit is contained in:
Jesse Natalie 2020-09-08 17:56:54 -07:00 committed by Marge Bot
parent c5dd54e600
commit 89401e5867
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/compiler/nir/nir_builder.h
View File

@ -1026,7 +1026,7 @@ nir_ssa_for_src(nir_builder *build, nir_src src, int num_components)
nir_alu_src alu = { NIR_SRC_INIT };
alu.src = src;
for (int j = 0; j < 4; j++)
for (int j = 0; j < NIR_MAX_VEC_COMPONENTS; j++)
alu.swizzle[j] = j;
return nir_mov_alu(build, alu, num_components);

2
src/compiler/nir/nir_builtin_builder.c
View File

@ -74,6 +74,8 @@ nir_fast_length(nir_builder *b, nir_ssa_def *vec)
case 2: return nir_fsqrt(b, nir_fdot2(b, vec, vec));
case 3: return nir_fsqrt(b, nir_fdot3(b, vec, vec));
case 4: return nir_fsqrt(b, nir_fdot4(b, vec, vec));
case 8: return nir_fsqrt(b, nir_fdot8(b, vec, vec));
case 16: return nir_fsqrt(b, nir_fdot16(b, vec, vec));
default:
unreachable("Invalid number of components");
}

2
src/compiler/nir/nir_lower_io.c
View File

@ -1414,7 +1414,7 @@ nir_lower_explicit_io_instr(nir_builder *b,
if (intrin->intrinsic == nir_intrinsic_load_deref) {
nir_ssa_def *value;
if (vec_stride > scalar_size) {
nir_ssa_def *comps[4] = { NULL, };
nir_ssa_def *comps[NIR_MAX_VEC_COMPONENTS] = { NULL, };
for (unsigned i = 0; i < intrin->num_components; i++) {
unsigned comp_offset = i * vec_stride;
nir_ssa_def *comp_addr = build_addr_iadd_imm(b, addr, addr_format,

2
src/compiler/nir/nir_opt_copy_propagate.c
View File

@ -68,7 +68,7 @@ static bool
is_swizzleless_move(nir_alu_instr *instr)
{
if (is_move(instr)) {
for (unsigned i = 0; i < 4; i++) {
for (unsigned i = 0; i < NIR_MAX_VEC_COMPONENTS; i++) {
if (!((instr->dest.write_mask >> i) & 1))
break;
if (instr->src[0].swizzle[i] != i)