diff options
| author | Georg Lehmann <dadschoorse@gmail.com> | 2025-10-20 17:47:15 +0200 |
|---|---|---|
| committer | Georg Lehmann <dadschoorse@gmail.com> | 2025-10-21 12:39:53 +0200 |
| commit | cf4ab485ead01de2e448c163247a0fbbe10da6a8 (patch) | |
| tree | 43e4ae30d4d1d0e68db960dd3e1e03e9aed22850 /src/intel/vulkan | |
| parent | 654bd74c60a88b148e8dbf42bc634b4750bb04fc (diff) | |
nir: remove manual nir_load_global_constant
Acked-by: Alyssa Rosenzweig <alyssa.rosenzweig@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/37959>
Diffstat (limited to 'src/intel/vulkan')
| -rw-r--r-- | src/intel/vulkan/anv_nir_apply_pipeline_layout.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/intel/vulkan/anv_nir_apply_pipeline_layout.c b/src/intel/vulkan/anv_nir_apply_pipeline_layout.c index d749b8acc00..5f170535482 100644 --- a/src/intel/vulkan/anv_nir_apply_pipeline_layout.c +++ b/src/intel/vulkan/anv_nir_apply_pipeline_layout.c @@ -1897,7 +1897,6 @@ lower_load_constant(nir_builder *b, nir_intrinsic_instr *intrin, unsigned load_size = intrin->def.num_components * intrin->def.bit_size / 8; - unsigned load_align = intrin->def.bit_size / 8; assert(load_size < b->shader->constant_data_size); unsigned max_offset = b->shader->constant_data_size - load_size; @@ -1910,10 +1909,9 @@ lower_load_constant(nir_builder *b, nir_intrinsic_instr *intrin, nir_load_reloc_const_intel(b, INTEL_SHADER_RELOC_CONST_DATA_ADDR_HIGH)); nir_def *data = - nir_load_global_constant(b, const_data_addr, - load_align, - intrin->def.num_components, - intrin->def.bit_size); + nir_load_global_constant(b, intrin->def.num_components, + intrin->def.bit_size, + const_data_addr); nir_def_rewrite_uses(&intrin->def, data); @@ -2075,7 +2073,7 @@ lower_num_workgroups(nir_builder *b, nir_intrinsic_instr *intrin, nir_def *addr = nir_pack_64_2x32_split(b, nir_channel(b, num_workgroups, 1), nir_channel(b, num_workgroups, 2)); - num_workgroups_indirect = nir_load_global_constant(b, addr, 4, 3, 32); + num_workgroups_indirect = nir_load_global_constant(b, 3, 32, addr); } nir_pop_if(b, NULL); |