From 6fed9b51b55965762098cf29d6bc1709df21f8dc Mon Sep 17 00:00:00 2001
From: Isaac Marovitz <isaacryu@icloud.com>
Date: Sat, 7 Sep 2024 21:38:01 +0200
Subject: [PATCH] Fix counted indirect draws

Fixes Monster Hunter Rise and Apollo Justice
---
 src/Ryujinx.Graphics.Metal/Pipeline.cs | 32 ++++++++++++++++++--------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/src/Ryujinx.Graphics.Metal/Pipeline.cs b/src/Ryujinx.Graphics.Metal/Pipeline.cs
index 00da26419..4e270def4 100644
--- a/src/Ryujinx.Graphics.Metal/Pipeline.cs
+++ b/src/Ryujinx.Graphics.Metal/Pipeline.cs
@@ -521,6 +521,11 @@ namespace Ryujinx.Graphics.Metal
         }
 
         public void DrawIndexedIndirect(BufferRange indirectBuffer)
+        {
+            DrawIndexedIndirectOffset(indirectBuffer);
+        }
+
+        public void DrawIndexedIndirectOffset(BufferRange indirectBuffer, int offset = 0)
         {
             // TODO: Reindex unsupported topologies
             if (TopologyUnsupported(_encoderStateManager.Topology))
@@ -534,7 +539,7 @@ namespace Ryujinx.Graphics.Metal
 
             var primitiveType = TopologyRemap(_encoderStateManager.Topology).Convert();
 
-            (MTLBuffer indexBuffer, int offset, MTLIndexType type) = _encoderStateManager.IndexBuffer.GetIndexBuffer(_renderer, Cbs);
+            (MTLBuffer indexBuffer, int indexOffset, MTLIndexType type) = _encoderStateManager.IndexBuffer.GetIndexBuffer(_renderer, Cbs);
 
             if (indexBuffer.NativePtr != IntPtr.Zero && buffer.NativePtr != IntPtr.Zero)
             {
@@ -544,20 +549,26 @@ namespace Ryujinx.Graphics.Metal
                     primitiveType,
                     type,
                     indexBuffer,
-                    (ulong)offset,
+                    (ulong)indexOffset,
                     buffer,
-                    (ulong)indirectBuffer.Offset);
+                    (ulong)(indirectBuffer.Offset + offset));
             }
         }
 
         public void DrawIndexedIndirectCount(BufferRange indirectBuffer, BufferRange parameterBuffer, int maxDrawCount, int stride)
         {
-            // TODO: Properly support count
-
-            DrawIndexedIndirect(indirectBuffer);
+            for (int i = 0; i < maxDrawCount; i++)
+            {
+                DrawIndexedIndirectOffset(indirectBuffer, stride * i);
+            }
         }
 
         public void DrawIndirect(BufferRange indirectBuffer)
+        {
+            DrawIndirectOffset(indirectBuffer);
+        }
+
+        public void DrawIndirectOffset(BufferRange indirectBuffer, int offset = 0)
         {
             if (TopologyUnsupported(_encoderStateManager.Topology))
             {
@@ -575,14 +586,15 @@ namespace Ryujinx.Graphics.Metal
             renderCommandEncoder.DrawPrimitives(
                 primitiveType,
                 buffer,
-                (ulong)indirectBuffer.Offset);
+                (ulong)(indirectBuffer.Offset + offset));
         }
 
         public void DrawIndirectCount(BufferRange indirectBuffer, BufferRange parameterBuffer, int maxDrawCount, int stride)
         {
-            // TODO: Properly support count
-
-            DrawIndirect(indirectBuffer);
+            for (int i = 0; i < maxDrawCount; i++)
+            {
+                DrawIndirectOffset(indirectBuffer, stride * i);
+            }
         }
 
         public void DrawTexture(ITexture texture, ISampler sampler, Extents2DF srcRegion, Extents2DF dstRegion)