nir/lower_flatshade: fix with lowered io

Acked-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28463>
This commit is contained in:
Mike Blumenkrantz 2024-03-18 12:54:33 -04:00 committed by Marge Bot
parent 712bf98dd8
commit 842ac5059a

View file

@ -42,13 +42,39 @@ lower_input(nir_shader *shader, nir_variable *var)
return true;
}
static bool
lower_input_io(nir_builder *b, nir_intrinsic_instr *intr, void *data)
{
if (intr->intrinsic != nir_intrinsic_load_interpolated_input)
return false;;
nir_io_semantics sem = nir_intrinsic_io_semantics(intr);
if (!check_location(sem.location))
return false;
nir_def *interp = intr->src[0].ssa;
nir_intrinsic_instr *interp_intr = nir_instr_as_intrinsic(interp->parent_instr);
if (nir_intrinsic_interp_mode(interp_intr) != INTERP_MODE_NONE)
return false;
b->cursor = nir_before_instr(&intr->instr);
nir_def *load = nir_load_input(b, intr->num_components,
intr->def.bit_size, intr->src[1].ssa);
nir_intrinsic_instr *new_intr = nir_instr_as_intrinsic(load->parent_instr);
nir_intrinsic_copy_const_indices(new_intr, intr);
nir_def_rewrite_uses(&intr->def, load);
nir_instr_remove(&intr->instr);
return true;
}
bool
nir_lower_flatshade(nir_shader *shader)
{
bool progress = false;
nir_foreach_shader_in_variable(var, shader) {
progress |= lower_input(shader, var);
if (shader->info.io_lowered) {
progress = nir_shader_intrinsics_pass(shader, lower_input_io,
nir_metadata_all, NULL);
} else {
nir_foreach_shader_in_variable(var, shader) {
progress |= lower_input(shader, var);
}
}
/* Interpolation doesn't affect any metadata */