diff options
author | Alyssa Rosenzweig <alyssa@rosenzweig.io> | 2023-05-15 10:18:18 -0400 |
---|---|---|
committer | Marge Bot <emma+marge@anholt.net> | 2023-05-16 22:36:21 +0000 |
commit | c323762f9f3595ab272cdec955c4e435f975ded8 (patch) | |
tree | 30b2063f49275fa30bfd45a0078735a36dbe0169 /src/gallium | |
parent | ec0c9706f0efb477559762daf55bd3ae0bfc3c52 (diff) | |
download | mesa-c323762f9f3595ab272cdec955c4e435f975ded8.tar.gz |
treewide: Stop lowering legacy atomics
There are no more producers of legacy atomics so these calls are inert.
Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Reviewed-by: Emma Anholt <emma@anholt.net>
Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23036>
Diffstat (limited to 'src/gallium')
-rw-r--r-- | src/gallium/auxiliary/gallivm/lp_bld_nir.c | 1 | ||||
-rw-r--r-- | src/gallium/auxiliary/nir/nir_to_tgsi.c | 2 | ||||
-rw-r--r-- | src/gallium/drivers/r600/sfn/sfn_nir.cpp | 1 | ||||
-rw-r--r-- | src/gallium/drivers/radeonsi/si_shader_nir.c | 3 | ||||
-rw-r--r-- | src/gallium/drivers/zink/zink_compiler.c | 3 | ||||
-rw-r--r-- | src/gallium/frontends/lavapipe/lvp_pipeline.c | 1 |
6 files changed, 0 insertions, 11 deletions
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_nir.c b/src/gallium/auxiliary/gallivm/lp_bld_nir.c index 75f2d44800b..34130b9d990 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_nir.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_nir.c @@ -2668,7 +2668,6 @@ bool lp_build_nir_llvm(struct lp_build_nir_context *bld_base, nir_lower_locals_to_regs(nir); nir_remove_dead_derefs(nir); nir_remove_dead_variables(nir, nir_var_function_temp, NULL); - nir_lower_legacy_atomics(nir); if (is_aos(bld_base)) { nir_move_vec_src_uses_to_dest(nir); diff --git a/src/gallium/auxiliary/nir/nir_to_tgsi.c b/src/gallium/auxiliary/nir/nir_to_tgsi.c index cb95afa5383..1afa52d4ac9 100644 --- a/src/gallium/auxiliary/nir/nir_to_tgsi.c +++ b/src/gallium/auxiliary/nir/nir_to_tgsi.c @@ -3856,8 +3856,6 @@ const void *nir_to_tgsi_options(struct nir_shader *s, source_mods |= nir_lower_fabs_source_mods; NIR_PASS_V(s, nir_lower_to_source_mods, source_mods); - NIR_PASS_V(s, nir_lower_legacy_atomics); - NIR_PASS_V(s, nir_convert_from_ssa, true); NIR_PASS_V(s, nir_lower_vec_to_movs, ntt_vec_to_mov_writemask_cb, NULL); diff --git a/src/gallium/drivers/r600/sfn/sfn_nir.cpp b/src/gallium/drivers/r600/sfn/sfn_nir.cpp index 6d007fb2385..f35a62f1bf0 100644 --- a/src/gallium/drivers/r600/sfn/sfn_nir.cpp +++ b/src/gallium/drivers/r600/sfn/sfn_nir.cpp @@ -782,7 +782,6 @@ r600_finalize_nir(pipe_screen *screen, void *shader) NIR_PASS_V(nir, r600_nir_lower_pack_unpack_2x16); NIR_PASS_V(nir, r600_lower_shared_io); - NIR_PASS_V(nir, nir_lower_legacy_atomics); NIR_PASS_V(nir, r600_nir_lower_atomics); if (rs->b.gfx_level == CAYMAN) diff --git a/src/gallium/drivers/radeonsi/si_shader_nir.c b/src/gallium/drivers/radeonsi/si_shader_nir.c index a75c393d19d..7ffd9ef57e3 100644 --- a/src/gallium/drivers/radeonsi/si_shader_nir.c +++ b/src/gallium/drivers/radeonsi/si_shader_nir.c @@ -375,9 +375,6 @@ static void si_lower_nir(struct si_screen *sscreen, struct nir_shader *nir) si_late_optimize_16bit_samplers(sscreen, nir); NIR_PASS_V(nir, nir_remove_dead_variables, nir_var_function_temp, NULL); - - /* Temporary stopgap until legacy atomics are removed in the core */ - NIR_PASS_V(nir, nir_lower_legacy_atomics); } static bool si_mark_divergent_texture_non_uniform(struct nir_shader *nir) diff --git a/src/gallium/drivers/zink/zink_compiler.c b/src/gallium/drivers/zink/zink_compiler.c index 34203bb45dd..21bdee34965 100644 --- a/src/gallium/drivers/zink/zink_compiler.c +++ b/src/gallium/drivers/zink/zink_compiler.c @@ -4874,9 +4874,6 @@ zink_shader_create(struct zink_screen *screen, struct nir_shader *nir, NIR_PASS_V(nir, nir_lower_fragcolor, nir->info.fs.color_is_dual_source ? 1 : 8); - /* Temporary stop gap until glsl-to-nir produces unified atomics */ - NIR_PASS_V(nir, nir_lower_legacy_atomics); - NIR_PASS_V(nir, lower_64bit_vertex_attribs); bool needs_size = analyze_io(ret, nir); NIR_PASS_V(nir, unbreak_bos, ret, needs_size); diff --git a/src/gallium/frontends/lavapipe/lvp_pipeline.c b/src/gallium/frontends/lavapipe/lvp_pipeline.c index 95e301663c8..3be265f0f40 100644 --- a/src/gallium/frontends/lavapipe/lvp_pipeline.c +++ b/src/gallium/frontends/lavapipe/lvp_pipeline.c @@ -464,7 +464,6 @@ lvp_shader_lower(struct lvp_device *pdevice, nir_shader *nir, struct lvp_shader NIR_PASS_V(nir, nir_remove_dead_variables, nir_var_uniform | nir_var_image, NULL); - NIR_PASS_V(nir, nir_lower_legacy_atomics); scan_pipeline_info(shader, layout, nir); optimize(nir); |