Mirrorlandia_minetest/irrlicht
1
0
Fork 1
mirror of https://github.com/minetest/irrlicht.git synced 2024-09-20 12:29:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Separate GLX window from X11 window.

Browse Source 
Thanks @numberZero and sfan5 for patches:
c4503eaf17
57ff34b1ed
Forum: https://irrlicht.sourceforge.io/forum/viewtopic.php?p=306549#p306549


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@6370 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
cutealien 2022-05-02 16:17:03 +00:00
parent 296824e8b6
commit 9db39e8534
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/SExposedVideoData.h
View File

@ -61,6 +61,7 @@ struct SExposedVideoData
void* X11Display; void* X11Display;
void* X11Context; void* X11Context;
unsigned long X11Window; unsigned long X11Window;
unsigned long GLXWindow;
}; };
struct SOpenGLOSX struct SOpenGLOSX

14
source/Irrlicht/CGLXManager.cpp
View File

@ -294,7 +294,11 @@ bool CGLXManager::generateSurface()
return false; return false;
} }
CurrentContext.OpenGLLinux.X11Window=GlxWin; CurrentContext.OpenGLLinux.GLXWindow=GlxWin;
}
else
{
CurrentContext.OpenGLLinux.GLXWindow=CurrentContext.OpenGLLinux.X11Window;
} }
return true; return true;
} }
@ -353,13 +357,14 @@ bool CGLXManager::activateContext(const SExposedVideoData& videoData, bool resto
{ {
if (videoData.OpenGLLinux.X11Display && videoData.OpenGLLinux.X11Context) 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."); os::Printer::log("Context activation failed.");
return false; return false;
} }
else else
{ {
CurrentContext.OpenGLLinux.GLXWindow = videoData.OpenGLLinux.GLXWindow;
CurrentContext.OpenGLLinux.X11Window = videoData.OpenGLLinux.X11Window; CurrentContext.OpenGLLinux.X11Window = videoData.OpenGLLinux.X11Window;
CurrentContext.OpenGLLinux.X11Display = videoData.OpenGLLinux.X11Display; CurrentContext.OpenGLLinux.X11Display = videoData.OpenGLLinux.X11Display;
} }
@ -367,13 +372,14 @@ bool CGLXManager::activateContext(const SExposedVideoData& videoData, bool resto
else else
{ {
// in case we only got a window ID, try with the existing values for display and context // 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."); os::Printer::log("Context activation failed.");
return false; return false;
} }
else else
{ {
CurrentContext.OpenGLLinux.GLXWindow = videoData.OpenGLLinux.GLXWindow;
CurrentContext.OpenGLLinux.X11Window = videoData.OpenGLLinux.X11Window; CurrentContext.OpenGLLinux.X11Window = videoData.OpenGLLinux.X11Window;
CurrentContext.OpenGLLinux.X11Display = PrimaryContext.OpenGLLinux.X11Display; CurrentContext.OpenGLLinux.X11Display = PrimaryContext.OpenGLLinux.X11Display;
} }
@ -425,7 +431,7 @@ void CGLXManager::destroyContext()
bool CGLXManager::swapBuffers() bool CGLXManager::swapBuffers()
{ {
glXSwapBuffers((Display*)CurrentContext.OpenGLLinux.X11Display, CurrentContext.OpenGLLinux.X11Window); glXSwapBuffers((Display*)CurrentContext.OpenGLLinux.X11Display, CurrentContext.OpenGLLinux.GLXWindow);
return true; return true;
} }

4
tests/tests-last-passed-at.txt
View File

@ -1,4 +1,4 @@
Tests finished. 72 tests of 72 passed. Tests finished. 72 tests of 72 passed.
Compiled as RELEASE Compiled as DEBUG
Test suite pass at GMT Sat Apr 30 22:54:30 2022 Test suite pass at GMT Mon May 2 16:15:12 2022