From 43fe02ee9b820d16d1759a1e37b666bcb1e5a298 Mon Sep 17 00:00:00 2001 From: Stenzek Date: Wed, 10 Apr 2019 14:40:19 +0000 Subject: GLContext: Get size using eglQuerySurface() Also no longer assumes that a nullptr display is not headless (needed for fbdev) --- Source/Core/Common/GL/GLInterface/GLX.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Source/Core/Common/GL/GLInterface/GLX.cpp') 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_handle); + m_display = static_cast(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_handle))) + if (!CreateWindowSurface(reinterpret_cast(wsi.render_surface))) { ERROR_LOG(VIDEO, "Error: CreateWindowSurface failed\n"); XSetErrorHandler(oldHandler); -- cgit v1.2.3