From d62644e46482959e09ca6b8ec8608df0c21d7787 Mon Sep 17 00:00:00 2001
From: riperiperi <rhy3756547@hotmail.com>
Date: Fri, 23 Aug 2024 22:47:33 +0100
Subject: [PATCH] fix: add MoltenVK resolver workaround

fix: add MoltenVK resolver workaround
---
 .../MoltenVK/MVKInitialization.cs               | 17 +++++++++++++++++
 src/Ryujinx.Gtk3/Program.cs                     |  3 +++
 src/Ryujinx.Headless.SDL2/Program.cs            |  8 +++++++-
 src/Ryujinx/Program.cs                          |  6 ++++++
 4 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/src/Ryujinx.Graphics.Vulkan/MoltenVK/MVKInitialization.cs b/src/Ryujinx.Graphics.Vulkan/MoltenVK/MVKInitialization.cs
index 457240aa08..ec46091da7 100644
--- a/src/Ryujinx.Graphics.Vulkan/MoltenVK/MVKInitialization.cs
+++ b/src/Ryujinx.Graphics.Vulkan/MoltenVK/MVKInitialization.cs
@@ -1,3 +1,4 @@
+using Silk.NET.Core.Loader;
 using Silk.NET.Vulkan;
 using System;
 using System.Runtime.InteropServices;
@@ -29,5 +30,21 @@ namespace Ryujinx.Graphics.Vulkan.MoltenVK
 
             vkSetMoltenVKConfigurationMVK(IntPtr.Zero, config, configSize);
         }
+
+        public static void InitializeResolver()
+        {
+            Func<string, string[]> mvkResolver = (string path) =>
+            {
+                if (path.EndsWith("libvulkan.dylib")) 
+                {
+                    path = path.Substring(0, path.Length - "libvulkan.dylib".Length) + "libMoltenVK.dylib";
+                    return [ path ];
+                }
+
+                return Array.Empty<string>();
+            };
+
+            ((DefaultPathResolver)PathResolver.Default).Resolvers.Insert(0, mvkResolver);
+        }
     }
 }
diff --git a/src/Ryujinx.Gtk3/Program.cs b/src/Ryujinx.Gtk3/Program.cs
index 745335ac95..8bad1a0c7b 100644
--- a/src/Ryujinx.Gtk3/Program.cs
+++ b/src/Ryujinx.Gtk3/Program.cs
@@ -4,6 +4,7 @@ using Ryujinx.Common.Configuration;
 using Ryujinx.Common.GraphicsDriver;
 using Ryujinx.Common.Logging;
 using Ryujinx.Common.SystemInterop;
+using Ryujinx.Graphics.Vulkan.MoltenVK;
 using Ryujinx.Modules;
 using Ryujinx.SDL2.Common;
 using Ryujinx.UI;
@@ -110,6 +111,8 @@ namespace Ryujinx
 
             if (OperatingSystem.IsMacOS())
             {
+                MVKInitialization.InitializeResolver();
+
                 string baseDirectory = Path.GetDirectoryName(AppDomain.CurrentDomain.BaseDirectory);
                 string resourcesDataDir;
 
diff --git a/src/Ryujinx.Headless.SDL2/Program.cs b/src/Ryujinx.Headless.SDL2/Program.cs
index 85aff67129..ff54f87aad 100644
--- a/src/Ryujinx.Headless.SDL2/Program.cs
+++ b/src/Ryujinx.Headless.SDL2/Program.cs
@@ -1,4 +1,4 @@
-using CommandLine;
+using CommandLine;
 using LibHac.Tools.FsSystem;
 using Ryujinx.Audio.Backends.SDL2;
 using Ryujinx.Common;
@@ -18,6 +18,7 @@ using Ryujinx.Graphics.Gpu;
 using Ryujinx.Graphics.Gpu.Shader;
 using Ryujinx.Graphics.OpenGL;
 using Ryujinx.Graphics.Vulkan;
+using Ryujinx.Graphics.Vulkan.MoltenVK;
 using Ryujinx.Headless.SDL2.OpenGL;
 using Ryujinx.Headless.SDL2.Vulkan;
 using Ryujinx.HLE;
@@ -88,6 +89,11 @@ namespace Ryujinx.Headless.SDL2
                 };
             }
 
+            if (OperatingSystem.IsMacOS())
+            {
+                MVKInitialization.InitializeResolver();
+            }
+
             Parser.Default.ParseArguments<Options>(args)
             .WithParsed(Load)
             .WithNotParsed(errors => errors.Output());
diff --git a/src/Ryujinx/Program.cs b/src/Ryujinx/Program.cs
index 976963422d..af9db7d636 100644
--- a/src/Ryujinx/Program.cs
+++ b/src/Ryujinx/Program.cs
@@ -7,6 +7,7 @@ using Ryujinx.Common.Configuration;
 using Ryujinx.Common.GraphicsDriver;
 using Ryujinx.Common.Logging;
 using Ryujinx.Common.SystemInterop;
+using Ryujinx.Graphics.Vulkan.MoltenVK;
 using Ryujinx.Modules;
 using Ryujinx.SDL2.Common;
 using Ryujinx.UI.Common;
@@ -80,6 +81,11 @@ namespace Ryujinx.Ava
             // Parse arguments
             CommandLineState.ParseArguments(args);
 
+            if (OperatingSystem.IsMacOS())
+            {
+                MVKInitialization.InitializeResolver();
+            }
+
             // Delete backup files after updating.
             Task.Run(Updater.CleanupUpdate);