From abcd2b2754bdb0dbbbbfda33b049896ea92b7a30 Mon Sep 17 00:00:00 2001
From: Isaac Marovitz <isaacryu@icloud.com>
Date: Fri, 28 Jul 2023 23:33:09 -0400
Subject: [PATCH] Rewrite SetData for GPU

---
 src/Ryujinx.Graphics.Metal/Texture.cs | 39 ++++++++++++++++++---------
 1 file changed, 27 insertions(+), 12 deletions(-)

diff --git a/src/Ryujinx.Graphics.Metal/Texture.cs b/src/Ryujinx.Graphics.Metal/Texture.cs
index 1372ba551..94a4187bb 100644
--- a/src/Ryujinx.Graphics.Metal/Texture.cs
+++ b/src/Ryujinx.Graphics.Metal/Texture.cs
@@ -136,29 +136,44 @@ namespace Ryujinx.Graphics.Metal
             throw new NotImplementedException();
         }
 
-        // TODO: Rewrite using MTLBlitCommandEncoder
         public void SetData(SpanOrArray<byte> data, int layer, int level, Rectangle<int> region)
         {
+            MTLBlitCommandEncoder blitCommandEncoder;
+
+            if (_pipeline.CurrentEncoder is MTLBlitCommandEncoder encoder)
+            {
+                blitCommandEncoder = encoder;
+            }
+            else
+            {
+                blitCommandEncoder = _pipeline.BeginBlitPass();
+            }
+
             ulong bytesPerRow = (ulong)Info.GetMipStride(level);
             ulong bytesPerImage = 0;
-
             if (MTLTexture.TextureType == MTLTextureType.Type3D)
             {
                 bytesPerImage = bytesPerRow * (ulong)Info.Height;
             }
 
-            var mtlRegion = new MTLRegion
-            {
-                origin = new MTLOrigin { x = (ulong)region.X, y = (ulong)region.Y },
-                size = new MTLSize { width = (ulong)region.Width, height = (ulong)region.Height },
-            };
-
             unsafe
             {
-                fixed (byte* pData = data.Span)
-                {
-                    MTLTexture.ReplaceRegion(mtlRegion, (ulong)level, (ulong)layer, new IntPtr(pData), bytesPerRow, bytesPerImage);
-                }
+                var dataSpan = data.Span;
+                var mtlBuffer = _device.NewBuffer((ulong)dataSpan.Length, MTLResourceOptions.ResourceStorageModeShared);
+                var bufferSpan = new Span<byte>(mtlBuffer.Contents.ToPointer(), dataSpan.Length);
+                dataSpan.CopyTo(bufferSpan);
+
+                blitCommandEncoder.CopyFromBuffer(
+                    mtlBuffer,
+                    0,
+                    bytesPerRow,
+                    bytesPerImage,
+                    new MTLSize { width = (ulong)region.Width, height = (ulong)region.Height },
+                    MTLTexture,
+                    (ulong)layer,
+                    (ulong)level,
+                    new MTLOrigin { x = (ulong)region.X, y = (ulong)region.Y }
+                );
             }
         }