CGLXManager: Use GLX window correctly

fixes #17
minetest · Mar 12, 2021 · 57ff34b · 57ff34b
1 parent 0335a52
commit 57ff34b
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/source/Irrlicht/CGLXManager.cpp b/source/Irrlicht/CGLXManager.cpp
@@ -296,6 +296,10 @@ bool CGLXManager::generateSurface()
 
 		CurrentContext.OpenGLLinux.GLXWindow=GlxWin;
 	}
+	else
+	{
+		CurrentContext.OpenGLLinux.GLXWindow=CurrentContext.OpenGLLinux.X11Window;
+	}
 	return true;
 }
 
@@ -353,27 +357,29 @@ bool CGLXManager::activateContext(const SExposedVideoData& videoData, bool resto
 	{
 		if (videoData.OpenGLLinux.X11Display && videoData.OpenGLLinux.X11Context)
 		{
-			if (!glXMakeCurrent((Display*)videoData.OpenGLLinux.X11Display, videoData.OpenGLLinux.X11Window, (GLXContext)videoData.OpenGLLinux.X11Context))
+			if (!glXMakeCurrent((Display*)videoData.OpenGLLinux.X11Display, videoData.OpenGLLinux.GLXWindow, (GLXContext)videoData.OpenGLLinux.X11Context))
 			{
 				os::Printer::log("Context activation failed.");
 				return false;
 			}
 			else
 			{
+				CurrentContext.OpenGLLinux.GLXWindow = videoData.OpenGLLinux.GLXWindow;
 				CurrentContext.OpenGLLinux.X11Window = videoData.OpenGLLinux.X11Window;
 				CurrentContext.OpenGLLinux.X11Display = videoData.OpenGLLinux.X11Display;
 			}
 		}
 		else
 		{
 			// in case we only got a window ID, try with the existing values for display and context
-			if (!glXMakeCurrent((Display*)PrimaryContext.OpenGLLinux.X11Display, videoData.OpenGLLinux.X11Window, (GLXContext)PrimaryContext.OpenGLLinux.X11Context))
+			if (!glXMakeCurrent((Display*)PrimaryContext.OpenGLLinux.X11Display, videoData.OpenGLLinux.GLXWindow, (GLXContext)PrimaryContext.OpenGLLinux.X11Context))
 			{
 				os::Printer::log("Context activation failed.");
 				return false;
 			}
 			else
 			{
+				CurrentContext.OpenGLLinux.GLXWindow = videoData.OpenGLLinux.GLXWindow;
 				CurrentContext.OpenGLLinux.X11Window = videoData.OpenGLLinux.X11Window;
 				CurrentContext.OpenGLLinux.X11Display = PrimaryContext.OpenGLLinux.X11Display;
 			}
@@ -425,7 +431,7 @@ void CGLXManager::destroyContext()
 
 bool CGLXManager::swapBuffers()
 {
-	glXSwapBuffers((Display*)CurrentContext.OpenGLLinux.X11Display, CurrentContext.OpenGLLinux.X11Window);
+	glXSwapBuffers((Display*)CurrentContext.OpenGLLinux.X11Display, CurrentContext.OpenGLLinux.GLXWindow);
 	return true;
 }