Module: Mesa Branch: main Commit: ee69c56c8ca99b678258c06748c47cd1d58c6a66 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ee69c56c8ca99b678258c06748c47cd1d58c6a66
Author: Yonggang Luo <[email protected]> Date: Fri Jun 30 04:01:43 2023 +0800 sfn: indent fixes after switch to use nir_foreach_function_impl This is done in separate commit is for easier to review Signed-off-by: Yonggang Luo <[email protected]> Reviewed-by: Gert Wollny <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23960> --- .../drivers/r600/sfn/sfn_nir_lower_64bit.cpp | 86 +++++++++++----------- .../drivers/r600/sfn/sfn_nir_lower_tess_io.cpp | 18 ++--- 2 files changed, 52 insertions(+), 52 deletions(-) diff --git a/src/gallium/drivers/r600/sfn/sfn_nir_lower_64bit.cpp b/src/gallium/drivers/r600/sfn/sfn_nir_lower_64bit.cpp index 3d1e6c4f5be..d74d73afcb0 100644 --- a/src/gallium/drivers/r600/sfn/sfn_nir_lower_64bit.cpp +++ b/src/gallium/drivers/r600/sfn/sfn_nir_lower_64bit.cpp @@ -1066,40 +1066,40 @@ r600_nir_64_to_vec2(nir_shader *sh) vector<nir_instr *> intr64bit; nir_foreach_function_impl(impl, sh) { - nir_foreach_block(block, impl) + nir_foreach_block(block, impl) + { + nir_foreach_instr_safe(instr, block) { - nir_foreach_instr_safe(instr, block) - { - switch (instr->type) { - case nir_instr_type_alu: { + switch (instr->type) { + case nir_instr_type_alu: { + bool success = false; + nir_foreach_src(instr, store_64bit_intr, &success); + if (success) + intr64bit.push_back(instr); + break; + } + case nir_instr_type_intrinsic: { + auto ir = nir_instr_as_intrinsic(instr); + switch (ir->intrinsic) { + case nir_intrinsic_store_output: + case nir_intrinsic_store_global: + case nir_intrinsic_store_ssbo: { bool success = false; nir_foreach_src(instr, store_64bit_intr, &success); - if (success) - intr64bit.push_back(instr); - break; - } - case nir_instr_type_intrinsic: { - auto ir = nir_instr_as_intrinsic(instr); - switch (ir->intrinsic) { - case nir_intrinsic_store_output: - case nir_intrinsic_store_global: - case nir_intrinsic_store_ssbo: { - bool success = false; - nir_foreach_src(instr, store_64bit_intr, &success); - if (success) { - auto wm = nir_intrinsic_write_mask(ir); - nir_intrinsic_set_write_mask(ir, (wm == 1) ? 3 : 0xf); - ir->num_components *= 2; - } - break; - } - default:; + if (success) { + auto wm = nir_intrinsic_write_mask(ir); + nir_intrinsic_set_write_mask(ir, (wm == 1) ? 3 : 0xf); + ir->num_components *= 2; } + break; } default:; } } + default:; + } } + } } bool result = Lower64BitToVec2().run(sh); @@ -1181,27 +1181,27 @@ StoreMerger::collect_stores() unsigned vertex = 0; nir_foreach_function_impl(impl, sh) { - nir_foreach_block(block, impl) + nir_foreach_block(block, impl) + { + nir_foreach_instr_safe(instr, block) { - nir_foreach_instr_safe(instr, block) - { - if (instr->type != nir_instr_type_intrinsic) - continue; - - auto ir = nir_instr_as_intrinsic(instr); - if (ir->intrinsic == nir_intrinsic_emit_vertex || - ir->intrinsic == nir_intrinsic_emit_vertex_with_counter) { - ++vertex; - continue; - } - if (ir->intrinsic != nir_intrinsic_store_output) - continue; - - unsigned index = nir_intrinsic_base(ir) + 64 * vertex + - 8 * 64 * nir_intrinsic_io_semantics(ir).gs_streams; - m_stores[index].push_back(ir); + if (instr->type != nir_instr_type_intrinsic) + continue; + + auto ir = nir_instr_as_intrinsic(instr); + if (ir->intrinsic == nir_intrinsic_emit_vertex || + ir->intrinsic == nir_intrinsic_emit_vertex_with_counter) { + ++vertex; + continue; } + if (ir->intrinsic != nir_intrinsic_store_output) + continue; + + unsigned index = nir_intrinsic_base(ir) + 64 * vertex + + 8 * 64 * nir_intrinsic_io_semantics(ir).gs_streams; + m_stores[index].push_back(ir); } + } } } diff --git a/src/gallium/drivers/r600/sfn/sfn_nir_lower_tess_io.cpp b/src/gallium/drivers/r600/sfn/sfn_nir_lower_tess_io.cpp index 67f99e8eb85..5c7c3e77bda 100644 --- a/src/gallium/drivers/r600/sfn/sfn_nir_lower_tess_io.cpp +++ b/src/gallium/drivers/r600/sfn/sfn_nir_lower_tess_io.cpp @@ -481,19 +481,19 @@ r600_lower_tess_io(nir_shader *shader, enum mesa_prim prim_type) bool progress = false; nir_foreach_function_impl(impl, shader) { - nir_builder b = nir_builder_create(impl); + nir_builder b = nir_builder_create(impl); - nir_foreach_block(block, impl) + nir_foreach_block(block, impl) + { + nir_foreach_instr_safe(instr, block) { - nir_foreach_instr_safe(instr, block) - { - if (instr->type != nir_instr_type_intrinsic) - continue; + if (instr->type != nir_instr_type_intrinsic) + continue; - if (r600_lower_tess_io_filter(instr, shader->info.stage)) - progress |= r600_lower_tess_io_impl(&b, instr, prim_type); - } + if (r600_lower_tess_io_filter(instr, shader->info.stage)) + progress |= r600_lower_tess_io_impl(&b, instr, prim_type); } + } } return progress; }
