From be45d4fa6ef4c5b67b2d4e9b4fb27113b922797d Mon Sep 17 00:00:00 2001 From: Konstantin Seurer Date: Tue, 27 Jun 2023 12:57:47 +0200 Subject: [PATCH] spirv: Use nir_builder_at Reviewed-by: Alyssa Rosenzweig Part-of: --- src/compiler/spirv/spirv_to_nir.c | 3 +-- src/compiler/spirv/vtn_cfg.c | 6 ++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/compiler/spirv/spirv_to_nir.c b/src/compiler/spirv/spirv_to_nir.c index 1fd3e0d17f3..973c7d9bd9c 100644 --- a/src/compiler/spirv/spirv_to_nir.c +++ b/src/compiler/spirv/spirv_to_nir.c @@ -6629,8 +6629,7 @@ vtn_emit_kernel_entry_point_wrapper(struct vtn_builder *b, nir_function *main_entry_point = nir_function_create(b->shader, func_name); nir_function_impl *impl = nir_function_impl_create(main_entry_point); - b->nb = nir_builder_create(impl); - b->nb.cursor = nir_after_cf_list(&impl->body); + b->nb = nir_builder_at(nir_after_cf_list(&impl->body)); b->func_param_idx = 0; nir_call_instr *call = nir_call_instr_create(b->nb.shader, entry_point); diff --git a/src/compiler/spirv/vtn_cfg.c b/src/compiler/spirv/vtn_cfg.c index 4011186575e..0f3e4e21940 100644 --- a/src/compiler/spirv/vtn_cfg.c +++ b/src/compiler/spirv/vtn_cfg.c @@ -225,8 +225,7 @@ vtn_cfg_handle_prepass_instruction(struct vtn_builder *b, SpvOp opcode, * directly in our OpFunctionParameter handler. */ nir_function_impl *impl = nir_function_impl_create(func); - b->nb = nir_builder_create(impl); - b->nb.cursor = nir_before_cf_list(&impl->body); + b->nb = nir_builder_at(nir_before_cf_list(&impl->body)); b->nb.exact = b->exact; b->func_param_idx = 0; @@ -627,9 +626,8 @@ vtn_function_emit(struct vtn_builder *b, struct vtn_function *func, } nir_function_impl *impl = func->nir_func->impl; - b->nb = nir_builder_create(impl); + b->nb = nir_builder_at(nir_after_cf_list(&impl->body)); b->func = func; - b->nb.cursor = nir_after_cf_list(&impl->body); b->nb.exact = b->exact; b->phi_table = _mesa_pointer_hash_table_create(b);