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

nir: use nir_shader_instructions_pass in nir_lower_samplers

Browse Source 
No functional changes.

Reviewed-by: Alyssa Rosenzweig <alyssa@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12282>
This commit is contained in:
Marcin Ślusarz
2021-08-10 11:15:57 +02:00
committed by Marge Bot
parent 865d959090
commit 9dcff3ea53
1 changed files with 10 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/compiler/nir/nir_lower_samplers.c
View File

@@ -115,8 +115,13 @@ lower_tex_src_to_offset(nir_builder *b,
}
static bool
lower_sampler(nir_builder *b, nir_tex_instr *instr)
lower_sampler(nir_builder *b, nir_instr *instr_, UNUSED void *cb_data)
{
if (instr_->type != nir_instr_type_tex)
return false;
nir_tex_instr *instr = nir_instr_as_tex(instr_);
int texture_idx =
nir_tex_instr_src_index(instr, nir_tex_src_texture_deref);
@@ -139,40 +144,11 @@ lower_sampler(nir_builder *b, nir_tex_instr *instr)
return true;
}
static bool
lower_impl(nir_function_impl *impl)
{
nir_builder b;
nir_builder_init(&b, impl);
bool progress = false;
nir_foreach_block(block, impl) {
nir_foreach_instr(instr, block) {
if (instr->type == nir_instr_type_tex)
progress |= lower_sampler(&b, nir_instr_as_tex(instr));
}
}
if (progress) {
nir_metadata_preserve(impl, nir_metadata_block_index |
nir_metadata_dominance);
} else {
nir_metadata_preserve(impl, nir_metadata_all);
}
return progress;
}
bool
nir_lower_samplers(nir_shader *shader)
{
bool progress = false;
/* Next, lower derefs to offsets. */
nir_foreach_function(function, shader) {
if (function->impl)
progress |= lower_impl(function->impl);
}
return progress;
return nir_shader_instructions_pass(shader, lower_sampler,
nir_metadata_block_index |
nir_metadata_dominance,
NULL);
}