Merge pull request #789 from archshift/linuxvideo

Fix for black screen on Linux upon starting a game
dolphin-emu · Aug 21, 2014 · 48f52b9 · 48f52b9 · roadsign · Aug 22, 2014
2 parents 25e29c3 + 7e2534e
commit 48f52b9
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/Source/Core/DolphinWX/GLInterface/GLX.cpp b/Source/Core/DolphinWX/GLInterface/GLX.cpp
@@ -97,6 +97,17 @@ bool cInterfaceGLX::Create(void *window_handle)
 	XWindow.Initialize(dpy);
 
 	Window parent = (Window)window_handle;
+
+	XWindowAttributes attribs;
+	if (!XGetWindowAttributes(dpy, parent, &attribs))
+	{
+		ERROR_LOG(VIDEO, "Window attribute retrieval failed");
+		return false;
+	}
+
+	s_backbuffer_width  = attribs.width;
+	s_backbuffer_height = attribs.height;
+
 	win = XWindow.CreateXWindow(parent, vi);
 	return true;
 }

diff --git a/Source/Core/DolphinWX/GLInterface/X11_Util.cpp b/Source/Core/DolphinWX/GLInterface/X11_Util.cpp
@@ -22,9 +22,16 @@ Window cX11Window::CreateXWindow(Window parent, XVisualInfo *vi)
 	// Setup window attributes
 	attr.colormap = colormap;
 
+	XWindowAttributes attribs;
+	if (!XGetWindowAttributes(dpy, parent, &attribs))
+	{
+		ERROR_LOG(VIDEO, "Window attribute retrieval failed");
+		return 0;
+	}
+
 	// Create the window
 	win = XCreateWindow(dpy, parent,
-			    0, 0, 1, 1, 0,
+			    0, 0, attribs.width, attribs.height, 0,
 			    vi->depth, InputOutput, vi->visual,
 			    CWColormap, &attr);
 	XSelectInput(dpy, parent, StructureNotifyMask);