From 8f3db26d14d970164811b4dd559e2e3b78a602e6 Mon Sep 17 00:00:00 2001 From: Konstantin Seurer Date: Mon, 26 Jun 2023 14:16:51 +0200 Subject: [PATCH] intel: Use nir_ instead of nir_build_ helpers Reviewed-by: Alyssa Rosenzweig Part-of: --- src/intel/compiler/brw_nir_rt_builder.h | 6 +++--- src/intel/vulkan/anv_mesh_perprim_wa.c | 2 +- src/intel/vulkan/anv_pipeline.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/intel/compiler/brw_nir_rt_builder.h b/src/intel/compiler/brw_nir_rt_builder.h index 23c1220363d..d63d772cbe4 100644 --- a/src/intel/compiler/brw_nir_rt_builder.h +++ b/src/intel/compiler/brw_nir_rt_builder.h @@ -63,13 +63,13 @@ static inline nir_ssa_def * brw_nir_rt_load_const(nir_builder *b, unsigned components, nir_ssa_def *addr, nir_ssa_def *pred) { - return nir_build_load_global_const_block_intel(b, components, addr, pred); + return nir_load_global_const_block_intel(b, components, addr, pred); } static inline nir_ssa_def * brw_load_btd_dss_id(nir_builder *b) { - return nir_build_load_topology_id_intel(b, .base = BRW_TOPOLOGY_ID_DSS); + return nir_load_topology_id_intel(b, .base = BRW_TOPOLOGY_ID_DSS); } static inline nir_ssa_def * @@ -84,7 +84,7 @@ brw_nir_rt_load_num_simd_lanes_per_dss(nir_builder *b, static inline nir_ssa_def * brw_load_eu_thread_simd(nir_builder *b) { - return nir_build_load_topology_id_intel(b, .base = BRW_TOPOLOGY_ID_EU_THREAD_SIMD); + return nir_load_topology_id_intel(b, .base = BRW_TOPOLOGY_ID_EU_THREAD_SIMD); } static inline nir_ssa_def * diff --git a/src/intel/vulkan/anv_mesh_perprim_wa.c b/src/intel/vulkan/anv_mesh_perprim_wa.c index cba85e6a0b0..f8cb4a76bbe 100644 --- a/src/intel/vulkan/anv_mesh_perprim_wa.c +++ b/src/intel/vulkan/anv_mesh_perprim_wa.c @@ -162,7 +162,7 @@ anv_mesh_convert_attrs_prim_to_vert(struct nir_shader *nir, nir_ssa_def *zero = nir_imm_int(&b, 0); - nir_ssa_def *local_invocation_index = nir_build_load_local_invocation_index(&b); + nir_ssa_def *local_invocation_index = nir_load_local_invocation_index(&b); nir_ssa_def *cmp = nir_ieq(&b, local_invocation_index, zero); nir_if *if_stmt = nir_push_if(&b, cmp); diff --git a/src/intel/vulkan/anv_pipeline.c b/src/intel/vulkan/anv_pipeline.c index 75c510ea37b..03360bbe02c 100644 --- a/src/intel/vulkan/anv_pipeline.c +++ b/src/intel/vulkan/anv_pipeline.c @@ -62,7 +62,7 @@ anv_nir_prim_count_store(nir_builder *b, nir_ssa_def *val) primitive_count->data.location = VARYING_SLOT_PRIMITIVE_COUNT; primitive_count->data.interpolation = INTERP_MODE_NONE; - nir_ssa_def *local_invocation_index = nir_build_load_local_invocation_index(b); + nir_ssa_def *local_invocation_index = nir_load_local_invocation_index(b); nir_ssa_def *cmp = nir_ieq_imm(b, local_invocation_index, 0); nir_if *if_stmt = nir_push_if(b, cmp);