From 068a83bdfb35fe20b3b2e3e3ef9a4108cebeb6a5 Mon Sep 17 00:00:00 2001
From: Isaac Marovitz <isaacryu@icloud.com>
Date: Thu, 1 Aug 2024 18:13:49 +0100
Subject: [PATCH] Finally fix (most) image atomics

---
 src/Ryujinx.Graphics.Metal/Program.cs         |  6 ++-
 .../CodeGen/Msl/Instructions/InstGenMemory.cs | 43 ++++++++++++++++---
 2 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/src/Ryujinx.Graphics.Metal/Program.cs b/src/Ryujinx.Graphics.Metal/Program.cs
index c1eae2273..c76930321 100644
--- a/src/Ryujinx.Graphics.Metal/Program.cs
+++ b/src/Ryujinx.Graphics.Metal/Program.cs
@@ -46,7 +46,11 @@ namespace Ryujinx.Graphics.Metal
             {
                 ShaderSource shader = _shaders[i];
 
-                var compileOptions = new MTLCompileOptions { PreserveInvariance = true };
+                var compileOptions = new MTLCompileOptions
+                {
+                    PreserveInvariance = true,
+                    LanguageVersion = MTLLanguageVersion.Version31,
+                };
                 var index = i;
 
                 _handles[i] = device.NewLibrary(StringHelper.NSString(shader.Code), compileOptions, (library, error) => CompilationResultHandler(library, error, index));
diff --git a/src/Ryujinx.Graphics.Shader/CodeGen/Msl/Instructions/InstGenMemory.cs b/src/Ryujinx.Graphics.Shader/CodeGen/Msl/Instructions/InstGenMemory.cs
index d88464712..31f904787 100644
--- a/src/Ryujinx.Graphics.Shader/CodeGen/Msl/Instructions/InstGenMemory.cs
+++ b/src/Ryujinx.Graphics.Shader/CodeGen/Msl/Instructions/InstGenMemory.cs
@@ -211,7 +211,7 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Msl.Instructions
             }
             else
             {
-                coordsBuilder.Append(Src(AggregateType.S32));
+                coordsBuilder.Append($"uint({Src(AggregateType.S32)})");
             }
 
             if (isArray)
@@ -251,15 +251,44 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Msl.Instructions
                     _ => string.Empty,
                 };
 
-                texCallBuilder.Append($"{prefix}4({string.Join(", ", cElems)}), ");
+                texCallBuilder.Append($"{prefix}4({string.Join(", ", cElems)})");
+                texCallBuilder.Append(", ");
+                texCallBuilder.Append(coordsBuilder);
             }
 
-            texCallBuilder.Append(coordsBuilder);
-            texCallBuilder.Append(')');
-
-            if (texOp.Inst == Instruction.ImageLoad)
+            if (texOp.Inst == Instruction.ImageAtomic)
             {
-                texCallBuilder.Append(GetMaskMultiDest(texOp.Index));
+                // Atomics do (coord, value)
+                texCallBuilder.Append(coordsBuilder);
+                texCallBuilder.Append(", ");
+
+                AggregateType type = texOp.Format.GetComponentType();
+
+                if ((texOp.Flags & TextureFlags.AtomicMask) == TextureFlags.CAS)
+                {
+                    texCallBuilder.Append(Src(type)); // Compare value.
+                }
+
+                string value = (texOp.Flags & TextureFlags.AtomicMask) switch
+                {
+                    TextureFlags.Increment => NumberFormatter.FormatInt(1, type), // TODO: Clamp value
+                    TextureFlags.Decrement => NumberFormatter.FormatInt(-1, type), // TODO: Clamp value
+                    _ => Src(type),
+                };
+
+                texCallBuilder.Append(value);
+                // This doesn't match what the MSL spec document says so either
+                // it is wrong or the MSL compiler has a bug.
+                texCallBuilder.Append(")[0]");
+            }
+            else
+            {
+                texCallBuilder.Append(')');
+
+                if (texOp.Inst == Instruction.ImageLoad)
+                {
+                    texCallBuilder.Append(GetMaskMultiDest(texOp.Index));
+                }
             }
 
             return texCallBuilder.ToString();