diff options
| author | JMC47 <JMC4789@gmail.com> | 2020-03-12 03:52:47 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-12 03:52:47 -0400 |
| commit | 15acce847d44564afcc5b49ef26171fe4c4e51d2 (patch) | |
| tree | 92fb4573007ef87e27f5a7d7518e59f780fd9dec /Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp | |
| parent | bb7623e3ba4c5ed1d7089e6c9be388d0f0272c2e (diff) | |
| parent | cdb0aa850da6fead21224eeed82df34e87e08fcc (diff) | |
Merge pull request #8666 from stenzek/fix-macos-vulkan-yet-again
Fix Vulkan/MoltenVK on macOS yet again
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp')
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
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(); } |