GLContext: Get size using eglQuerySurface()

Also no longer assumes that a nullptr display is not headless (needed for fbdev)

1 files changed, 3 insertions, 3 deletions

diff --git a/Source/Core/Common/GL/GLInterface/GLX.cpp b/Source/Core/Common/GL/GLInterface/GLX.cpp
index 78814db80f..70ee8485b2 100644
--- a/Source/Core/Common/GL/GLInterface/GLX.cpp
+++ b/Source/Core/Common/GL/GLInterface/GLX.cpp
@@ -73,9 +73,9 @@ void GLContextGLX::Swap()
 
 // Create rendering window.
 // Call browser: Core.cpp:EmuThread() > main.cpp:Video_Initialize()
-bool GLContextGLX::Initialize(void* display_handle, void* window_handle, bool stereo, bool core)
+bool GLContextGLX::Initialize(const WindowSystemInfo& wsi, bool stereo, bool core)
 {
-  m_display = static_cast<Display*>(display_handle);
+  m_display = static_cast<Display*>(wsi.display_connection);
   int screen = DefaultScreen(m_display);
 
   // checking glx version
@@ -204,7 +204,7 @@ bool GLContextGLX::Initialize(void* display_handle, void* window_handle, bool st
     }
   }
 
-  if (!CreateWindowSurface(reinterpret_cast<Window>(window_handle)))
+  if (!CreateWindowSurface(reinterpret_cast<Window>(wsi.render_surface)))
   {
     ERROR_LOG(VIDEO, "Error: CreateWindowSurface failed\n");
     XSetErrorHandler(oldHandler);