Add a pass to turn global memory access into storage access, and do all storage related transformations on IR

1 files changed, 8 insertions, 4 deletions

diff --git a/Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/InstGen.cs b/Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/InstGen.cs
index b5cab54e..b6cdd7f6 100644
--- a/Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/InstGen.cs
+++ b/Ryujinx.Graphics.Shader/CodeGen/Glsl/Instructions/InstGen.cs
@@ -49,12 +49,18 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Glsl.Instructions
 
                     if (argIndex == 0 && atomic)
                     {
-                        switch (inst & Instruction.MrMask)
+                        Instruction memRegion = inst & Instruction.MrMask;
+
+                        switch (memRegion)
                         {
-                            // TODO: Global.
                             case Instruction.MrShared:  args += LoadShared (context, operation); break;
                             case Instruction.MrStorage: args += LoadStorage(context, operation); break;
+
+                            default: throw new InvalidOperationException($"Invalid memory region \"{memRegion}\".");
                         }
+
+                        // We use the first 2 operands above.
+                        argIndex++;
                     }
                     else
                     {
@@ -150,8 +156,6 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Glsl.Instructions
                 }
             }
 
-            return "0";
-
             throw new InvalidOperationException($"Unexpected instruction type \"{info.Type}\".");
         }
     }