diff --git a/src/asahi/vulkan/hk_nir_lower_descriptors.c b/src/asahi/vulkan/hk_nir_lower_descriptors.c index 2c046c2262e..bde502c72fc 100644 --- a/src/asahi/vulkan/hk_nir_lower_descriptors.c +++ b/src/asahi/vulkan/hk_nir_lower_descriptors.c @@ -46,9 +46,9 @@ static nir_def * load_speculatable(nir_builder *b, unsigned num_components, unsigned bit_size, nir_def *addr, unsigned align) { - return nir_build_load_global_constant(b, num_components, bit_size, addr, - .align_mul = align, - .access = ACCESS_CAN_SPECULATE); + return nir_load_global_constant(b, num_components, bit_size, addr, + .align_mul = align, + .access = ACCESS_CAN_SPECULATE); } static nir_def * diff --git a/src/asahi/vulkan/hk_shader.c b/src/asahi/vulkan/hk_shader.c index ad121efa8cf..6d88067ecf5 100644 --- a/src/asahi/vulkan/hk_shader.c +++ b/src/asahi/vulkan/hk_shader.c @@ -444,7 +444,7 @@ lower_load_global_constant_offset_instr(nir_builder *b, unsigned align_mul = nir_intrinsic_align_mul(intrin); unsigned align_offset = nir_intrinsic_align_offset(intrin); - nir_def *val = nir_build_load_global_constant( + nir_def *val = nir_load_global_constant( b, intrin->def.num_components, intrin->def.bit_size, nir_iadd(b, base_addr, nir_u2u64(b, offset)), .align_mul = align_mul, .align_offset = align_offset, .access = nir_intrinsic_access(intrin)); diff --git a/src/intel/vulkan/anv_nir_lower_ubo_loads.c b/src/intel/vulkan/anv_nir_lower_ubo_loads.c index 6406701c924..592bb4d5442 100644 --- a/src/intel/vulkan/anv_nir_lower_ubo_loads.c +++ b/src/intel/vulkan/anv_nir_lower_ubo_loads.c @@ -107,7 +107,7 @@ lower_ubo_load_instr(nir_builder *b, nir_intrinsic_instr *load, nir_push_if(b, in_bounds); nir_def *load_val = - nir_build_load_global_constant(b, load->def.num_components, + nir_load_global_constant(b, load->def.num_components, load->def.bit_size, addr, .access = nir_intrinsic_access(load), .align_mul = nir_intrinsic_align_mul(load), @@ -117,7 +117,7 @@ lower_ubo_load_instr(nir_builder *b, nir_intrinsic_instr *load, val = nir_if_phi(b, load_val, zero); } else { - val = nir_build_load_global_constant(b, load->def.num_components, + val = nir_load_global_constant(b, load->def.num_components, load->def.bit_size, addr, .access = nir_intrinsic_access(load), .align_mul = nir_intrinsic_align_mul(load), diff --git a/src/intel/vulkan_hasvk/anv_nir_lower_ubo_loads.c b/src/intel/vulkan_hasvk/anv_nir_lower_ubo_loads.c index cd171f9dcb8..a4732848cf2 100644 --- a/src/intel/vulkan_hasvk/anv_nir_lower_ubo_loads.c +++ b/src/intel/vulkan_hasvk/anv_nir_lower_ubo_loads.c @@ -89,7 +89,7 @@ lower_ubo_load_instr(nir_builder *b, nir_intrinsic_instr *load, nir_push_if(b, in_bounds); nir_def *load_val = - nir_build_load_global_constant(b, load->def.num_components, + nir_load_global_constant(b, load->def.num_components, load->def.bit_size, addr, .access = nir_intrinsic_access(load), .align_mul = nir_intrinsic_align_mul(load), @@ -99,7 +99,7 @@ lower_ubo_load_instr(nir_builder *b, nir_intrinsic_instr *load, val = nir_if_phi(b, load_val, zero); } else { - val = nir_build_load_global_constant(b, load->def.num_components, + val = nir_load_global_constant(b, load->def.num_components, load->def.bit_size, addr, .access = nir_intrinsic_access(load), .align_mul = nir_intrinsic_align_mul(load), diff --git a/src/nouveau/compiler/nak_nir_lower_non_uniform_ldcx.c b/src/nouveau/compiler/nak_nir_lower_non_uniform_ldcx.c index 3b3852b4d92..dd939107ecf 100644 --- a/src/nouveau/compiler/nak_nir_lower_non_uniform_ldcx.c +++ b/src/nouveau/compiler/nak_nir_lower_non_uniform_ldcx.c @@ -60,7 +60,7 @@ lower_ldcx_to_global(nir_builder *b, nir_intrinsic_instr *load, nir_def *val; nir_push_if(b, nir_ilt(b, offset, size)); { - val = nir_build_load_global_constant(b, + val = nir_load_global_constant(b, load->def.num_components, load->def.bit_size, nir_iadd(b, addr, nir_u2u64(b, offset)), .align_mul = nir_intrinsic_align_mul(load), diff --git a/src/nouveau/vulkan/nvk_shader.c b/src/nouveau/vulkan/nvk_shader.c index 939fcb10a97..6fd598bf739 100644 --- a/src/nouveau/vulkan/nvk_shader.c +++ b/src/nouveau/vulkan/nvk_shader.c @@ -284,7 +284,7 @@ lower_load_intrinsic(nir_builder *b, nir_intrinsic_instr *load, } nir_def *val = - nir_build_load_global_constant(b, load->def.num_components, + nir_load_global_constant(b, load->def.num_components, load->def.bit_size, nir_iadd(b, base_addr, nir_u2u64(b, offset)), .align_mul = nir_intrinsic_align_mul(load),