diff --git a/Source/Core/DolphinWX/GLInterface/GLInterface.h b/Source/Core/DolphinWX/GLInterface/GLInterface.h index 26c92f53d4..c57194140e 100644 --- a/Source/Core/DolphinWX/GLInterface/GLInterface.h +++ b/Source/Core/DolphinWX/GLInterface/GLInterface.h @@ -104,8 +104,6 @@ typedef struct { XSetWindowAttributes attr; std::thread xEventThread; #endif - int x, y; - unsigned int width, height; } GLWindow; extern GLWindow GLWin; diff --git a/Source/Core/DolphinWX/GLInterface/GLX.cpp b/Source/Core/DolphinWX/GLInterface/GLX.cpp index 8c9005bd81..320d0f884a 100644 --- a/Source/Core/DolphinWX/GLInterface/GLX.cpp +++ b/Source/Core/DolphinWX/GLInterface/GLX.cpp @@ -4,8 +4,6 @@ #include -#include "Core/Host.h" - #include "DolphinWX/GLInterface/GLInterface.h" #include "VideoCommon/RenderBase.h" @@ -41,13 +39,6 @@ void cInterfaceGLX::Swap() // Call browser: Core.cpp:EmuThread() > main.cpp:Video_Initialize() bool cInterfaceGLX::Create(void *&window_handle) { - int _tx, _ty, _twidth, _theight; - Host_GetRenderWindowSize(_tx, _ty, _twidth, _theight); - - // Control window size and picture scaling - s_backbuffer_width = _twidth; - s_backbuffer_height = _theight; - int glxMajorVersion, glxMinorVersion; // attributes for a single buffered visual in RGBA format with at least @@ -113,11 +104,6 @@ bool cInterfaceGLX::Create(void *&window_handle) return false; } - GLWin.x = _tx; - GLWin.y = _ty; - GLWin.width = _twidth; - GLWin.height = _theight; - XWindow.CreateXWindow(); window_handle = (void *)GLWin.win; return true; @@ -125,14 +111,6 @@ bool cInterfaceGLX::Create(void *&window_handle) bool cInterfaceGLX::MakeCurrent() { - // connect the glx-context to the window - #if defined(HAVE_WX) && (HAVE_WX) - Host_GetRenderWindowSize(GLWin.x, GLWin.y, - (int&)GLWin.width, (int&)GLWin.height); - XMoveResizeWindow(GLWin.evdpy, GLWin.win, GLWin.x, GLWin.y, - GLWin.width, GLWin.height); - #endif - bool success = glXMakeCurrent(GLWin.dpy, GLWin.win, GLWin.ctx); if (success) { diff --git a/Source/Core/DolphinWX/GLInterface/Platform.cpp b/Source/Core/DolphinWX/GLInterface/Platform.cpp index 6dc8826c46..86b12858dc 100644 --- a/Source/Core/DolphinWX/GLInterface/Platform.cpp +++ b/Source/Core/DolphinWX/GLInterface/Platform.cpp @@ -135,8 +135,6 @@ bool cPlatform::Init(EGLConfig config, void *window_handle) ANativeWindow_setBuffersGeometry((EGLNativeWindowType)Host_GetRenderHandle(), 0, 0, format); int none, width, height; Host_GetRenderWindowSize(none, none, width, height); - GLWin.width = width; - GLWin.height = height; GLInterface->SetBackBufferDimensions(width, height); #endif return true; diff --git a/Source/Core/DolphinWX/GLInterface/X11_Util.cpp b/Source/Core/DolphinWX/GLInterface/X11_Util.cpp index 06bf09fe80..a1060e8b87 100644 --- a/Source/Core/DolphinWX/GLInterface/X11_Util.cpp +++ b/Source/Core/DolphinWX/GLInterface/X11_Util.cpp @@ -19,8 +19,7 @@ bool cXInterface::ServerConnect(void) bool cXInterface::Initialize(void *config, void *window_handle) { - int _tx, _ty, _twidth, _theight; - XVisualInfo visTemplate; + XVisualInfo visTemplate; int num_visuals; EGLint vid; @@ -42,13 +41,6 @@ bool cXInterface::Initialize(void *config, void *window_handle) exit(1); } - Host_GetRenderWindowSize(_tx, _ty, _twidth, _theight); - - GLWin.x = _tx; - GLWin.y = _ty; - GLWin.width = _twidth; - GLWin.height = _theight; - GLWin.evdpy = XOpenDisplay(nullptr); GLWin.parent = (Window) window_handle; GLWin.screen = DefaultScreen(GLWin.dpy); @@ -81,7 +73,7 @@ void *cXInterface::CreateWindow(void) // Create the window GLWin.win = XCreateWindow(GLWin.evdpy, GLWin.parent, - GLWin.x, GLWin.y, GLWin.width, GLWin.height, 0, + 0, 0, 1, 1, 0, GLWin.vi->depth, InputOutput, GLWin.vi->visual, CWBorderPixel | CWBackPixel | CWColormap | CWEventMask, &GLWin.attr); wmProtocols[0] = XInternAtom(GLWin.evdpy, "WM_DELETE_WINDOW", True); @@ -131,7 +123,7 @@ void cX11Window::CreateXWindow(void) // Create the window GLWin.win = XCreateWindow(GLWin.evdpy, GLWin.parent, - GLWin.x, GLWin.y, GLWin.width, GLWin.height, 0, + 0, 0, 1, 1, 0, GLWin.vi->depth, InputOutput, GLWin.vi->visual, CWBorderPixel | CWBackPixel | CWColormap | CWEventMask, &GLWin.attr); wmProtocols[0] = XInternAtom(GLWin.evdpy, "WM_DELETE_WINDOW", True);