From 69442b9193dbdf52cdd8c4bd87b0a8bdecaf085f Mon Sep 17 00:00:00 2001
From: Isaac Marovitz <isaacryu@icloud.com>
Date: Tue, 15 Aug 2023 16:49:49 +0100
Subject: [PATCH] Sample progress

---
 .../CodeGen/Msl/Instructions/InstGen.cs       |  3 +-
 .../CodeGen/Msl/Instructions/InstGenMemory.cs | 84 ++++++++++++++++++-
 2 files changed, 83 insertions(+), 4 deletions(-)

diff --git a/src/Ryujinx.Graphics.Shader/CodeGen/Msl/Instructions/InstGen.cs b/src/Ryujinx.Graphics.Shader/CodeGen/Msl/Instructions/InstGen.cs
index 058f4a6c63..5d36b76dda 100644
--- a/src/Ryujinx.Graphics.Shader/CodeGen/Msl/Instructions/InstGen.cs
+++ b/src/Ryujinx.Graphics.Shader/CodeGen/Msl/Instructions/InstGen.cs
@@ -145,7 +145,8 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Msl.Instructions
                 }
             }
 
-            throw new InvalidOperationException($"Unexpected instruction type \"{info.Type}\".");
+            // TODO: Return this to being an error
+            return $"Unexpected instruction type \"{info.Type}\".";
         }
     }
 }
diff --git a/src/Ryujinx.Graphics.Shader/CodeGen/Msl/Instructions/InstGenMemory.cs b/src/Ryujinx.Graphics.Shader/CodeGen/Msl/Instructions/InstGenMemory.cs
index 83beec9c84..53d3217704 100644
--- a/src/Ryujinx.Graphics.Shader/CodeGen/Msl/Instructions/InstGenMemory.cs
+++ b/src/Ryujinx.Graphics.Shader/CodeGen/Msl/Instructions/InstGenMemory.cs
@@ -2,6 +2,7 @@ using Ryujinx.Graphics.Shader.IntermediateRepresentation;
 using Ryujinx.Graphics.Shader.StructuredIr;
 using Ryujinx.Graphics.Shader.Translation;
 using System;
+using static Ryujinx.Graphics.Shader.CodeGen.Msl.Instructions.InstGenHelper;
 
 namespace Ryujinx.Graphics.Shader.CodeGen.Msl.Instructions
 {
@@ -56,14 +57,91 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Msl.Instructions
 
             bool isGather = (texOp.Flags & TextureFlags.Gather) != 0;
             bool isShadow = (texOp.Type & SamplerType.Shadow) != 0;
+            bool intCoords = (texOp.Flags & TextureFlags.IntCoords) != 0;
+
+            bool isArray = (texOp.Type & SamplerType.Array) != 0;
 
             bool colorIsVector = isGather || !isShadow;
 
-            string texCall = "texture.sample(";
+            string texCall = "texture.";
 
-            string samplerName = GetSamplerName(context.Properties, texOp);
+            int srcIndex = 0;
 
-            texCall += samplerName;
+            string Src(AggregateType type)
+            {
+                return GetSourceExpr(context, texOp.GetSource(srcIndex++), type);
+            }
+
+            if (intCoords)
+            {
+                texCall += "read(";
+            }
+            else
+            {
+                texCall += "sample(";
+
+                string samplerName = GetSamplerName(context.Properties, texOp);
+
+                texCall += samplerName;
+            }
+
+            int coordsCount = texOp.Type.GetDimensions();
+
+            int pCount = coordsCount;
+
+            int arrayIndexElem = -1;
+
+            if (isArray)
+            {
+                arrayIndexElem = pCount++;
+            }
+
+            if (isShadow && !isGather)
+            {
+                pCount++;
+            }
+
+            void Append(string str)
+            {
+                texCall += ", " + str;
+            }
+
+            AggregateType coordType = intCoords ? AggregateType.S32 : AggregateType.FP32;
+
+            string AssemblePVector(int count)
+            {
+                if (count > 1)
+                {
+                    string[] elems = new string[count];
+
+                    for (int index = 0; index < count; index++)
+                    {
+                        if (arrayIndexElem == index)
+                        {
+                            elems[index] = Src(AggregateType.S32);
+
+                            if (!intCoords)
+                            {
+                                elems[index] = "float(" + elems[index] + ")";
+                            }
+                        }
+                        else
+                        {
+                            elems[index] = Src(coordType);
+                        }
+                    }
+
+                    string prefix = intCoords ? "int" : "float";
+
+                    return prefix + count + "(" + string.Join(", ", elems) + ")";
+                }
+                else
+                {
+                    return Src(coordType);
+                }
+            }
+
+            Append(AssemblePVector(pCount));
 
             texCall += ")" + (colorIsVector ? GetMaskMultiDest(texOp.Index) : "");