mesa/st: Produce unified atomics

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>

diff --git a/src/mesa/state_tracker/st_draw_hw_select.c b/src/mesa/state_tracker/st_draw_hw_select.c
index d7849ae..ab9acd4 100644 (file)
--- a/src/mesa/state_tracker/st_draw_hw_select.c
+++ b/src/mesa/state_tracker/st_draw_hw_select.c
@@ -413,9 +413,12 @@ update_result_buffer(nir_builder *b, nir_ssa_def *dmin, nir_ssa_def *dmax,
    /* driver_location = 0 (slot 0) */
 
    nir_ssa_def *ssbo = nir_imm_int(b, 0);
-   nir_ssbo_atomic_exchange(b, 32, ssbo, offset, nir_imm_int(b, 1));
-   nir_ssbo_atomic_umin(b, 32, ssbo, nir_iadd_imm(b, offset, 4), dmin);
-   nir_ssbo_atomic_umax(b, 32, ssbo, nir_iadd_imm(b, offset, 8), dmax);
+   nir_ssbo_atomic(b, 32, ssbo, offset, nir_imm_int(b, 1),
+                   .atomic_op = nir_atomic_op_xchg);
+   nir_ssbo_atomic(b, 32, ssbo, nir_iadd_imm(b, offset, 4), dmin,
+                   .atomic_op = nir_atomic_op_umin);
+   nir_ssbo_atomic(b, 32, ssbo, nir_iadd_imm(b, offset, 8), dmax,
+                   .atomic_op = nir_atomic_op_umax);
 }
 
 static void