diff options
| author | Mary-nyan <mary@mary.zone> | 2022-11-24 20:13:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-24 20:13:16 +0100 |
| commit | 548bfd60a2468aa6258675efae5ed21102985cc6 (patch) | |
| tree | ddd0271286d5d338ca204499b6d0d4ae73e4bd3c /Ryujinx.Headless.SDL2/Vulkan/VulkanWindow.cs | |
| parent | 65778a6b78ab8bde4090478482227e40c551db4d (diff) | |
chore: Update Ryujinx.SDL2-CS to 2.24.2 (#3892)1.1.383
* chore: Update Ryujinx.SDL2-CS to 2.24.2
* Disable SDL_HINT_JOYSTICK_HIDAPI_COMBINE_JOY_CONS
Diffstat (limited to 'Ryujinx.Headless.SDL2/Vulkan/VulkanWindow.cs')
| -rw-r--r-- | Ryujinx.Headless.SDL2/Vulkan/VulkanWindow.cs | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/Ryujinx.Headless.SDL2/Vulkan/VulkanWindow.cs b/Ryujinx.Headless.SDL2/Vulkan/VulkanWindow.cs index 0fcf517b..6eacadc1 100644 --- a/Ryujinx.Headless.SDL2/Vulkan/VulkanWindow.cs +++ b/Ryujinx.Headless.SDL2/Vulkan/VulkanWindow.cs @@ -40,20 +40,16 @@ namespace Ryujinx.Headless.SDL2.Vulkan return (IntPtr)surfaceHandle; } - // TODO: Fix this in SDL2-CS. - [DllImport("SDL2", EntryPoint = "SDL_Vulkan_GetInstanceExtensions", CallingConvention = CallingConvention.Cdecl)] - public static extern SDL_bool SDL_Vulkan_GetInstanceExtensions_Workaround(IntPtr window, out uint count, IntPtr names); - public unsafe string[] GetRequiredInstanceExtensions() { - if (SDL_Vulkan_GetInstanceExtensions_Workaround(WindowHandle, out uint extensionsCount, IntPtr.Zero) == SDL_bool.SDL_TRUE) + if (SDL_Vulkan_GetInstanceExtensions(WindowHandle, out uint extensionsCount, IntPtr.Zero) == SDL_bool.SDL_TRUE) { IntPtr[] rawExtensions = new IntPtr[(int)extensionsCount]; string[] extensions = new string[(int)extensionsCount]; fixed (IntPtr* rawExtensionsPtr = rawExtensions) { - if (SDL_Vulkan_GetInstanceExtensions_Workaround(WindowHandle, out extensionsCount, (IntPtr)rawExtensionsPtr) == SDL_bool.SDL_TRUE) + if (SDL_Vulkan_GetInstanceExtensions(WindowHandle, out extensionsCount, (IntPtr)rawExtensionsPtr) == SDL_bool.SDL_TRUE) { for (int i = 0; i < extensions.Length; i++) { |