VideoBackends: Pass window system info from host on creation

4 files changed, 7 insertions, 6 deletions

diff --git a/Source/Core/VideoBackends/Software/SWOGLWindow.cpp b/Source/Core/VideoBackends/Software/SWOGLWindow.cpp
index fb6731b4b7..d9694c17aa 100644
--- a/Source/Core/VideoBackends/Software/SWOGLWindow.cpp
+++ b/Source/Core/VideoBackends/Software/SWOGLWindow.cpp
@@ -13,9 +13,9 @@
 
 std::unique_ptr<SWOGLWindow> SWOGLWindow::s_instance;
 
-void SWOGLWindow::Init(void* display_handle, void* window_handle)
+void SWOGLWindow::Init(const WindowSystemInfo& wsi)
 {
-  g_main_gl_context = GLContext::Create(display_handle, window_handle);
+  g_main_gl_context = GLContext::Create(wsi);
   if (!g_main_gl_context)
   {
     ERROR_LOG(VIDEO, "GLInterface::Create failed.");
diff --git a/Source/Core/VideoBackends/Software/SWOGLWindow.h b/Source/Core/VideoBackends/Software/SWOGLWindow.h
index a393194ed7..2d85770e61 100644
--- a/Source/Core/VideoBackends/Software/SWOGLWindow.h
+++ b/Source/Core/VideoBackends/Software/SWOGLWindow.h
@@ -12,11 +12,12 @@
 #include "VideoCommon/VideoCommon.h"
 
 class AbstractTexture;
+struct WindowSystemInfo;
 
 class SWOGLWindow
 {
 public:
-  static void Init(void* display_handle, void* window_handle);
+  static void Init(const WindowSystemInfo& wsi);
   static void Shutdown();
   void Prepare();
 
diff --git a/Source/Core/VideoBackends/Software/SWmain.cpp b/Source/Core/VideoBackends/Software/SWmain.cpp
index 2aa099e9e9..070cf74b69 100644
--- a/Source/Core/VideoBackends/Software/SWmain.cpp
+++ b/Source/Core/VideoBackends/Software/SWmain.cpp
@@ -78,11 +78,11 @@ void VideoSoftware::InitBackendInfo()
   g_Config.backend_info.AAModes = {1};
 }
 
-bool VideoSoftware::Initialize(void* display_handle, void* window_handle)
+bool VideoSoftware::Initialize(const WindowSystemInfo& wsi)
 {
   InitializeShared();
 
-  SWOGLWindow::Init(display_handle, window_handle);
+  SWOGLWindow::Init(wsi);
 
   Clipper::Init();
   Rasterizer::Init();
diff --git a/Source/Core/VideoBackends/Software/VideoBackend.h b/Source/Core/VideoBackends/Software/VideoBackend.h
index 336a96325b..bad120d6a1 100644
--- a/Source/Core/VideoBackends/Software/VideoBackend.h
+++ b/Source/Core/VideoBackends/Software/VideoBackend.h
@@ -11,7 +11,7 @@ namespace SW
 {
 class VideoSoftware : public VideoBackendBase
 {
-  bool Initialize(void* display_handle, void* window_handle) override;
+  bool Initialize(const WindowSystemInfo& wsi) override;
   void Shutdown() override;
 
   std::string GetName() const override;