From 548bfd60a2468aa6258675efae5ed21102985cc6 Mon Sep 17 00:00:00 2001 From: Mary-nyan Date: Thu, 24 Nov 2022 20:13:16 +0100 Subject: chore: Update Ryujinx.SDL2-CS to 2.24.2 (#3892) * chore: Update Ryujinx.SDL2-CS to 2.24.2 * Disable SDL_HINT_JOYSTICK_HIDAPI_COMBINE_JOY_CONS --- Ryujinx.Headless.SDL2/Vulkan/VulkanWindow.cs | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'Ryujinx.Headless.SDL2/Vulkan') 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++) { -- cgit v1.2.3