From 37f5d66c10a13a30b246ff14ec9605ff45afd5ff Mon Sep 17 00:00:00 2001 From: Steveice10 <1269164+Steveice10@users.noreply.github.com> Date: Sat, 26 Aug 2023 03:49:08 -0700 Subject: [PATCH] sdl: Fix surface initialization on macOS. (#49) * sdl: Fix surface initialization on macOS. * sdl: Fix render window events not being handled under Vulkan. --- src/citra/emu_window/emu_window_sdl2_vk.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/citra/emu_window/emu_window_sdl2_vk.cpp b/src/citra/emu_window/emu_window_sdl2_vk.cpp index 51dda19b9..b7e46e1a3 100644 --- a/src/citra/emu_window/emu_window_sdl2_vk.cpp +++ b/src/citra/emu_window/emu_window_sdl2_vk.cpp @@ -61,7 +61,7 @@ EmuWindow_SDL2_VK::EmuWindow_SDL2_VK(Core::System& system, bool fullscreen, bool #ifdef SDL_VIDEO_DRIVER_COCOA case SDL_SYSWM_TYPE::SDL_SYSWM_COCOA: window_info.type = Frontend::WindowSystemType::MacOS; - window_info.render_surface = SDL_Metal_CreateView(render_window); + window_info.render_surface = SDL_Metal_GetLayer(SDL_Metal_CreateView(render_window)); break; #endif #ifdef SDL_VIDEO_DRIVER_ANDROID @@ -76,6 +76,8 @@ EmuWindow_SDL2_VK::EmuWindow_SDL2_VK(Core::System& system, bool fullscreen, bool break; } + render_window_id = SDL_GetWindowID(render_window); + OnResize(); OnMinimalClientAreaChangeRequest(GetActiveConfig().min_client_area_size); SDL_PumpEvents();