Refactor GetIcdPath

- Mesa 26.0 introduced KosmicKrisp, a Vulkan-on-Metal translation layer and the eventual successor to MoltenVK

Directory.Packages.props

@@ -36,8 +36,10 @@
     <PackageVersion Include="Ryujinx.Graphics.Nvdec.Dependencies.Linux" Version="6.1.4-build6" />
     <PackageVersion Include="Ryujinx.Graphics.Nvdec.Dependencies.macOS" Version="5.0.3-build14" />
     <PackageVersion Include="Ryujinx.Graphics.Nvdec.Dependencies.Windows" Version="6.1.4-build6" />
+    <PackageVersion Include="Ryujinx.Graphics.Vulkan.KosmicKrisp" Version="26.2.1-ryu.1" />
     <PackageVersion Include="Ryujinx.Graphics.Vulkan.MoltenVK" Version="1.4.3-ryujinx.1" />
     <PackageVersion Include="Ryujinx.LibHac" Version="0.21.0-alpha.133" />
+    <PackageVersion Include="Ryujinx.SPB" Version="0.0.5-ryujinx.4" />
     <PackageVersion Include="Ryujinx.SDL3-CS" Version="2026.707.0" />
     <PackageVersion Include="securifybv.ShellLink" Version="0.1.0" />
     <PackageVersion Include="SharpZipLib" Version="1.4.2" />
@@ -47,7 +49,6 @@
     <PackageVersion Include="Silk.NET.Vulkan.Extensions.KHR" Version="2.23.0" />
     <PackageVersion Include="SkiaSharp" Version="3.119.4" />
     <PackageVersion Include="SkiaSharp.NativeAssets.Linux" Version="3.119.4" />
-    <PackageVersion Include="SPB" Version="0.0.4-build32" />
     <PackageVersion Include="System.IO.Hashing" Version="10.0.12" />
     <PackageVersion Include="UnicornEngine.Unicorn" Version="2.1.0" />
   </ItemGroup>

distribution/macos/construct_universal_dylib.py

@@ -48,7 +48,7 @@ def get_new_name(
     return Path(os.path.join(output_directory, input_component))
 
 def get_archs(dylib_path: Path) -> list[str]:
-    res = subprocess.check_output([LIPO, "-info", str(dylib_path)]).decode("utf-8")
+    res = subprocess.check_output([LIPO, "-info", str(dylib_path.absolute())]).decode("utf-8")
     if res.startswith("Non-fat file"):
         return [res.split(":")[-1].strip()]
     else:

distribution/macos/create_app_bundle.sh

@@ -18,14 +18,18 @@ mkdir "$APP_BUNDLE_DIRECTORY/Contents/Resources"
 cp "$PUBLISH_DIRECTORY/Ryujinx" "$APP_BUNDLE_DIRECTORY/Contents/MacOS/Ryujinx"
 chmod u+x "$APP_BUNDLE_DIRECTORY/Contents/MacOS/Ryujinx"
 
+# List all dylibs in PUBLISH_DIRECTORY
+ls -la "$PUBLISH_DIRECTORY"/*.dylib
+
 # Then all libraries
-cp "$PUBLISH_DIRECTORY"/*.dylib "$APP_BUNDLE_DIRECTORY/Contents/Frameworks"
+find "$PUBLISH_DIRECTORY" -name "*.dylib" -exec cp {} "$APP_BUNDLE_DIRECTORY/Contents/Frameworks" \;
 
 # Then resources
 cp Info.plist "$APP_BUNDLE_DIRECTORY/Contents"
 cp Ryujinx.icns "$APP_BUNDLE_DIRECTORY/Contents/Resources/Ryujinx.icns"
 cp updater.sh "$APP_BUNDLE_DIRECTORY/Contents/Resources/updater.sh"
 cp Assets.car "$APP_BUNDLE_DIRECTORY/Contents/Resources/Assets.car"
+cp -r vulkan "$APP_BUNDLE_DIRECTORY/Contents/Resources"
 cp -r "$PUBLISH_DIRECTORY/THIRDPARTY.md" "$APP_BUNDLE_DIRECTORY/Contents/Resources"
 
 echo -n "APPL????" > "$APP_BUNDLE_DIRECTORY/Contents/PkgInfo"

distribution/macos/create_macos_build_ava.sh

@@ -47,7 +47,7 @@ EXECUTABLE_SUB_PATH=Contents/MacOS/Ryujinx
 rm -rf "$TEMP_DIRECTORY"
 mkdir -p "$TEMP_DIRECTORY"
 
-DOTNET_COMMON_ARGS=(-p:DebugType=embedded -p:Version="$VERSION" -p:SourceRevisionId="$SOURCE_REVISION_ID" --self-contained true $EXTRA_ARGS)
+DOTNET_COMMON_ARGS=(-p:DebugType=embedded -p:Version="$VERSION" -p:SourceRevisionId="$SOURCE_REVISION_ID" -p:UseSharedCompilation=false --self-contained true $EXTRA_ARGS)
 
 dotnet restore
 dotnet build -c "$CONFIGURATION" src/Ryujinx
@@ -76,6 +76,9 @@ rm "$UNIVERSAL_APP_BUNDLE/$EXECUTABLE_SUB_PATH"
 # Make it libraries universal
 python3 "$BASE_DIR/distribution/macos/construct_universal_dylib.py" "$ARM64_APP_BUNDLE" "$X64_APP_BUNDLE" "$UNIVERSAL_APP_BUNDLE" "**/*.dylib"
 
+# Copy arm64-only libraries to UNIVERSAL_APP_BUNDLE
+cp "$ARM64_APP_BUNDLE/Contents/Frameworks/libvulkan_kosmickrisp.dylib" "$UNIVERSAL_APP_BUNDLE/Contents/Frameworks/libvulkan_kosmickrisp.dylib"
+
 if ! [ -x "$(command -v lipo)" ];
 then
     if ! [ -x "$(command -v llvm-lipo-17)" ];

distribution/macos/vulkan/icd.d/MoltenVK_icd-flat.json

@@ -0,0 +1,8 @@
+{
+    "file_format_version" : "1.0.0",
+    "ICD": {
+        "library_path": "./libMoltenVK.dylib",
+        "api_version" : "1.4.0",
+        "is_portability_driver" : true
+    }
+}

distribution/macos/vulkan/icd.d/MoltenVK_icd.json

@@ -0,0 +1,8 @@
+{
+    "file_format_version" : "1.0.0",
+    "ICD": {
+        "library_path": "../../../Frameworks/libMoltenVK.dylib",
+        "api_version" : "1.4.0",
+        "is_portability_driver" : true
+    }
+}

distribution/macos/vulkan/icd.d/libkosmickrisp_icd-flat.json

@@ -0,0 +1,7 @@
+{
+    "ICD": {
+        "api_version": "1.3.0",
+        "library_path": "./libvulkan_kosmickrisp.dylib"
+    },
+    "file_format_version": "1.0.1"
+}

distribution/macos/vulkan/icd.d/libkosmickrisp_icd.json

@@ -0,0 +1,7 @@
+{
+    "ICD": {
+        "api_version": "1.3.0",
+        "library_path": "../../../Frameworks/libvulkan_kosmickrisp.dylib"
+    },
+    "file_format_version": "1.0.1"
+}

nuget.config

@@ -2,6 +2,7 @@
 <configuration>
     <packageSources>
         <clear />
+        <add key="local" value="nuget" />
         <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
         <!-- Only needed when using pre-release versions of Ryujinx.LibHac. -->
         <add key="LibHacAlpha" value="https://git.ryujinx.app/api/packages/projects/nuget/index.json" />
@@ -10,6 +11,9 @@
     <packageSourceMapping>
         <!-- key value for <packageSource> should match key values from <packageSources> element -->
         <!-- These are defined and .NET still yells about multiple package sources with no mappings. Not sure what to do, this is in the docs lol -->
+        <packageSource key="local">
+            <package pattern="Ryujinx.Graphics.Vulkan.KosmicKrisp" />
+        </packageSource>
         <packageSource key="nuget.org">
             <package pattern="*" />
         </packageSource>

src/Ryujinx.Common/Configuration/TranslationLayer.cs

@@ -0,0 +1,11 @@
+using System.Text.Json.Serialization;
+
+namespace Ryujinx.Common.Configuration
+{
+    [JsonConverter(typeof(JsonStringEnumConverter<TranslationLayer>))]
+    public enum TranslationLayer 
+    {
+        MoltenVK,
+        KosmicKrisp,
+    }
+}

src/Ryujinx.Graphics.Vulkan/MoltenVK/MVKConfiguration.cs

@@ -1,104 +0,0 @@
-using System;
-using System.Runtime.InteropServices;
-
-namespace Ryujinx.Graphics.Vulkan.MoltenVK
-{
-    enum MVKConfigLogLevel
-    {
-        None = 0,
-        Error = 1,
-        Warning = 2,
-        Info = 3,
-        Debug = 4,
-    }
-
-    enum MVKConfigTraceVulkanCalls
-    {
-        None = 0,
-        Enter = 1,
-        EnterExit = 2,
-        Duration = 3,
-    }
-
-    enum MVKConfigAutoGPUCaptureScope
-    {
-        None = 0,
-        Device = 1,
-        Frame = 2,
-    }
-
-    [Flags]
-    enum MVKConfigAdvertiseExtensions
-    {
-        All = 0x00000001,
-        MoltenVK = 0x00000002,
-        WSI = 0x00000004,
-        Portability = 0x00000008,
-    }
-
-    enum MVKVkSemaphoreSupportStyle
-    {
-        MVK_CONFIG_VK_SEMAPHORE_SUPPORT_STYLE_SINGLE_QUEUE = 0,
-        MVK_CONFIG_VK_SEMAPHORE_SUPPORT_STYLE_METAL_EVENTS_WHERE_SAFE = 1,
-        MVK_CONFIG_VK_SEMAPHORE_SUPPORT_STYLE_METAL_EVENTS = 2,
-        MVK_CONFIG_VK_SEMAPHORE_SUPPORT_STYLE_CALLBACK = 3,
-        MVK_CONFIG_VK_SEMAPHORE_SUPPORT_STYLE_MAX_ENUM = 0x7FFFFFFF,
-    }
-
-    readonly struct Bool32
-    {
-        uint Value { get; }
-
-        public Bool32(uint value)
-        {
-            Value = value;
-        }
-
-        public Bool32(bool value)
-        {
-            Value = value ? 1u : 0u;
-        }
-
-        public static implicit operator bool(Bool32 val) => val.Value == 1;
-        public static implicit operator Bool32(bool val) => new(val);
-    }
-
-    [StructLayout(LayoutKind.Sequential)]
-    struct MVKConfiguration
-    {
-        public Bool32 DebugMode;
-        public Bool32 ShaderConversionFlipVertexY;
-        public Bool32 SynchronousQueueSubmits;
-        public Bool32 PrefillMetalCommandBuffers;
-        public uint MaxActiveMetalCommandBuffersPerQueue;
-        public Bool32 SupportLargeQueryPools;
-        public Bool32 PresentWithCommandBuffer;
-        public Bool32 SwapchainMagFilterUseNearest;
-        public ulong MetalCompileTimeout;
-        public Bool32 PerformanceTracking;
-        public uint PerformanceLoggingFrameCount;
-        public Bool32 DisplayWatermark;
-        public Bool32 SpecializedQueueFamilies;
-        public Bool32 SwitchSystemGPU;
-        public Bool32 FullImageViewSwizzle;
-        public uint DefaultGPUCaptureScopeQueueFamilyIndex;
-        public uint DefaultGPUCaptureScopeQueueIndex;
-        public Bool32 FastMathEnabled;
-        public MVKConfigLogLevel LogLevel;
-        public MVKConfigTraceVulkanCalls TraceVulkanCalls;
-        public Bool32 ForceLowPowerGPU;
-        public Bool32 SemaphoreUseMTLFence;
-        public MVKVkSemaphoreSupportStyle SemaphoreSupportStyle;
-        public MVKConfigAutoGPUCaptureScope AutoGPUCaptureScope;
-        public nint AutoGPUCaptureOutputFilepath;
-        public Bool32 Texture1DAs2D;
-        public Bool32 PreallocateDescriptors;
-        public Bool32 UseCommandPooling;
-        public Bool32 UseMTLHeap;
-        public Bool32 LogActivityPerformanceInline;
-        public uint ApiVersionToAdvertise;
-        public MVKConfigAdvertiseExtensions AdvertiseExtensions;
-        public Bool32 ResumeLostDevice;
-        public Bool32 UseMetalArgumentBuffers;
-    }
-}

src/Ryujinx.Graphics.Vulkan/MoltenVK/MVKInitialization.cs

@@ -1,51 +0,0 @@
-using Silk.NET.Core.Loader;
-using Silk.NET.Vulkan;
-using System;
-using System.Runtime.InteropServices;
-using System.Runtime.Versioning;
-
-namespace Ryujinx.Graphics.Vulkan.MoltenVK
-{
-    [SupportedOSPlatform("macos")]
-    public static partial class MVKInitialization
-    {
-        private const string VulkanLib = "libvulkan.dylib";
-
-        [LibraryImport("libMoltenVK.dylib")]
-        private static partial Result vkGetMoltenVKConfigurationMVK(nint unusedInstance, out MVKConfiguration config, in nint configSize);
-
-        [LibraryImport("libMoltenVK.dylib")]
-        private static partial Result vkSetMoltenVKConfigurationMVK(nint unusedInstance, in MVKConfiguration config, in nint configSize);
-
-        public static void Initialize()
-        {
-            IntPtr configSize = (nint)Marshal.SizeOf<MVKConfiguration>();
-
-            vkGetMoltenVKConfigurationMVK(nint.Zero, out MVKConfiguration config, configSize);
-
-            config.UseMetalArgumentBuffers = true;
-
-            config.SemaphoreSupportStyle = MVKVkSemaphoreSupportStyle.MVK_CONFIG_VK_SEMAPHORE_SUPPORT_STYLE_SINGLE_QUEUE;
-            config.SynchronousQueueSubmits = false;
-
-            config.ResumeLostDevice = true;
-
-            vkSetMoltenVKConfigurationMVK(nint.Zero, config, configSize);
-        }
-
-        private static string[] Resolver(string path)
-        {
-            if (path.EndsWith(VulkanLib))
-            {
-                path = path[..^VulkanLib.Length] + "libMoltenVK.dylib";
-                return [path];
-            }
-            return [];
-        }
-
-        public static void InitializeResolver()
-        {
-            ((DefaultPathResolver)PathResolver.Default).Resolvers.Insert(0, Resolver);
-        }
-    }
-}

src/Ryujinx.Graphics.Vulkan/Ryujinx.Graphics.Vulkan.csproj

@@ -44,6 +44,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="Ryujinx.SPB" />
     <PackageReference Include="Silk.NET.Shaderc" ExcludeAssets="native" />
     <PackageReference Include="Silk.NET.Vulkan" />
     <PackageReference Include="Silk.NET.Vulkan.Extensions.EXT" />

src/Ryujinx.Graphics.Vulkan/Vendor.cs

@@ -99,6 +99,7 @@ namespace Ryujinx.Graphics.Vulkan
                 DriverId.MesaNvk => "NVK",
                 DriverId.ImaginationOpenSourceMesa => "Imagination (Open)",
                 DriverId.MesaHoneykrisp => "Honeykrisp",
+                DriverId.MesaKosmickrisp => "KosmicKrisp",
                 _ => id.ToString(),
             };
         }

src/Ryujinx.Graphics.Vulkan/VulkanDriver.cs

@@ -0,0 +1,54 @@
+using System;
+using System.IO;
+using System.Runtime.Versioning;
+
+namespace Ryujinx.Graphics.Vulkan
+{
+    [SupportedOSPlatform("macos")]
+    public static class VulkanDriver
+    {
+        private static string GetIcdPath(string fileName)
+        {
+            string baseDir = AppContext.BaseDirectory.TrimEnd(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar);
+            string contentsDir = Path.GetDirectoryName(baseDir)!;
+            string[] searchPaths =
+            [
+                // .app bundle:
+                Path.Combine(contentsDir, "Resources", "vulkan", "icd.d", fileName),
+
+                // Local build:
+                Path.Combine(contentsDir, fileName)
+            ];
+
+            foreach (string icdPath in searchPaths)
+            {
+                if (File.Exists(icdPath))
+                {
+                    return icdPath;
+                }
+            }
+
+            throw new FileNotFoundException(
+                $"{fileName} not found. Searched:\n{string.Join(Environment.NewLine, searchPaths)}");
+        }
+
+        public static void MoltenVK()
+        {
+            Environment.SetEnvironmentVariable("MVK_CONFIG_USE_METAL_ARGUMENT_BUFFERS", "1");
+            Environment.SetEnvironmentVariable("MVK_CONFIG_VK_SEMAPHORE_SUPPORT_STYLE", "0");
+            Environment.SetEnvironmentVariable("MVK_CONFIG_SYNCHRONOUS_QUEUE_SUBMITS", "0");
+            Environment.SetEnvironmentVariable("MVK_CONFIG_RESUME_LOST_DEVICE", "1");
+
+            Environment.SetEnvironmentVariable("VK_DRIVER_FILES", GetIcdPath("MoltenVK_icd.json"));
+
+            Console.WriteLine($"[MoltenVK] VK_DRIVER_FILES just set to: {Environment.GetEnvironmentVariable("VK_DRIVER_FILES")}");
+        }
+
+        public static void KosmicKrisp()
+        {
+            Environment.SetEnvironmentVariable("VK_DRIVER_FILES", GetIcdPath("libkosmickrisp_icd.json"));
+
+            Console.WriteLine($"[KosmicKrisp] VK_DRIVER_FILES just set to: {Environment.GetEnvironmentVariable("VK_DRIVER_FILES")}");
+        }
+    }
+}

src/Ryujinx.Graphics.Vulkan/VulkanInitialization.cs

@@ -5,7 +5,6 @@ using Silk.NET.Core;
 using Silk.NET.Vulkan;
 using Silk.NET.Vulkan.Extensions.EXT;
 using Silk.NET.Vulkan.Extensions.KHR;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.InteropServices;
@@ -14,10 +13,11 @@ namespace Ryujinx.Graphics.Vulkan
 {
     public unsafe static class VulkanInitialization
     {
+        private static Version32 Version14 => new(1, 4, 0);
+
         private const uint InvalidIndex = uint.MaxValue;
         private static readonly uint _minimalVulkanVersion = Vk.Version11.Value;
-        private static readonly uint _minimalInstanceVulkanVersion = Vk.Version12.Value;
-        private static readonly uint _maximumVulkanVersion = Vk.Version12.Value;
+        private static readonly uint _maximumVulkanVersion = Version14.Value;
         private const string AppName = "Ryujinx.Graphics.Vulkan";
         private const int QueuesCount = 2;
 
@@ -59,7 +59,7 @@ namespace Ryujinx.Graphics.Vulkan
 
         internal static VulkanInstance CreateInstance(Vk api, GraphicsDebugLevel logLevel, string[] requiredExtensions)
         {
-            List<string> enabledLayers = new();
+            List<string> enabledLayers = [];
 
             IReadOnlySet<string> instanceExtensions = VulkanInstance.GetInstanceExtensions(api);
             IReadOnlySet<string> instanceLayers = VulkanInstance.GetInstanceLayers(api);
@@ -88,7 +88,7 @@ namespace Ryujinx.Graphics.Vulkan
                 enabledExtensions = enabledExtensions.Append(ExtDebugUtils.ExtensionName).ToArray();
             }
 
-            IntPtr appName = Marshal.StringToHGlobalAnsi(AppName);
+            nint appName = Marshal.StringToHGlobalAnsi(AppName);
 
             ApplicationInfo applicationInfo = new()
             {
@@ -168,7 +168,7 @@ namespace Ryujinx.Graphics.Vulkan
 
         internal static DeviceInfo[] GetSuitablePhysicalDevices(Vk api)
         {
-            IntPtr appName = Marshal.StringToHGlobalAnsi(AppName);
+            nint appName = Marshal.StringToHGlobalAnsi(AppName);
 
             ApplicationInfo applicationInfo = new()
             {
@@ -197,13 +197,6 @@ namespace Ryujinx.Graphics.Vulkan
 
             using VulkanInstance instance = rawInstance;
 
-            // We currently assume that the instance is compatible with Vulkan 1.2
-            // TODO: Remove this once we relax our initialization codepaths.
-            if (instance.InstanceVersion < _minimalInstanceVulkanVersion)
-            {
-                return [];
-            }
-
             instance.EnumeratePhysicalDevices(out VulkanPhysicalDevice[] physicalDevices).ThrowOnError();
 
             List<DeviceInfo> deviceInfos = [];
@@ -386,7 +379,7 @@ namespace Ryujinx.Graphics.Vulkan
                 features2.PNext = &supportedFeaturesDynamicAttachmentFeedbackLoopLayout;
             }
 
-            PhysicalDevicePageableDeviceLocalMemoryFeaturesEXT supportedPageableDeviceLocalMemoryFeatures = new()
+            PhysicalDevicePageableDeviceLocalMemoryFeaturesEXT supportedFeaturesPageableDeviceLocalMemory = new()
             {
                 SType = StructureType.PhysicalDevicePageableDeviceLocalMemoryFeaturesExt,
                 PNext = features2.PNext,
@@ -394,10 +387,10 @@ namespace Ryujinx.Graphics.Vulkan
 
             if (physicalDevice.IsDeviceExtensionPresent(ExtPageableDeviceLocalMemory.ExtensionName))
             {
-                features2.PNext = &supportedPageableDeviceLocalMemoryFeatures;
+                features2.PNext = &supportedFeaturesPageableDeviceLocalMemory;
             }
 
-            PhysicalDeviceMemoryPriorityFeaturesEXT supportedDeviceMemoryPriorityFeatures = new()
+            PhysicalDeviceMemoryPriorityFeaturesEXT supportedFeaturesDeviceMemoryPriority = new()
             {
                 SType = StructureType.PhysicalDeviceMemoryPriorityFeaturesExt,
                 PNext = features2.PNext,
@@ -405,7 +398,7 @@ namespace Ryujinx.Graphics.Vulkan
 
             if (physicalDevice.IsDeviceExtensionPresent("VK_EXT_memory_priority"))
             {
-                features2.PNext = &supportedDeviceMemoryPriorityFeatures;
+                features2.PNext = &supportedFeaturesDeviceMemoryPriority;
             }
 
             PhysicalDeviceVulkan12Features supportedPhysicalDeviceVulkan12Features = new()
@@ -416,6 +409,22 @@ namespace Ryujinx.Graphics.Vulkan
 
             features2.PNext = &supportedPhysicalDeviceVulkan12Features;
 
+            PhysicalDeviceVulkan13Features supportedPhysicalDeviceVulkan13Features = new()
+            {
+                SType = StructureType.PhysicalDeviceVulkan13Features,
+                PNext = features2.PNext,
+            };
+
+            features2.PNext = &supportedPhysicalDeviceVulkan13Features;
+
+            PhysicalDeviceVulkan14Features supportedPhysicalDeviceVulkan14Features = new()
+            {
+                SType = StructureType.PhysicalDeviceVulkan14Features,
+                PNext = features2.PNext,
+            };
+
+            features2.PNext = &supportedPhysicalDeviceVulkan14Features;
+
             api.GetPhysicalDeviceFeatures2(physicalDevice.PhysicalDevice, &features2);
 
             PhysicalDeviceFeatures supportedFeatures = features2.Features;
@@ -519,6 +528,24 @@ namespace Ryujinx.Graphics.Vulkan
 
             pExtendedFeatures = &featuresVk12;
 
+            PhysicalDeviceVulkan13Features featuresVk13 = new()
+            {
+                SType = StructureType.PhysicalDeviceVulkan13Features,
+                PNext = pExtendedFeatures,
+                /* Vulkan 1.3 features here */
+            };
+
+            pExtendedFeatures = &featuresVk13;
+
+            PhysicalDeviceVulkan13Features featuresVk14 = new()
+            {
+                SType = StructureType.PhysicalDeviceVulkan14Features,
+                PNext = pExtendedFeatures,
+                /* Vulkan 1.4 features here */
+            };
+
+            pExtendedFeatures = &featuresVk14;
+
             if (physicalDevice.IsDeviceExtensionPresent("VK_EXT_index_type_uint8"))
             {
                 PhysicalDeviceIndexTypeUint8FeaturesEXT featuresIndexU8 = new()
@@ -598,7 +625,7 @@ namespace Ryujinx.Graphics.Vulkan
             }
             
             if (physicalDevice.IsDeviceExtensionPresent(ExtPageableDeviceLocalMemory.ExtensionName) &&
-                supportedPageableDeviceLocalMemoryFeatures.PageableDeviceLocalMemory)
+                supportedFeaturesPageableDeviceLocalMemory.PageableDeviceLocalMemory)
             {
                 PhysicalDevicePageableDeviceLocalMemoryFeaturesEXT featuresPageableDeviceLocalMemory = new()
                 {
@@ -611,16 +638,16 @@ namespace Ryujinx.Graphics.Vulkan
             }
 
             if (physicalDevice.IsDeviceExtensionPresent("VK_EXT_memory_priority") &&
-                supportedDeviceMemoryPriorityFeatures.MemoryPriority)
+                supportedFeaturesDeviceMemoryPriority.MemoryPriority)
             {
-                PhysicalDeviceMemoryPriorityFeaturesEXT featuresDeviceMemoryPriority = new()
+                PhysicalDeviceMemoryPriorityFeaturesEXT featuresMemoryPriority = new()
                 {
                     SType = StructureType.PhysicalDeviceMemoryPriorityFeaturesExt,
                     PNext = pExtendedFeatures,
                     MemoryPriority = true,
                 };
 
-                pExtendedFeatures = &featuresDeviceMemoryPriority;
+                pExtendedFeatures = &featuresMemoryPriority;
             }
 
             string[] enabledExtensions = _requiredExtensions.Union(_desirableExtensions.Intersect(physicalDevice.DeviceExtensions)).ToArray();

src/Ryujinx.Graphics.Vulkan/VulkanInstance.cs

@@ -13,7 +13,6 @@ namespace Ryujinx.Graphics.Vulkan
     {
         private readonly Vk _api;
         public readonly Instance Instance;
-        public readonly Version32 InstanceVersion;
 
         private bool _disposed;
 
@@ -21,22 +20,6 @@ namespace Ryujinx.Graphics.Vulkan
         {
             _api = api;
             Instance = instance;
-
-            if (api.GetInstanceProcAddr(instance, "vkEnumerateInstanceVersion") == nint.Zero)
-            {
-                InstanceVersion = Vk.Version10;
-            }
-            else
-            {
-                uint rawInstanceVersion = 0;
-
-                if (api.EnumerateInstanceVersion(ref rawInstanceVersion) != Result.Success)
-                {
-                    rawInstanceVersion = Vk.Version11.Value;
-                }
-
-                InstanceVersion = (Version32)rawInstanceVersion;
-            }
         }
 
         public static Result Create(Vk api, ref InstanceCreateInfo createInfo, out VulkanInstance instance)

src/Ryujinx.Graphics.Vulkan/VulkanRenderer.cs

@@ -3,7 +3,6 @@ using Ryujinx.Common.Logging;
 using Ryujinx.Graphics.GAL;
 using Ryujinx.Graphics.Shader;
 using Ryujinx.Graphics.Shader.Translation;
-using Ryujinx.Graphics.Vulkan.MoltenVK;
 using Ryujinx.Graphics.Vulkan.Queries;
 using Silk.NET.Vulkan;
 using Silk.NET.Vulkan.Extensions.EXT;
@@ -97,6 +96,7 @@ namespace Ryujinx.Graphics.Vulkan
         internal bool IsIntelArc { get; private set; }
         internal bool IsQualcommProprietary { get; private set; }
         internal bool IsMoltenVk { get; private set; }
+        internal bool IsKosmicKrisp { get; private set; }
         internal bool SupportsMTL31 { get; private set; }
         internal bool IsTBDR { get; private set; }
         internal bool IsSharedMemory { get; private set; }
@@ -111,7 +111,7 @@ namespace Ryujinx.Graphics.Vulkan
 
         public event EventHandler<ScreenCaptureImageInfo> ScreenCaptured;
 
-        public VulkanRenderer(Vk api, Func<Instance, Vk, SurfaceKHR> surfaceFunc, Func<string[]> requiredExtensionsFunc, string preferredGpuId)
+        public VulkanRenderer(Vk api, Func<Instance, Vk, SurfaceKHR> surfaceFunc, Func<string[]> requiredExtensionsFunc, string preferredGpuId, TranslationLayer translationLayer)
         {
             _getSurface = surfaceFunc;
             _getRequiredExtensions = requiredExtensionsFunc;
@@ -121,12 +121,20 @@ namespace Ryujinx.Graphics.Vulkan
             Textures = [];
             Samplers = [];
 
+            // MoltenVK is required for any device running < macOS 26, even Intel and AMD vendors.
+            // KosmicKrisp, a Vulkan conformant implementation running on top of Metal 4, requires macOS 26.
             if (OperatingSystem.IsMacOS())
             {
-                MVKInitialization.Initialize();
-
-                // Any device running on MacOS is using MoltenVK, even Intel and AMD vendors.
-                IsMoltenVk = true;
+                if (translationLayer == TranslationLayer.MoltenVK)
+                {
+                    VulkanDriver.MoltenVK();
+                    IsMoltenVk = true;
+                }
+                if (translationLayer == TranslationLayer.KosmicKrisp)
+                {
+                    VulkanDriver.KosmicKrisp();
+                    IsKosmicKrisp = true;
+                }
             }
 
             SupportsMTL31 = OperatingSystem.IsMacOSVersionAtLeast(14);
@@ -842,14 +850,14 @@ namespace Ryujinx.Graphics.Vulkan
 
         /// <summary>
         /// Gets the available Vulkan devices using the default Vulkan API
-        /// object returned by <see cref="Vk.GetApi()"/>
+        /// object returned by <see cref="VulkanSpbApi.GetApiFromSpb()"/>
         /// </summary>
         /// <returns></returns>
         public static DeviceInfo[] GetPhysicalDevices()
         {
             try
             {
-                return VulkanInitialization.GetSuitablePhysicalDevices(Vk.GetApi());
+                return VulkanInitialization.GetSuitablePhysicalDevices(VulkanSpbApi.GetApiFromSpb());
             }
             catch (Exception ex)
             {

src/Ryujinx.Graphics.Vulkan/VulkanSpbApi.cs

@@ -0,0 +1,34 @@
+using Silk.NET.Core.Contexts;
+using Silk.NET.Vulkan;
+using SPB.Graphics.Vulkan;
+
+namespace Ryujinx.Graphics.Vulkan
+{
+    public static class VulkanSpbApi
+    {
+        public static Vk GetApiFromSpb()
+        {
+            LamdaNativeContext baseCtx = new(VulkanHelper.GetProcAddress);
+            MultiNativeContext ctx = new(baseCtx, null);
+            Vk ret = new(ctx);
+
+            ctx.Contexts[1] = new LamdaNativeContext(x =>
+            {
+                if (x.EndsWith("ProcAddr"))
+                {
+                    return default;
+                }
+
+                nint ptr = ret.GetDeviceProcAddr(ret.CurrentDevice.GetValueOrDefault(), x);
+                if (ptr != default)
+                {
+                    return ptr;
+                }
+
+                return ret.GetInstanceProcAddr(ret.CurrentInstance.GetValueOrDefault(), x);
+            });
+
+            return ret;
+        }
+    }
+}

src/Ryujinx.HLE/HOS/Applets/Error/ErrorApplet.cs

@@ -166,13 +166,15 @@ namespace Ryujinx.HLE.HOS.Applets.Error
 
             string[] buttons = GetButtonsText(module, description, "DlgBtn");
 
-            bool showDetails = _horizon.Device.UIHandler.DisplayErrorAppletDialog($"Error Code: {module}-{description:0000}", "\n" + message, buttons);
+            (uint Module, uint Description) errorCodeTuple = (module, uint.Parse(description.ToString("0000")));
+
+            bool showDetails = _horizon.Device.UIHandler.DisplayErrorAppletDialog($"Error Code: {module}-{description:0000}", "\n" + message, buttons, errorCodeTuple);
             if (showDetails)
             {
                 message = GetMessageText(module, description, "FlvMsg");
                 buttons = GetButtonsText(module, description, "FlvBtn");
 
-                _horizon.Device.UIHandler.DisplayErrorAppletDialog($"Details: {module}-{description:0000}", "\n" + message, buttons);
+                _horizon.Device.UIHandler.DisplayErrorAppletDialog($"Details: {module}-{description:0000}", "\n" + message, buttons, errorCodeTuple);
             }
         }
 

src/Ryujinx.HLE/HOS/Applets/PlayerSelect/PlayerSelectApplet.cs

@@ -27,9 +27,19 @@ namespace Ryujinx.HLE.HOS.Applets
             _normalSession = normalSession;
             _interactiveSession = interactiveSession;
 
-            // TODO(jduncanator): Parse PlayerSelectConfig from input data
-            _normalSession.Push(BuildResponse());
-
+            UserProfile selected = _system.Device.UIHandler.ShowPlayerSelectDialog();
+            if (selected == null)
+            {
+                _normalSession.Push(BuildResponse());
+            }
+            else if (selected.UserId == new UserId("00000000000000000000000000000080"))
+            {
+                _normalSession.Push(BuildGuestResponse());
+            }
+            else
+            {
+                _normalSession.Push(BuildResponse(selected));
+            }
             AppletStateChanged?.Invoke(this, null);
 
             _system.ReturnFocus();
@@ -37,16 +47,34 @@ namespace Ryujinx.HLE.HOS.Applets
             return ResultCode.Success;
         }
 
-        private byte[] BuildResponse()
+        private byte[] BuildResponse(UserProfile selectedUser)
         {
-            UserProfile currentUser = _system.AccountManager.LastOpenedUser;
-
             using MemoryStream stream = MemoryStreamManager.Shared.GetStream();
             using BinaryWriter writer = new(stream);
 
             writer.Write((ulong)PlayerSelectResult.Success);
 
-            currentUser.UserId.Write(writer);
+            selectedUser.UserId.Write(writer);
+
+            return stream.ToArray();
+        }
+
+        private byte[] BuildGuestResponse()
+        {
+            using MemoryStream stream = MemoryStreamManager.Shared.GetStream();
+            using BinaryWriter writer = new(stream);
+
+            writer.Write(new byte());
+
+            return stream.ToArray();
+        }
+        
+        private byte[] BuildResponse()
+        {
+            using MemoryStream stream = MemoryStreamManager.Shared.GetStream();
+            using BinaryWriter writer = new(stream);
+
+            writer.Write((ulong)PlayerSelectResult.Failure);
 
             return stream.ToArray();
         }

src/Ryujinx.HLE/Ryujinx.HLE.csproj

@@ -59,6 +59,7 @@
     <EmbeddedResource Include="HOS\Applets\SoftwareKeyboard\Resources\Icon_BtnB.png" />
     <EmbeddedResource Include="HOS\Applets\SoftwareKeyboard\Resources\Icon_KeyF6.png" />
     <EmbeddedResource Include="HOS\Services\Account\Acc\DefaultUserImage.jpg" />
+    <EmbeddedResource Include="HOS\Services\Account\Acc\GuestUserImage.jpg" />
   </ItemGroup>
 
 </Project>

src/Ryujinx.HLE/UI/IHostUIHandler.cs

@@ -1,4 +1,5 @@
 using Ryujinx.HLE.HOS.Applets;
+using Ryujinx.HLE.HOS.Services.Account.Acc;
 using Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.ApplicationProxy.Types;
 
 namespace Ryujinx.HLE.UI
@@ -48,7 +49,8 @@ namespace Ryujinx.HLE.UI
         /// Displays a Message Dialog box specific to Error Applet and blocks until it is closed.
         /// </summary>
         /// <returns>False when OK is pressed, True when another button (Details) is pressed.</returns>
-        bool DisplayErrorAppletDialog(string title, string message, string[] buttonsText);
+        // ReSharper disable once UnusedParameter.Global
+        bool DisplayErrorAppletDialog(string title, string message, string[] buttonsText, (uint Module, uint Description)? errorCode = null);
 
         /// <summary>
         /// Creates a handler to process keyboard inputs into text strings.
@@ -65,5 +67,10 @@ namespace Ryujinx.HLE.UI
         /// Takes a screenshot from the current renderer and saves it in the screenshots folder.
         /// </summary>
         void TakeScreenshot();
+
+        /// <summary>
+        /// Displays the player select dialog and returns the selected profile.
+        /// </summary>
+        UserProfile ShowPlayerSelectDialog();
     }
 }

src/Ryujinx.UI.Common/Configuration/ConfigurationFileFormat.cs

@@ -439,6 +439,11 @@ namespace Ryujinx.UI.Common.Configuration
         /// </summary>
         public GraphicsBackend GraphicsBackend { get; set; }
 
+        /// <summary>
+        /// Vulkan translation layer
+        /// </summary>
+        public TranslationLayer TranslationLayer { get; set; }
+
         /// <summary>
         /// Preferred GPU
         /// </summary>

src/Ryujinx.UI.Common/Configuration/ConfigurationState.cs

@@ -587,6 +587,11 @@ namespace Ryujinx.UI.Common.Configuration
             /// </summary>
             public ReactiveObject<GraphicsBackend> GraphicsBackend { get; private set; }
 
+            /// <summary>
+            /// Vulkan translation layer
+            /// </summary>
+            public ReactiveObject<TranslationLayer> TranslationLayer { get; private set; }
+
             /// <summary>
             /// Applies anti-aliasing to the renderer.
             /// </summary>
@@ -639,6 +644,8 @@ namespace Ryujinx.UI.Common.Configuration
                 EnableTextureRecompression.Event += static (_, e) => LogValueChange(e, nameof(EnableTextureRecompression));
                 GraphicsBackend = new ReactiveObject<GraphicsBackend>();
                 GraphicsBackend.Event += static (_, e) => LogValueChange(e, nameof(GraphicsBackend));
+                TranslationLayer = new ReactiveObject<TranslationLayer>();
+                TranslationLayer.Event += static (_, e) => LogValueChange(e, nameof(TranslationLayer));
                 PreferredGpu = new ReactiveObject<string>();
                 PreferredGpu.Event += static (_, e) => LogValueChange(e, nameof(PreferredGpu));
                 EnableMacroHLE = new ReactiveObject<bool>();
@@ -935,6 +942,7 @@ namespace Ryujinx.UI.Common.Configuration
                 ControllerConfig = [],
                 InputConfig = Hid.InputConfig,
                 GraphicsBackend = Graphics.GraphicsBackend,
+                TranslationLayer = Graphics.TranslationLayer,
                 PreferredGpu = Graphics.PreferredGpu,
                 MultiplayerLanInterfaceId = Multiplayer.LanInterfaceId,
                 MultiplayerMode = Multiplayer.Mode,
@@ -958,6 +966,7 @@ namespace Ryujinx.UI.Common.Configuration
             Graphics.MaxAnisotropy.Value = -1.0f;
             Graphics.AspectRatio.Value = AspectRatio.Fixed16x9;
             Graphics.GraphicsBackend.Value = DefaultGraphicsBackend();
+            Graphics.TranslationLayer.Value = TranslationLayer.MoltenVK;
             Graphics.PreferredGpu.Value = "";
             Graphics.ShadersDumpPath.Value = "";
             Graphics.TexturesDumpPath.Value = "";
@@ -1806,6 +1815,15 @@ namespace Ryujinx.UI.Common.Configuration
                 configurationFileUpdated = true;
             }
 
+            if (configurationFileFormat.Version < 62)
+            {
+                Ryujinx.Common.Logging.Logger.Warning?.Print(LogClass.Application, $"Outdated configuration version {configurationFileFormat.Version}, migrating to version 62.");
+
+                configurationFileFormat.TranslationLayer = TranslationLayer.MoltenVK;
+
+                configurationFileUpdated = true;
+            }
+
             Logger.EnableFileLog.Value = configurationFileFormat.EnableFileLog;
             Graphics.ResScale.Value = configurationFileFormat.ResScale;
             Graphics.ResScaleCustom.Value = configurationFileFormat.ResScaleCustom;
@@ -1818,6 +1836,7 @@ namespace Ryujinx.UI.Common.Configuration
             Graphics.EnableTextureRealTimeEdit.Value = configurationFileFormat.GraphicsEnableTextureRealTimeEdit;
             Graphics.BackendThreading.Value = configurationFileFormat.BackendThreading;
             Graphics.GraphicsBackend.Value = configurationFileFormat.GraphicsBackend;
+            Graphics.TranslationLayer.Value = configurationFileFormat.TranslationLayer;
             Graphics.PreferredGpu.Value = configurationFileFormat.PreferredGpu;
             Graphics.AntiAliasing.Value = configurationFileFormat.AntiAliasing;
             Graphics.ScalingFilter.Value = configurationFileFormat.ScalingFilter;

src/Ryujinx.UI.Common/Helper/CommandLineState.cs

@@ -12,6 +12,7 @@ namespace Ryujinx.UI.Common.Helper
         public static bool? OverrideDockedMode { get; private set; }
         public static bool? OverrideHardwareAcceleration { get; private set; }
         public static string OverrideGraphicsBackend { get; private set; }
+        public static string OverrideTranslationLayer { get; private set; }
         public static string OverrideBackendThreading { get; private set; }
         public static string OverrideHideCursor { get; private set; }
         public static string BaseDirPathArg { get; private set; }
@@ -109,6 +110,16 @@ namespace Ryujinx.UI.Common.Helper
 
                         OverrideGraphicsBackend = args[++i];
                         break;
+                    case "--translation-layer":
+                        if (i + 1 >= args.Length)
+                        {
+                            Logger.Error?.Print(LogClass.Application, $"Invalid option '{arg}'");
+
+                            continue;
+                        }
+
+                        OverrideTranslationLayer = args[++i];
+                        break;
                     case "--backend-threading":
                         if (i + 1 >= args.Length)
                         {

src/Ryujinx/AppHost.cs

@@ -43,7 +43,6 @@ using Ryujinx.UI.App.Common;
 using Ryujinx.UI.Common;
 using Ryujinx.UI.Common.Configuration;
 using Ryujinx.UI.Common.Helper;
-using Silk.NET.Vulkan;
 using SkiaSharp;
 using SPB.Graphics.Exceptions;
 using SPB.Graphics.Vulkan;
@@ -939,10 +938,11 @@ namespace Ryujinx.Ava
             if (ConfigurationState.Instance.Graphics.GraphicsBackend.Value == GraphicsBackend.Vulkan)
             {
                 renderer = new VulkanRenderer(
-                    Vk.GetApi(),
+                    VulkanSpbApi.GetApiFromSpb(),
                     ((EmbeddedWindowVulkan)RendererHost.EmbeddedWindow).CreateSurface,
                     VulkanHelper.GetRequiredInstanceExtensions,
-                    ConfigurationState.Instance.Graphics.PreferredGpu.Value);
+                    ConfigurationState.Instance.Graphics.PreferredGpu.Value,
+                    ConfigurationState.Instance.Graphics.TranslationLayer.Value);
             }
             else
             {
@@ -1183,7 +1183,12 @@ namespace Ryujinx.Ava
         {
             _viewModel.BackendText = ConfigurationState.Instance.Graphics.GraphicsBackend.Value switch
             {
-                GraphicsBackend.Vulkan => "Vulkan",
+                GraphicsBackend.Vulkan when !OperatingSystem.IsMacOS() => "Vulkan",
+                GraphicsBackend.Vulkan when Environment.GetEnvironmentVariable("VK_DRIVER_FILES")!.Contains("MoltenVK")
+                    => "MoltenVK",
+                GraphicsBackend.Vulkan when
+                    Environment.GetEnvironmentVariable("VK_DRIVER_FILES")!.Contains("kosmickrisp") => "KosmicKrisp",
+                GraphicsBackend.Vulkan => _viewModel.BackendText,
                 GraphicsBackend.OpenGl => "OpenGL",
                 _ => throw new NotImplementedException()
             };

src/Ryujinx/Assets/Locales/en_US.json

@@ -189,6 +189,8 @@
   "SettingsTabSystemIgnoreControllerApplet": "Ignore Controller Applet",
   "SettingsTabGraphics": "Graphics",
   "SettingsTabGraphicsAPI": "Graphics API",
+  "SettingsTabTranslationLayer": "Translation Layer (Vulkan):",
+  "SettingsTabTranslationLayerTooltip": "MoltenVK is a Vulkan Portability implementation, enabling Vulkan applications to run on macOS.\n\nKosmicKrisp is a Vulkan (1.3) conformant Vulkan-on-Metal driver and the eventual successor to MoltenVK.\n\nKosmicKrisp is not yet feature-complete, meaning that games *may* not render correctly or possibly even crash.\n\nUse MoltenVK if unsure.",
   "SettingsTabGraphicsEnableShaderCache": "Enable Shader Cache",
   "SettingsTabGraphicsAnisotropicFiltering": "Anisotropic Filtering:",
   "SettingsTabGraphicsAnisotropicFilteringAuto": "Auto",

src/Ryujinx/Headless/HeadlessRyujinx.Init.cs

@@ -289,7 +289,7 @@ namespace Ryujinx.Headless
             if (options.GraphicsBackend == GraphicsBackend.Vulkan && window is VulkanWindow vulkanWindow)
             {
                 string preferredGpuId = string.Empty;
-                Vk api = Vk.GetApi();
+                Vk api = VulkanSpbApi.GetApiFromSpb();
 
                 if (!string.IsNullOrEmpty(options.PreferredGPUVendor))
                 {
@@ -310,7 +310,8 @@ namespace Ryujinx.Headless
                     api,
                     (instance, _) => new SurfaceKHR((ulong)(vulkanWindow.CreateWindowSurface(instance.Handle))),
                     VulkanWindow.GetRequiredInstanceExtensions,
-                    preferredGpuId);
+                    preferredGpuId,
+                    options.TranslationLayer);
             }
 
             return new OpenGLRenderer();

src/Ryujinx/Headless/HeadlessRyujinx.cs

@@ -12,7 +12,6 @@ using Ryujinx.Cpu;
 using Ryujinx.Graphics.GAL;
 using Ryujinx.Graphics.Gpu;
 using Ryujinx.Graphics.Gpu.Shader;
-using Ryujinx.Graphics.Vulkan.MoltenVK;
 using Ryujinx.HLE;
 using Ryujinx.HLE.FileSystem;
 using Ryujinx.HLE.HOS;
@@ -74,11 +73,6 @@ namespace Ryujinx.Headless
                 };
             }
 
-            if (OperatingSystem.IsMacOS())
-            {
-                MVKInitialization.InitializeResolver();
-            }
-
             Parser.Default.ParseArguments<Options>(args)
             .WithParsed(options => Load(args, options))
             .WithNotParsed(errors => errors.Output());

src/Ryujinx/Headless/Options.cs

@@ -131,7 +131,10 @@ namespace Ryujinx.Headless
             
             if (NeedsOverride(nameof(GraphicsBackend)))
                 GraphicsBackend = configurationState.Graphics.GraphicsBackend;
-            
+
+            if (NeedsOverride(nameof(TranslationLayer)))
+                TranslationLayer = configurationState.Graphics.TranslationLayer;
+
             if (NeedsOverride(nameof(AntiAliasing)))
                 AntiAliasing = configurationState.Graphics.AntiAliasing;
             
@@ -370,6 +373,9 @@ namespace Ryujinx.Headless
         [Option("graphics-backend", Required = false, Default = GraphicsBackend.Vulkan, HelpText = "Change Graphics Backend to use.")]
         public GraphicsBackend GraphicsBackend { get; set; }
 
+        [Option("translation-layer", Required = false, Default = TranslationLayer.MoltenVK, HelpText = "Change Translation Layer to use.")]
+        public TranslationLayer TranslationLayer { get; set; }
+
         [Option("preferred-gpu-vendor", Required = false, Default = "", HelpText = "When using the Vulkan backend, prefer using the GPU from the specified vendor.")]
         public string PreferredGPUVendor { get; set; }
 

src/Ryujinx/Headless/WindowBase.cs

@@ -10,6 +10,7 @@ using Ryujinx.Graphics.GAL.Multithreading;
 using Ryujinx.Graphics.Gpu;
 using Ryujinx.Graphics.OpenGL;
 using Ryujinx.HLE.HOS.Applets;
+using Ryujinx.HLE.HOS.Services.Account.Acc;
 using Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.ApplicationProxy.Types;
 using Ryujinx.HLE.Loaders.Processes;
 using Ryujinx.HLE.UI;
@@ -28,6 +29,7 @@ using static SDL.SDL3;
 using AntiAliasing = Ryujinx.Common.Configuration.AntiAliasing;
 using ScalingFilter = Ryujinx.Common.Configuration.ScalingFilter;
 using Switch = Ryujinx.HLE.Switch;
+using UserProfile = Ryujinx.HLE.HOS.Services.Account.Acc.UserProfile;
 
 namespace Ryujinx.Headless
 {
@@ -531,7 +533,7 @@ namespace Ryujinx.Headless
             Exit();
         }
 
-        public bool DisplayErrorAppletDialog(string title, string message, string[] buttonsText)
+        public bool DisplayErrorAppletDialog(string title, string message, string[] buttonsText, (uint Module, uint Description)? errorCode = null)
         {
             SDL_MessageBoxButtonData[] buttons = new SDL_MessageBoxButtonData[buttonsText.Length];
 
@@ -590,5 +592,10 @@ namespace Ryujinx.Headless
         {
             throw new NotImplementedException();
         }
+        
+        public UserProfile ShowPlayerSelectDialog()
+        {
+            return AccountSaveDataManager.GetLastUsedUser();
+        }
     }
 }

src/Ryujinx/Program.cs

@@ -8,8 +8,6 @@ using Ryujinx.Common.GraphicsDriver;
 using Ryujinx.Common.Logging;
 using Ryujinx.Common.SystemInterop;
 using Ryujinx.Common.Utilities;
-using Ryujinx.Graphics.RenderDocApi;
-using Ryujinx.Graphics.Vulkan.MoltenVK;
 using Ryujinx.Headless;
 using Ryujinx.Modules;
 using Ryujinx.SDL3.Common;
@@ -27,7 +25,6 @@ namespace Ryujinx.Ava
 {
     internal partial class Program
     {
-        //
         public static double WindowScaleFactor { get; set; }
         public static double DesktopScaleFactor { get; set; } = 1.0;
         public static string Version { get; private set; }
@@ -115,11 +112,6 @@ namespace Ryujinx.Ava
             // Parse arguments
             CommandLineState.ParseArguments(args);
 
-            if (OperatingSystem.IsMacOS())
-            {
-                MVKInitialization.InitializeResolver();
-            }
-
             // Delete backup files after updating.
             Task.Run(Updater.CleanupUpdate);
 
@@ -219,19 +211,32 @@ namespace Ryujinx.Ava
 
             UseHardwareAcceleration = ConfigurationState.Instance.EnableHardwareAcceleration.Value;
 
-            // Check if graphics backend was overridden
-            if (CommandLineState.OverrideGraphicsBackend != null)
+            // Change graphics backend from OpenGL to Vulkan on macOS
+            if (OperatingSystem.IsMacOS() && (ConfigurationState.Instance.Graphics.GraphicsBackend.Value == GraphicsBackend.OpenGl))
             {
-                if (CommandLineState.OverrideGraphicsBackend.ToLower() == "opengl")
-                {
-                    ConfigurationState.Instance.Graphics.GraphicsBackend.Value = GraphicsBackend.OpenGl;
-                }
-                else if (CommandLineState.OverrideGraphicsBackend.ToLower() == "vulkan")
-                {
-                    ConfigurationState.Instance.Graphics.GraphicsBackend.Value = GraphicsBackend.Vulkan;
-                }
+                ConfigurationState.Instance.Graphics.GraphicsBackend.Value = GraphicsBackend.Vulkan;
             }
 
+            // Check if graphics backend was overridden
+            if (CommandLineState.OverrideGraphicsBackend is not null)
+            {
+                ConfigurationState.Instance.Graphics.GraphicsBackend.Value = CommandLineState.OverrideGraphicsBackend.ToLower() switch
+                    {
+                        "opengl" => GraphicsBackend.OpenGl,
+                        "vulkan" => GraphicsBackend.Vulkan,
+                        _ => ConfigurationState.Instance.Graphics.GraphicsBackend.Value
+                    };
+            }
+
+            // Check if translation layer was overridden
+            if (CommandLineState.OverrideTranslationLayer is not null)
+                ConfigurationState.Instance.Graphics.TranslationLayer.Value = CommandLineState.OverrideTranslationLayer.ToLower() switch
+                {
+                    "moltenvk" => TranslationLayer.MoltenVK,
+                    "kosmickrisp" => TranslationLayer.KosmicKrisp,
+                    _ => ConfigurationState.Instance.Graphics.TranslationLayer.Value
+                };
+
             // Check if backend threading was overridden
             if (CommandLineState.OverrideBackendThreading is not null)
                 ConfigurationState.Instance.Graphics.BackendThreading.Value = CommandLineState.OverrideBackendThreading.ToLower() switch

src/Ryujinx/Ryujinx.csproj

@@ -47,11 +47,12 @@
     <PackageReference Include="Ryujinx.Graphics.Nvdec.Dependencies.Linux" Condition="'$(RuntimeIdentifier)' == 'linux-x64' OR '$(RuntimeIdentifier)' == 'linux-arm64'" />
     <PackageReference Include="Ryujinx.Graphics.Nvdec.Dependencies.macOS" Condition="'$(RuntimeIdentifier)' == 'osx-x64' OR '$(RuntimeIdentifier)' == 'osx-arm64'" />
     <PackageReference Include="Ryujinx.Graphics.Nvdec.Dependencies.Windows" Condition="'$(RuntimeIdentifier)' == 'win-x64' OR '$(RuntimeIdentifier)' == 'win-arm64'" />
+    <PackageReference Include="Ryujinx.Graphics.Vulkan.KosmicKrisp" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'linux-arm64' AND '$(RuntimeIdentifier)' != 'win-x64' AND '$(RuntimeIdentifier)' != 'win-arm64' AND '$(RuntimeIdentifier)' != 'osx-x64'" />
+    <PackageReference Include="Ryujinx.SPB" />
     <PackageReference Include="Ryujinx.Graphics.Vulkan.MoltenVK" Condition="'$(RuntimeIdentifier)' == 'osx-x64' OR '$(RuntimeIdentifier)' == 'osx-arm64'" />
     <PackageReference Include="Silk.NET.Vulkan" />
     <PackageReference Include="Silk.NET.Vulkan.Extensions.EXT" />
     <PackageReference Include="Silk.NET.Vulkan.Extensions.KHR" />
-    <PackageReference Include="SPB" />
     <PackageReference Include="SharpZipLib" />
   </ItemGroup>
 
@@ -90,6 +91,20 @@
     </Content>
   </ItemGroup>
 
+  <ItemGroup Condition="'$(RuntimeIdentifier)' == 'osx-arm64' OR '$(RuntimeIdentifier)' == 'osx-x64'">
+    <Content Include="..\..\distribution\macos\vulkan\icd.d\MoltenVK_icd-flat.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <TargetPath>MoltenVK_icd.json</TargetPath>
+    </Content>
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(RuntimeIdentifier)' == 'osx-arm64'">
+    <Content Include="..\..\distribution\macos\vulkan\icd.d\libkosmickrisp_icd-flat.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <TargetPath>libkosmickrisp_icd.json</TargetPath>
+    </Content>
+  </ItemGroup>
+  
   <ItemGroup Condition="'$(RuntimeIdentifier)' == 'linux-x64' OR '$(RuntimeIdentifier)' == 'linux-arm64'" >
     <Content Include="..\..\distribution\linux\Ryujinx.sh">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -169,4 +184,10 @@
   <ItemGroup>
     <TrimmerRootDescriptor Include="TrimmerRootDescriptor.xml" />
   </ItemGroup>
+  <ItemGroup>
+    <Compile Update="UI\Applet\UserSelectorDialog.axaml.cs">
+      <DependentUpon>UserSelectorDialog.axaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
 </Project>

src/Ryujinx/UI/Applet/AvaHostUIHandler.cs

@@ -1,17 +1,23 @@
 using Avalonia.Controls;
 using Avalonia.Threading;
 using FluentAvalonia.UI.Controls;
+using Gommon;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.Helpers;
+using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Ava.UI.Windows;
+using Ryujinx.Common;
 using Ryujinx.HLE;
 using Ryujinx.HLE.HOS.Applets;
 using Ryujinx.HLE.HOS.Applets.SoftwareKeyboard;
+using Ryujinx.HLE.HOS.Services.Account.Acc;
 using Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.ApplicationProxy.Types;
 using Ryujinx.HLE.UI;
 using Ryujinx.UI.Common.Configuration;
 using System;
+using System.Collections.ObjectModel;
+using System.Linq;
 using System.Threading;
 
 namespace Ryujinx.Ava.UI.Applet
@@ -215,7 +221,7 @@ namespace Ryujinx.Ava.UI.Applet
             _parent.ViewModel.AppHost?.Stop();
         }
 
-        public bool DisplayErrorAppletDialog(string title, string message, string[] buttons)
+        public bool DisplayErrorAppletDialog(string title, string message, string[] buttons, (uint Module, uint Description)? errorCode = null)
         {
             ManualResetEvent dialogCloseEvent = new(false);
 
@@ -256,11 +262,61 @@ namespace Ryujinx.Ava.UI.Applet
             return showDetails;
         }
 
-        public IDynamicTextInputHandler CreateDynamicTextInputHandler()
-        {
-            return new AvaloniaDynamicTextInputHandler(_parent);
-        }
+        public IDynamicTextInputHandler CreateDynamicTextInputHandler() => new AvaloniaDynamicTextInputHandler(_parent);
         
+        public UserProfile ShowPlayerSelectDialog()
+        {
+            UserId selected = UserId.Null;
+            byte[] defaultGuestImage = EmbeddedResources.Read("Ryujinx.HLE/HOS/Services/Account/Acc/GuestUserImage.jpg");
+            UserProfile guest = new UserProfile(new UserId("00000000000000000000000000000080"), "Guest", defaultGuestImage);
+    
+            ManualResetEvent dialogCloseEvent = new(false);
+    
+            Dispatcher.UIThread.InvokeAsync(async () =>
+            {
+                ObservableCollection<BaseModel> profiles = [];
+                NavigationDialogHost nav = new();
+                
+                _parent.AccountManager.GetAllUsers()
+                    .OrderBy(x => x.Name)
+                    .ForEach(profile => profiles.Add(new Models.UserProfile(profile, nav)));
+                
+                profiles.Add(new Models.UserProfile(guest, nav));
+                ProfileSelectorDialogViewModel viewModel = new()
+                {
+                    Profiles = profiles,
+                    SelectedUserId = _parent.AccountManager.LastOpenedUser.UserId
+                };
+                (selected, _) = await ProfileSelectorDialog.ShowInputDialog(viewModel);
+        
+                dialogCloseEvent.Set();
+            });
+    
+            dialogCloseEvent.WaitOne();
+            
+            UserProfile profile = _parent.AccountManager.LastOpenedUser;
+            if (selected == guest.UserId)
+            {
+                profile = guest;
+            }
+            else if (selected == UserId.Null)
+            {
+                profile = null;
+            }
+            else
+            {
+                foreach (UserProfile p in _parent.AccountManager.GetAllUsers())
+                {
+                    if (p.UserId == selected)
+                    {
+                        profile = p;
+                        break;
+                    }
+                }
+            }
+            return profile;
+        }
+
         public void TakeScreenshot()
         {
             _parent.ViewModel.AppHost.ScreenshotRequested = true;

src/Ryujinx/UI/Applet/ProfileSelectorDialog.axaml

@@ -0,0 +1,121 @@
+<UserControl
+    x:Class="Ryujinx.Ava.UI.Applet.ProfileSelectorDialog"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
+    xmlns:models="clr-namespace:Ryujinx.Ava.UI.Models"
+    xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
+    d:DesignHeight="450"
+    MinWidth="500"
+    d:DesignWidth="800"
+    mc:Ignorable="d"
+    Focusable="True"
+    x:DataType="viewModels:ProfileSelectorDialogViewModel">
+    
+    <UserControl.Resources>
+        <helpers:BitmapArrayValueConverter x:Key="ByteImage" />
+    </UserControl.Resources>
+    
+    <Design.DataContext>
+        <viewModels:ProfileSelectorDialogViewModel />
+    </Design.DataContext>
+    
+    <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+        <Grid.RowDefinitions>
+            <RowDefinition />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+        
+        <Border
+            CornerRadius="5"
+            BorderBrush="{DynamicResource AppListHoverBackgroundColor}"
+            BorderThickness="1">
+            
+            <ListBox
+                MaxHeight="300"
+                HorizontalAlignment="Stretch"
+                VerticalAlignment="Center"
+                Background="Transparent"
+                ItemsSource="{Binding Profiles}"
+                SelectionChanged="ProfilesList_SelectionChanged">
+                
+                <ListBox.ItemsPanel>
+                    <ItemsPanelTemplate>
+                        <WrapPanel
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Center"
+                            Orientation="Horizontal" />
+                    </ItemsPanelTemplate>
+                </ListBox.ItemsPanel>
+                
+                <ListBox.Styles>
+                    <Style Selector="ListBoxItem">
+                        <Setter Property="Margin" Value="5 5 0 5" />
+                        <Setter Property="CornerRadius" Value="5" />
+                    </Style>
+                    <Style Selector="Rectangle#SelectionIndicator">
+                        <Setter Property="Opacity" Value="0" />
+                    </Style>
+                </ListBox.Styles>
+                
+                <ListBox.DataTemplates>
+                    <DataTemplate
+                        DataType="models:UserProfile">
+                        <Grid
+                            PointerEntered="Grid_PointerEntered"
+                            PointerExited="Grid_OnPointerExited">
+                            <Border
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Stretch"
+                                ClipToBounds="True"
+                                CornerRadius="5"
+                                Background="{Binding BackgroundColor}">
+                                <StackPanel
+                                    HorizontalAlignment="Stretch"
+                                    VerticalAlignment="Stretch">
+                                    <Image
+                                        Width="96"
+                                        Height="96"
+                                        HorizontalAlignment="Stretch"
+                                        VerticalAlignment="Top"
+                                        Source="{Binding Image, Converter={StaticResource ByteImage}}" />
+                                    <TextBlock
+                                        HorizontalAlignment="Stretch"
+                                        MaxWidth="90"
+                                        Text="{Binding Name}"
+                                        TextAlignment="Center"
+                                        TextWrapping="Wrap"
+                                        TextTrimming="CharacterEllipsis"
+                                        MaxLines="2"
+                                        Margin="5" />
+                                </StackPanel>
+                            </Border>
+                        </Grid>
+                    </DataTemplate>
+                    <DataTemplate
+                        DataType="viewModels:BaseModel">
+                        <Panel
+                            Height="118"
+                            Width="96">
+                            <Panel.Styles>
+                                <Style Selector="Panel">
+                                    <Setter Property="Background" Value="{DynamicResource ListBoxBackground}" />
+                                </Style>
+                            </Panel.Styles>
+                        </Panel>
+                    </DataTemplate>
+                </ListBox.DataTemplates>
+            </ListBox>
+        </Border>
+        
+        <StackPanel
+            Grid.Row="1"
+            Margin="0 24 0 0"
+            HorizontalAlignment="Left"
+            Orientation="Horizontal"
+            Spacing="10">
+        </StackPanel>
+    </Grid>
+</UserControl>

src/Ryujinx/UI/Applet/ProfileSelectorDialog.axaml.cs

@@ -0,0 +1,125 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Input;
+using FluentAvalonia.UI.Controls;
+using Ryujinx.Ava.Common.Locale;
+using Ryujinx.Ava.UI.Controls;
+using Ryujinx.Ava.UI.Helpers;
+using Ryujinx.Ava.UI.ViewModels;
+using Ryujinx.Common.Logging;
+using Ryujinx.HLE.HOS.Services.Account.Acc;
+using Ryujinx.UI.Common.Configuration;
+using System.Collections.ObjectModel;
+using System.Threading.Tasks;
+using UserProfile = Ryujinx.Ava.UI.Models.UserProfile;
+using UserProfileSft = Ryujinx.HLE.HOS.Services.Account.Acc.UserProfile;
+
+namespace Ryujinx.Ava.UI.Applet
+{
+    public partial class ProfileSelectorDialog : UserControl
+    {
+        public ProfileSelectorDialogViewModel ViewModel { get; set; }
+
+        public ProfileSelectorDialog(ProfileSelectorDialogViewModel viewModel)
+        {
+            DataContext = ViewModel = viewModel;
+            
+            InitializeComponent();
+        }
+        
+        private void Grid_PointerEntered(object sender, PointerEventArgs e)
+        {
+            if (sender is Grid { DataContext: UserProfile profile })
+            {
+                profile.IsPointerOver = true;
+            }
+        }
+
+        private void Grid_OnPointerExited(object sender, PointerEventArgs e)
+        {
+            if (sender is Grid { DataContext: UserProfile profile })
+            {
+                profile.IsPointerOver = false;
+            }
+        }
+
+        private void ProfilesList_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            if (sender is ListBox listBox)
+            {
+                int selectedIndex = listBox.SelectedIndex;
+
+                if (selectedIndex >= 0 && selectedIndex < ViewModel.Profiles.Count)
+                {
+                    if (ViewModel.Profiles[selectedIndex] is UserProfile userProfile)
+                    {
+                        ViewModel.SelectedUserId = userProfile.UserId;
+                        Logger.Info?.Print(LogClass.UI, $"Selected: {userProfile.UserId}", "ProfileSelector");
+
+                        ObservableCollection<BaseModel> newProfiles = [];
+
+                        foreach (BaseModel item in ViewModel.Profiles)
+                        {
+                            if (item is UserProfile originalItem)
+                            {
+                                UserProfileSft profile = new(originalItem.UserId, originalItem.Name, originalItem.Image);
+                                
+                                if (profile.UserId == ViewModel.SelectedUserId)
+                                {
+                                    profile.AccountState = AccountState.Open;
+                                }
+
+                                newProfiles.Add(new UserProfile(profile, new NavigationDialogHost()));
+                            }
+                        }
+
+                        ViewModel.Profiles = newProfiles;
+                    }
+                }
+            }
+        }
+
+        public static async Task<(UserId Id, bool Result)> ShowInputDialog(ProfileSelectorDialogViewModel viewModel)
+        {
+
+            if (ConfigurationState.Instance.System.SkipUserProfilesManager)
+            {
+                UserId defaultId = viewModel.SelectedUserId;
+                return (defaultId, true);
+            }
+
+            FAContentDialog contentDialog = new()
+            {
+                Title = LocaleManager.Instance[LocaleKeys.UserProfileWindowTitle],
+                PrimaryButtonText = LocaleManager.Instance[LocaleKeys.Continue],
+                SecondaryButtonText = string.Empty,
+                CloseButtonText = LocaleManager.Instance[LocaleKeys.Cancel],
+                Content = new ProfileSelectorDialog(viewModel),
+                Padding = new Thickness(0)
+            };
+
+            UserId result = UserId.Null;
+            bool input = false;
+            
+            contentDialog.Closed += Handler;
+
+            await ContentDialogHelper.ShowAsync(contentDialog);
+
+            return (result, input);
+            
+            void Handler(FAContentDialog sender, FAContentDialogClosedEventArgs eventArgs)
+            {
+                if (eventArgs.Result == FAContentDialogResult.Primary)
+                {
+                    result = viewModel.SelectedUserId;
+                    input = true;
+                }
+                else
+                {
+                    result = UserId.Null;
+                    input = false;
+                }
+            }
+        }
+    }
+}

src/Ryujinx/UI/ViewModels/ProfileSelectorDialogViewModel.cs

@@ -0,0 +1,14 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+using Ryujinx.HLE.HOS.Services.Account.Acc;
+using System.Collections.ObjectModel;
+
+namespace Ryujinx.Ava.UI.ViewModels
+{
+    public partial class ProfileSelectorDialogViewModel : BaseModel
+    {
+
+        [ObservableProperty] private UserId _selectedUserId;
+
+        [ObservableProperty] private ObservableCollection<BaseModel> _profiles = [];
+    }
+}

src/Ryujinx/UI/ViewModels/SettingsViewModel.cs

@@ -118,6 +118,8 @@ namespace Ryujinx.Ava.UI.ViewModels
 
         public bool IsHypervisorAvailable => OperatingSystem.IsMacOS() && RuntimeInformation.ProcessArchitecture == Architecture.Arm64;
 
+        public bool IsKosmicKrispAvailable => OperatingSystem.IsMacOSVersionAtLeast(15);
+
         public bool GameDirectoryChanged
         {
             get => _gameDirectoryChanged;
@@ -317,12 +319,22 @@ namespace Ryujinx.Ava.UI.ViewModels
             get;
             set
             {
-                field = value;
+                field = IsMacOS ? 0 : value;
                 OnPropertyChanged();
                 OnPropertyChanged(nameof(IsVulkanSelected));
             }
         }
 
+        public int TranslationLayerIndex
+        {
+            get;
+            set
+            {
+                field = value;
+                OnPropertyChanged();
+            }
+        }
+
         public int ScalingFilter
         {
             get => _scalingFilter;
@@ -626,6 +638,7 @@ namespace Ryujinx.Ava.UI.ViewModels
 
             // Graphics
             GraphicsBackendIndex = (int)config.Graphics.GraphicsBackend.Value;
+            TranslationLayerIndex = (int)config.Graphics.TranslationLayer.Value;
             // Physical devices are queried asynchronously hence the preferred index config value is loaded in LoadAvailableGpus().
             EnableShaderCache = config.Graphics.EnableShaderCache;
             EnableTextureRecompression = config.Graphics.EnableTextureRecompression;
@@ -746,6 +759,7 @@ namespace Ryujinx.Ava.UI.ViewModels
 
             // Graphics
             config.Graphics.GraphicsBackend.Value = (GraphicsBackend)GraphicsBackendIndex;
+            config.Graphics.TranslationLayer.Value = (TranslationLayer)TranslationLayerIndex;
             config.Graphics.PreferredGpu.Value = _gpuIds.ElementAtOrDefault(PreferredGpuIndex);
             config.Graphics.EnableShaderCache.Value = EnableShaderCache;
             config.Graphics.EnableTextureRecompression.Value = EnableTextureRecompression;

src/Ryujinx/UI/Views/Settings/SettingsGraphicsView.axaml

@@ -28,7 +28,7 @@
                 Spacing="10">
                 <TextBlock Classes="h1" Text="{locale:Locale SettingsTabGraphicsAPI}" />
                 <StackPanel Margin="10,0,0,0" Orientation="Vertical" Spacing="10">
-                    <StackPanel Orientation="Horizontal">
+                    <StackPanel Orientation="Horizontal" IsVisible="{Binding !IsMacOS}">
                         <TextBlock VerticalAlignment="Center"
                                 ToolTip.Tip="{locale:Locale SettingsTabGraphicsBackendTooltip}"
                                 Text="{locale:Locale SettingsTabGraphicsBackend}"
@@ -45,6 +45,22 @@
                                 Content="OpenGL" />
                         </ComboBox>
                     </StackPanel>
+                    <StackPanel Orientation="Horizontal" IsVisible="{Binding IsMacOS}">
+                        <TextBlock VerticalAlignment="Center"
+                                   ToolTip.Tip="{locale:Locale SettingsTabTranslationLayerTooltip}"
+                                   Text="{locale:Locale SettingsTabTranslationLayer}"
+                                   Width="250" />
+                        <ComboBox Width="350"
+                                  HorizontalContentAlignment="Left"
+                                  ToolTip.Tip="{locale:Locale SettingsTabTranslationLayerTooltip}"
+                                  SelectedIndex="{Binding TranslationLayerIndex}">
+                            <ComboBoxItem
+                                Content="MoltenVK" />
+                            <ComboBoxItem
+                                IsEnabled="{Binding IsKosmicKrispAvailable}"
+                                Content="KosmicKrisp" />
+                        </ComboBox>
+                    </StackPanel>
                     <StackPanel Orientation="Horizontal" IsVisible="{Binding IsVulkanSelected}">
                         <TextBlock VerticalAlignment="Center"
                                 ToolTip.Tip="{locale:Locale SettingsTabGraphicsPreferredGpuTooltip}"
@@ -56,7 +72,24 @@
                                 SelectedIndex="{Binding PreferredGpuIndex}"
                                 ItemsSource="{Binding AvailableGpus}"/>
                     </StackPanel>
-                </StackPanel>
+                        <StackPanel Orientation="Horizontal">
+                            <TextBlock VerticalAlignment="Center"
+                                       ToolTip.Tip="{locale:Locale GraphicsBackendThreadingTooltip}"
+                                       Text="{locale:Locale SettingsTabGraphicsBackendMultithreading}"
+                                       Width="250" />
+                            <ComboBox Width="350"
+                                      HorizontalContentAlignment="Left"
+                                      ToolTip.Tip="{locale:Locale GalThreadingTooltip}"
+                                      SelectedIndex="{Binding GraphicsBackendMultithreadingIndex}">
+                                <ComboBoxItem
+                                    Content="{locale:Locale CommonAuto}" />
+                                <ComboBoxItem
+                                    Content="{locale:Locale CommonOff}" />
+                                <ComboBoxItem
+                                    Content="{locale:Locale CommonOn}" />
+                            </ComboBox>
+                        </StackPanel>
+                    </StackPanel>
                 <Separator Height="1" />
                 <TextBlock Classes="h1" Text="{locale:Locale SettingsTabGraphicsFeatures}" />
                 <StackPanel Margin="10,0,0,0" Orientation="Vertical" Spacing="10">