Module: Mesa Branch: master Commit: 2846d7811e5c84dc37b0fe564547e961d62ff638 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2846d7811e5c84dc37b0fe564547e961d62ff638
Author: Rhys Perry <[email protected]> Date: Fri Nov 27 09:56:50 2020 +0000 nir: fix nir_builder.h on MSVC C++ and GCC7. MSVC C++ can't do designated initializers without /std:c++latest. These helpers will likely be removed soon anyway, so just don't use the intrinsic builders here. This should also fix the GCC7 build, which doesn't implement non-trivial designated initializers. Signed-off-by: Rhys Perry <[email protected]> Reviewed-by: Erik Faye-Lund <[email protected]> Fixes: c9bcad25737 ("nir: add generated intrinsic builders") Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7808> --- src/compiler/nir/nir_builder.h | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/src/compiler/nir/nir_builder.h b/src/compiler/nir/nir_builder.h index ec9333c8666..6121bf3913b 100644 --- a/src/compiler/nir/nir_builder.h +++ b/src/compiler/nir/nir_builder.h @@ -1455,7 +1455,15 @@ static inline nir_ssa_def * nir_load_global(nir_builder *build, nir_ssa_def *addr, unsigned align, unsigned num_components, unsigned bit_size) { - return nir_build_load_global(build, num_components, bit_size, addr, .align_mul=align); + nir_intrinsic_instr *load = + nir_intrinsic_instr_create(build->shader, nir_intrinsic_load_global); + load->num_components = num_components; + load->src[0] = nir_src_for_ssa(addr); + nir_intrinsic_set_align(load, align, 0); + nir_ssa_dest_init(&load->instr, &load->dest, + num_components, bit_size, NULL); + nir_builder_instr_insert(build, &load->instr); + return &load->dest.ssa; } #undef nir_store_global @@ -1463,8 +1471,15 @@ static inline void nir_store_global(nir_builder *build, nir_ssa_def *addr, unsigned align, nir_ssa_def *value, nir_component_mask_t write_mask) { - write_mask &= BITFIELD_MASK(value->num_components); - nir_build_store_global(build, value, addr, .write_mask=write_mask, .align_mul=align); + nir_intrinsic_instr *store = + nir_intrinsic_instr_create(build->shader, nir_intrinsic_store_global); + store->num_components = value->num_components; + store->src[0] = nir_src_for_ssa(value); + store->src[1] = nir_src_for_ssa(addr); + nir_intrinsic_set_write_mask(store, + write_mask & BITFIELD_MASK(value->num_components)); + nir_intrinsic_set_align(store, align, 0); + nir_builder_instr_insert(build, &store->instr); } #undef nir_load_global_constant @@ -1472,7 +1487,15 @@ static inline nir_ssa_def * nir_load_global_constant(nir_builder *build, nir_ssa_def *addr, unsigned align, unsigned num_components, unsigned bit_size) { - return nir_build_load_global_constant(build, num_components, bit_size, addr, .align_mul=align); + nir_intrinsic_instr *load = + nir_intrinsic_instr_create(build->shader, nir_intrinsic_load_global_constant); + load->num_components = num_components; + load->src[0] = nir_src_for_ssa(addr); + nir_intrinsic_set_align(load, align, 0); + nir_ssa_dest_init(&load->instr, &load->dest, + num_components, bit_size, NULL); + nir_builder_instr_insert(build, &load->instr); + return &load->dest.ssa; } #undef nir_load_param _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
