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

intel/compiler: use nir_shader_instructions_pass in brw_nir_demote_sample_qualifiers 

Changes:
- nir_metadata_preserve(..., nir_metadata_block_index | nir_metadata_dominance)
  is called only when pass makes progress
- nir_metadata_preserve(..., nir_metadata_all) is called when pass doesn't
  make progress
- pass returns true ONLY when it makes progress ("progress" was initialized incorrectly)

Signed-off-by: Marcin Ślusarz <marcin.slusarz@intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13189>
This commit is contained in:
Marcin Ślusarz 2021-08-06 12:56:31 +02:00 committed by Marge Bot
parent ae4be2d7ae
commit 9e22e0838a
1 changed files with 27 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/intel/compiler/brw_fs.cpp
View File

@ -9585,6 +9585,28 @@ brw_nir_move_interpolation_to_top(nir_shader *nir)
return progress;
}
static bool
brw_nir_demote_sample_qualifiers_instr(nir_builder *b,
nir_instr *instr,
UNUSED void *cb_data)
{
if (instr->type != nir_instr_type_intrinsic)
return false;
nir_intrinsic_instr *intrin = nir_instr_as_intrinsic(instr);
if (intrin->intrinsic != nir_intrinsic_load_barycentric_sample &&
intrin->intrinsic != nir_intrinsic_load_barycentric_at_sample)
return false;
b->cursor = nir_before_instr(instr);
nir_ssa_def *centroid =
nir_load_barycentric(b, nir_intrinsic_load_barycentric_centroid,
nir_intrinsic_interp_mode(intrin));
nir_ssa_def_rewrite_uses(&intrin->dest.ssa, centroid);
nir_instr_remove(instr);
return true;
}
/**
* Demote per-sample barycentric intrinsics to centroid.
*
@ -9593,41 +9615,11 @@ brw_nir_move_interpolation_to_top(nir_shader *nir)
bool
brw_nir_demote_sample_qualifiers(nir_shader *nir)
{
bool progress = true;
nir_foreach_function(f, nir) {
if (!f->impl)
continue;
nir_builder b;
nir_builder_init(&b, f->impl);
nir_foreach_block(block, f->impl) {
nir_foreach_instr_safe(instr, block) {
if (instr->type != nir_instr_type_intrinsic)
continue;
nir_intrinsic_instr *intrin = nir_instr_as_intrinsic(instr);
if (intrin->intrinsic != nir_intrinsic_load_barycentric_sample &&
intrin->intrinsic != nir_intrinsic_load_barycentric_at_sample)
continue;
b.cursor = nir_before_instr(instr);
nir_ssa_def *centroid =
nir_load_barycentric(&b, nir_intrinsic_load_barycentric_centroid,
nir_intrinsic_interp_mode(intrin));
nir_ssa_def_rewrite_uses(&intrin->dest.ssa,
centroid);
nir_instr_remove(instr);
progress = true;
}
}
nir_metadata_preserve(f->impl, nir_metadata_block_index |
nir_metadata_dominance);
}
return progress;
return nir_shader_instructions_pass(nir,
brw_nir_demote_sample_qualifiers_instr,
nir_metadata_block_index |
nir_metadata_dominance,
NULL);
}
void