From 67e83af94393dacfc27845b22ab13287064e3f6e Mon Sep 17 00:00:00 2001
From: Isaac Marovitz <isaacryu@icloud.com>
Date: Thu, 23 May 2024 13:15:23 -0400
Subject: [PATCH] Start Proper Dispose

---
 Directory.Packages.props                    |  2 +-
 src/Ryujinx.Graphics.Metal/MetalRenderer.cs | 20 +++++++++++---------
 src/Ryujinx.Graphics.Metal/Program.cs       |  4 +++-
 src/Ryujinx.Graphics.Metal/Sampler.cs       |  1 +
 src/Ryujinx.Graphics.Metal/Texture.cs       |  1 +
 5 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index cfb884d01..70404ef8e 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -38,7 +38,7 @@
     <PackageVersion Include="Ryujinx.SDL2-CS" Version="2.30.0-build32" />
     <PackageVersion Include="securifybv.ShellLink" Version="0.1.0" />
     <PackageVersion Include="shaderc.net" Version="0.1.0" />
-    <PackageVersion Include="SharpMetal" Version="1.0.0-preview12" />
+    <PackageVersion Include="SharpMetal" Version="1.0.0-preview14" />
     <PackageVersion Include="SharpZipLib" Version="1.4.2" />
     <PackageVersion Include="Silk.NET.Vulkan" Version="2.21.0" />
     <PackageVersion Include="Silk.NET.Vulkan.Extensions.EXT" Version="2.21.0" />
diff --git a/src/Ryujinx.Graphics.Metal/MetalRenderer.cs b/src/Ryujinx.Graphics.Metal/MetalRenderer.cs
index b5496028c..6e844e7c0 100644
--- a/src/Ryujinx.Graphics.Metal/MetalRenderer.cs
+++ b/src/Ryujinx.Graphics.Metal/MetalRenderer.cs
@@ -215,17 +215,19 @@ namespace Ryujinx.Graphics.Metal
         {
             var blitEncoder = _pipeline.GetOrCreateBlitEncoder();
 
-            MTLBuffer src = _device.NewBuffer((ulong)data.Length, MTLResourceOptions.ResourceStorageModeManaged);
-            var span = new Span<byte>(src.Contents.ToPointer(), data.Length);
-            data.CopyTo(span);
-            src.DidModifyRange(new NSRange
+            using MTLBuffer src = _device.NewBuffer((ulong)data.Length, MTLResourceOptions.ResourceStorageModeManaged);
             {
-                location = 0,
-                length = (ulong)data.Length
-            });
+                var span = new Span<byte>(src.Contents.ToPointer(), data.Length);
+                data.CopyTo(span);
+                src.DidModifyRange(new NSRange
+                {
+                    location = 0,
+                    length = (ulong)data.Length
+                });
 
-            MTLBuffer dst = new(Unsafe.As<BufferHandle, IntPtr>(ref buffer));
-            blitEncoder.CopyFromBuffer(src, 0, dst, (ulong)offset, (ulong)data.Length);
+                MTLBuffer dst = new(Unsafe.As<BufferHandle, IntPtr>(ref buffer));
+                blitEncoder.CopyFromBuffer(src, 0, dst, (ulong)offset, (ulong)data.Length);
+            }
         }
 
         public void UpdateCounters()
diff --git a/src/Ryujinx.Graphics.Metal/Program.cs b/src/Ryujinx.Graphics.Metal/Program.cs
index 764bcf126..ee0ce4f78 100644
--- a/src/Ryujinx.Graphics.Metal/Program.cs
+++ b/src/Ryujinx.Graphics.Metal/Program.cs
@@ -63,7 +63,9 @@ namespace Ryujinx.Graphics.Metal
 
         public void Dispose()
         {
-            return;
+            VertexFunction.Dispose();
+            FragmentFunction.Dispose();
+            ComputeFunction.Dispose();
         }
     }
 }
diff --git a/src/Ryujinx.Graphics.Metal/Sampler.cs b/src/Ryujinx.Graphics.Metal/Sampler.cs
index 5cb898a9f..f416b5da5 100644
--- a/src/Ryujinx.Graphics.Metal/Sampler.cs
+++ b/src/Ryujinx.Graphics.Metal/Sampler.cs
@@ -45,6 +45,7 @@ namespace Ryujinx.Graphics.Metal
 
         public void Dispose()
         {
+            _mtlSamplerState.Dispose();
         }
     }
 }
diff --git a/src/Ryujinx.Graphics.Metal/Texture.cs b/src/Ryujinx.Graphics.Metal/Texture.cs
index a50d416aa..524cd6cf9 100644
--- a/src/Ryujinx.Graphics.Metal/Texture.cs
+++ b/src/Ryujinx.Graphics.Metal/Texture.cs
@@ -329,6 +329,7 @@ namespace Ryujinx.Graphics.Metal
         public void Dispose()
         {
             MTLTexture.SetPurgeableState(MTLPurgeableState.Volatile);
+            MTLTexture.Dispose();
         }
     }
 }