Use LibraryImport for MVKConfiguration

Ryujinx · Jan 6, 2023 · c64590f · c64590f
1 parent 15483bc
commit c64590f
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 6 deletions.
diff --git a/Ryujinx.Graphics.Vulkan/MoltenVK/MVKConfiguration.cs b/Ryujinx.Graphics.Vulkan/MoltenVK/MVKConfiguration.cs
@@ -1,5 +1,5 @@
-using Silk.NET.Core;
 using System;
+using System.Runtime.InteropServices;
 
 namespace Ryujinx.Graphics.Vulkan.MoltenVK
 {
@@ -45,6 +45,25 @@ enum MVKVkSemaphoreSupportStyle : int
         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 Bool32(val);
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
     struct MVKConfiguration
     {
         public Bool32 DebugMode;

diff --git a/Ryujinx.Graphics.Vulkan/MoltenVK/MVKInitialization.cs b/Ryujinx.Graphics.Vulkan/MoltenVK/MVKInitialization.cs
@@ -6,13 +6,13 @@
 namespace Ryujinx.Graphics.Vulkan.MoltenVK
 {
     [SupportedOSPlatform("macos")]
-    public static class MVKInitialization
+    public static partial class MVKInitialization
     {
-        [DllImport("libMoltenVK.dylib")]
-        private static extern Result vkGetMoltenVKConfigurationMVK(IntPtr unusedInstance, out MVKConfiguration config, in IntPtr configSize);
+        [LibraryImport("libMoltenVK.dylib")]
+        private static partial Result vkGetMoltenVKConfigurationMVK(IntPtr unusedInstance, out MVKConfiguration config, in IntPtr configSize);
 
-        [DllImport("libMoltenVK.dylib")]
-        private static extern Result vkSetMoltenVKConfigurationMVK(IntPtr unusedInstance, in MVKConfiguration config, in IntPtr configSize);
+        [LibraryImport("libMoltenVK.dylib")]
+        private static partial Result vkSetMoltenVKConfigurationMVK(IntPtr unusedInstance, in MVKConfiguration config, in IntPtr configSize);
 
         public static void Initialize()
         {