From ff92357b63d2dc978b25aa5c73bbe76a72786f6b Mon Sep 17 00:00:00 2001 From: Stenzek Date: Sun, 24 May 2020 17:35:39 +1000 Subject: [PATCH] Core: Use window instead of surface for ControllerInterface updates Fixes crashes with Vulkan on macOS. --- Source/Core/Core/Core.cpp | 2 +- Source/Core/DolphinQt/MainWindow.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Core/Core.cpp b/Source/Core/Core/Core.cpp index 72b33dd37b..8bdb00d032 100644 --- a/Source/Core/Core/Core.cpp +++ b/Source/Core/Core/Core.cpp @@ -502,7 +502,7 @@ static void EmuThread(std::unique_ptr boot, WindowSystemInfo wsi } else { - g_controller_interface.ChangeWindow(wsi.render_surface); + g_controller_interface.ChangeWindow(wsi.render_window); Pad::LoadConfig(); Keyboard::LoadConfig(); } diff --git a/Source/Core/DolphinQt/MainWindow.cpp b/Source/Core/DolphinQt/MainWindow.cpp index a5180a33aa..8b8eb37f40 100644 --- a/Source/Core/DolphinQt/MainWindow.cpp +++ b/Source/Core/DolphinQt/MainWindow.cpp @@ -1083,7 +1083,7 @@ void MainWindow::HideRenderWidget(bool reinit) // The controller interface will still be registered to the old render widget, if the core // has booted. Therefore, we should re-bind it to the main window for now. When the core // is next started, it will be swapped back to the new render widget. - g_controller_interface.ChangeWindow(GetWindowSystemInfo(windowHandle()).render_surface); + g_controller_interface.ChangeWindow(GetWindowSystemInfo(windowHandle()).render_window); } }