fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-24 05:10:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

radv/nir_apply_pipeline_layout: clean up progress handling

Browse source 
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33770>
This commit is contained in:
Georg Lehmann 2025-02-26 17:22:18 +01:00 • committed by Marge Bot
parent f595bcfe78
commit dec60f3337
1 changed files with 7 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/amd/vulkan/nir/radv_nir_apply_pipeline_layout.c
View file

@ -567,32 +567,24 @@ radv_nir_apply_pipeline_layout(nir_shader *shader, struct radv_device *device, c
.layout = &stage->layout,
};
nir_builder b;
nir_foreach_function (function, shader) {
if (!function->impl)
continue;
b = nir_builder_create(function->impl);
nir_foreach_function_impl (impl, shader) {
bool impl_progress = false;
nir_builder b = nir_builder_create(impl);
/* Iterate in reverse so load_ubo lowering can look at
* the vulkan_resource_index to tell if it's an inline
* ubo.
*/
nir_foreach_block_reverse (block, function->impl) {
nir_foreach_block_reverse (block, impl) {
nir_foreach_instr_reverse_safe (instr, block) {
if (instr->type == nir_instr_type_tex)
progress |= apply_layout_to_tex(&b, &state, nir_instr_as_tex(instr));
impl_progress |= apply_layout_to_tex(&b, &state, nir_instr_as_tex(instr));
else if (instr->type == nir_instr_type_intrinsic)
progress |= apply_layout_to_intrin(&b, &state, nir_instr_as_intrinsic(instr));
impl_progress |= apply_layout_to_intrin(&b, &state, nir_instr_as_intrinsic(instr));
}
}
}
if (progress) {
nir_foreach_function (function, shader) {
nir_progress(true, function->impl, nir_metadata_control_flow);
}
progress |= nir_progress(impl_progress, impl, nir_metadata_control_flow);
}
return progress;