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

nir/lower_io_to_vector: fix per vertex io handling for arrays 

The pass was processing the per vertex index from the wrong end
of the array deref chain.

Fixes: bcd14756ee ("nir/lower_io_to_vector: add flat mode")

Reviewed-by: Rhys Perry <pendingchaos02@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10798>
This commit is contained in:
Timothy Arceri 2021-05-14 15:31:16 +10:00 committed by Marge Bot
parent aa64342661
commit 8b180ab98b
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/compiler/nir/nir_lower_io_to_vector.c
View File

@ -329,7 +329,7 @@ build_array_deref_of_new_var(nir_builder *b, nir_variable *new_var,
static nir_ssa_def *
build_array_index(nir_builder *b, nir_deref_instr *deref, nir_ssa_def *base,
bool vs_in)
bool vs_in, bool per_vertex)
{
switch (deref->deref_type) {
case nir_deref_type_var:
@ -337,8 +337,13 @@ build_array_index(nir_builder *b, nir_deref_instr *deref, nir_ssa_def *base,
case nir_deref_type_array: {
nir_ssa_def *index = nir_i2i(b, deref->arr.index.ssa,
deref->dest.ssa.bit_size);
if (nir_deref_instr_parent(deref)->deref_type == nir_deref_type_var &&
per_vertex)
return base;
return nir_iadd(
b, build_array_index(b, nir_deref_instr_parent(deref), base, vs_in),
b, build_array_index(b, nir_deref_instr_parent(deref), base, vs_in, per_vertex),
nir_amul_imm(b, index, glsl_count_attribute_slots(deref->type, vs_in)));
}
default:
@ -353,10 +358,16 @@ build_array_deref_of_new_var_flat(nir_shader *shader,
{
nir_deref_instr *deref = nir_build_deref_var(b, new_var);
if (nir_is_arrayed_io(new_var, shader->info.stage)) {
assert(leader->deref_type == nir_deref_type_array);
nir_ssa_def *index = leader->arr.index.ssa;
leader = nir_deref_instr_parent(leader);
bool per_vertex = nir_is_arrayed_io(new_var, shader->info.stage);
if (per_vertex) {
nir_deref_path path;
nir_deref_path_init(&path, leader, NULL);
assert(path.path[0]->deref_type == nir_deref_type_var);
nir_deref_instr *p = path.path[1];
nir_deref_path_finish(&path);
nir_ssa_def *index = p->arr.index.ssa;
deref = nir_build_deref_array(b, deref, index);
}
@ -365,8 +376,8 @@ build_array_deref_of_new_var_flat(nir_shader *shader,
bool vs_in = shader->info.stage == MESA_SHADER_VERTEX &&
new_var->data.mode == nir_var_shader_in;
return nir_build_deref_array(
b, deref, build_array_index(b, leader, nir_imm_int(b, base), vs_in));
return nir_build_deref_array(b, deref,
build_array_index(b, leader, nir_imm_int(b, base), vs_in, per_vertex));
}
static bool