From ad50ded7b56ef272cbee224ddab0339816ea22b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cle=CC=81ment=20Foucault?= <foucault.clem@gmail.com>
Date: Sat, 30 Sep 2023 21:37:36 +0200
Subject: [PATCH] Metal: Fix texture atomic wrapper

GLSL imageAtomic operations operate on single components.
---
 .../gpu/shaders/metal/mtl_shader_defines.msl  | 52 +++++++++----------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/source/blender/gpu/shaders/metal/mtl_shader_defines.msl b/source/blender/gpu/shaders/metal/mtl_shader_defines.msl
index 22685368d95..4b5be8c0e24 100644
--- a/source/blender/gpu/shaders/metal/mtl_shader_defines.msl
+++ b/source/blender/gpu/shaders/metal/mtl_shader_defines.msl
@@ -985,52 +985,52 @@ inline void _texture_write_internal_fast(thread _mtl_combined_image_sampler_3d<S
 
 /* Atomic Min. */
 template<typename S, access A>
-vec<S, 4> _texture_image_atomic_min_internal(thread _mtl_combined_image_sampler_1d<S, A> tex,
+S _texture_image_atomic_min_internal(thread _mtl_combined_image_sampler_1d<S, A> tex,
                                              int coord,
-                                             vec<S, 4> data)
+                                             S data)
 {
-  return tex.texture->atomic_fetch_min(uint(coord), data);
+  return tex.texture->atomic_fetch_min(uint(coord), vec<S,4>(data)).x;
 }
 
 template<typename S, access A>
-vec<S, 4> _texture_image_atomic_min_internal(thread _mtl_combined_image_sampler_1d_array<S, A> tex,
+S _texture_image_atomic_min_internal(thread _mtl_combined_image_sampler_1d_array<S, A> tex,
                                              int2 coord,
-                                             vec<S, 4> data)
+                                             S data)
 {
-  return tex.texture->atomic_fetch_min(uint(coord.x), uint(coord.y), data);
+  return tex.texture->atomic_fetch_min(uint(coord.x), uint(coord.y), vec<S,4>(data)).x;
 }
 
 template<typename S, access A>
-vec<S, 4> _texture_image_atomic_min_internal(thread _mtl_combined_image_sampler_2d<S, A> tex,
+S _texture_image_atomic_min_internal(thread _mtl_combined_image_sampler_2d<S, A> tex,
                                              int2 coord,
-                                             vec<S, 4> data)
+                                             S data)
 {
-  return tex.texture->atomic_fetch_min(uint2(coord.xy), data);
+  return tex.texture->atomic_fetch_min(uint2(coord.xy), vec<S,4>(data)).x;
 }
 
 template<typename S, access A>
-vec<S, 4> _texture_image_atomic_min_internal(thread _mtl_combined_image_sampler_2d_array<S, A> tex,
+S _texture_image_atomic_min_internal(thread _mtl_combined_image_sampler_2d_array<S, A> tex,
                                              int3 coord,
-                                             vec<S, 4> data)
+                                             S data)
 {
-  return tex.texture->atomic_fetch_min(uint2(coord.xy), uint(coord.z), data);
+  return tex.texture->atomic_fetch_min(uint2(coord.xy), uint(coord.z), vec<S,4>(data)).x;
 }
 
 template<typename S, access A>
-vec<S, 4> _texture_image_atomic_min_internal(thread _mtl_combined_image_sampler_3d<S, A> tex,
+S _texture_image_atomic_min_internal(thread _mtl_combined_image_sampler_3d<S, A> tex,
                                              int3 coord,
-                                             vec<S, 4> data)
+                                             S data)
 {
-  return tex.texture->atomic_fetch_min(uint3(coord), data);
+  return tex.texture->atomic_fetch_min(uint3(coord), vec<S,4>(data)).x;
 }
 
 /* Atomic Exchange. */
-template<typename S, access A, int N>
-vec<S, N> _texture_image_atomic_exchange_internal(thread _mtl_combined_image_sampler_1d<S, A> tex,
+template<typename S, access A>
+S _texture_image_atomic_exchange_internal(thread _mtl_combined_image_sampler_1d<S, A> tex,
                                                   int coord,
-                                                  vec<S, N> data)
+                                                  S data)
 {
-  return tex.texture->atomic_exchange(uint(coord), data);
+  return tex.texture->atomic_exchange(uint(coord), vec<S,4>(data)).x;
 }
 
 template<typename S, access A>
@@ -1038,31 +1038,31 @@ S _texture_image_atomic_exchange_internal(thread _mtl_combined_image_sampler_1d_
                                           int2 coord,
                                           S data)
 {
-  return tex.texture->atomic_exchange(uint(coord.x), uint(coord.y), data);
+  return tex.texture->atomic_exchange(uint(coord.x), uint(coord.y), vec<S,4>(data)).x;
 }
 
-template<typename S, access A, int N>
+template<typename S, access A>
 S _texture_image_atomic_exchange_internal(thread _mtl_combined_image_sampler_2d<S, A> tex,
                                           int2 coord,
                                           S data)
 {
-  return tex.texture->atomic_exchange(uint2(coord.xy), data);
+  return tex.texture->atomic_exchange(uint2(coord.xy), vec<S,4>(data)).x;
 }
 
-template<typename S, access A, int N>
+template<typename S, access A>
 S _texture_image_atomic_exchange_internal(thread _mtl_combined_image_sampler_2d_array<S, A> tex,
                                           int3 coord,
                                           S data)
 {
-  return tex.texture->atomic_exchange(uint2(coord.xy), uint(coord.z), data);
+  return tex.texture->atomic_exchange(uint2(coord.xy), uint(coord.z), vec<S,4>(data)).x;
 }
 
-template<typename S, access A, int N>
+template<typename S, access A>
 S _texture_image_atomic_exchange_internal(thread _mtl_combined_image_sampler_3d<S, A> tex,
                                           int3 coord,
                                           S data)
 {
-  return tex.texture->atomic_exchange(uint3(coord), data);
+  return tex.texture->atomic_exchange(uint3(coord), vec<S,4>(data)).x;
 }
 
 #else