From 12a268ea813ba3caaee9cc34d0fe597d66a2d574 Mon Sep 17 00:00:00 2001 From: Konstantin Seurer Date: Tue, 27 Jun 2023 13:03:05 +0200 Subject: [PATCH] microsoft: Use nir_builder_at Acked-by: Alyssa Rosenzweig Part-of: --- src/gallium/drivers/d3d12/d3d12_nir_passes.c | 3 +-- src/microsoft/clc/clc_nir.c | 3 +-- src/microsoft/spirv_to_dxil/dxil_spirv_nir.c | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/gallium/drivers/d3d12/d3d12_nir_passes.c b/src/gallium/drivers/d3d12/d3d12_nir_passes.c index 5e4c7332d46..8d14a8ea38e 100644 --- a/src/gallium/drivers/d3d12/d3d12_nir_passes.c +++ b/src/gallium/drivers/d3d12/d3d12_nir_passes.c @@ -590,8 +590,7 @@ d3d12_add_missing_dual_src_target(struct nir_shader *s, assert(missing_mask != 0); nir_builder b; nir_function_impl *impl = nir_shader_get_entrypoint(s); - b = nir_builder_create(impl); - b.cursor = nir_before_cf_list(&impl->body); + b = nir_builder_at(nir_before_cf_list(&impl->body)); nir_ssa_def *zero = nir_imm_zero(&b, 4, 32); for (unsigned i = 0; i < 2; ++i) { diff --git a/src/microsoft/clc/clc_nir.c b/src/microsoft/clc/clc_nir.c index e6096463989..c35341c56c4 100644 --- a/src/microsoft/clc/clc_nir.c +++ b/src/microsoft/clc/clc_nir.c @@ -231,8 +231,7 @@ clc_lower_printf_base(nir_shader *nir, unsigned uav_id) nir_variable *printf_var = NULL; nir_ssa_def *printf_deref = NULL; nir_foreach_function(func, nir) { - nir_builder b = nir_builder_create(func->impl); - b.cursor = nir_before_instr(nir_block_first_instr(nir_start_block(func->impl))); + nir_builder b = nir_builder_at(nir_before_instr(nir_block_first_instr(nir_start_block(func->impl)))); bool progress = false; nir_foreach_block(block, func->impl) { diff --git a/src/microsoft/spirv_to_dxil/dxil_spirv_nir.c b/src/microsoft/spirv_to_dxil/dxil_spirv_nir.c index 2517598891f..a8a6938e5a3 100644 --- a/src/microsoft/spirv_to_dxil/dxil_spirv_nir.c +++ b/src/microsoft/spirv_to_dxil/dxil_spirv_nir.c @@ -895,8 +895,7 @@ lower_view_index_to_rt_layer(nir_shader *nir) nir_metadata_loop_analysis, var); } else { nir_function_impl *func = nir_shader_get_entrypoint(nir); - nir_builder b = nir_builder_create(func); - b.cursor = nir_after_block(nir_impl_last_block(func)); + nir_builder b = nir_builder_at(nir_after_block(nir_impl_last_block(func))); add_layer_write(&b, NULL, var); } }