From 86db015c232c301575801ea6d90225af46bd9c6c Mon Sep 17 00:00:00 2001 From: Stenzek Date: Wed, 11 Mar 2020 23:09:28 +1000 Subject: Common: Add a render_window field to WindowSystemInfo We need this because we need to pass the layer to MoltenVK, not the view handle. But the input subsystem still needs the window. --- .../Core/InputCommon/ControllerInterface/ControllerInterface.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp') diff --git a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp index 833f288da5..189738e76b 100644 --- a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp +++ b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp @@ -50,14 +50,14 @@ void ControllerInterface::Initialize(const WindowSystemInfo& wsi) m_is_populating_devices = true; #ifdef CIFACE_USE_WIN32 - ciface::Win32::Init(wsi.render_surface); + ciface::Win32::Init(wsi.render_window); #endif #ifdef CIFACE_USE_XLIB // nothing needed #endif #ifdef CIFACE_USE_OSX if (m_wsi.type == WindowSystemType::MacOS) - ciface::OSX::Init(wsi.render_surface); + ciface::OSX::Init(wsi.render_window); // nothing needed for Quartz #endif #ifdef CIFACE_USE_SDL @@ -84,7 +84,8 @@ void ControllerInterface::ChangeWindow(void* hwnd) if (!m_is_init) return; - m_wsi.render_surface = hwnd; + // This shouldn't use render_surface so no need to update it. + m_wsi.render_window = hwnd; RefreshDevices(); } -- cgit v1.2.3