zaki
/
irrlicht
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle restorePrimaryOnZero in CGLXManager::activateContext 

Done similar as it was done in CWGLManager::activateContext, thought not tested as I currently have no test-case for this on X11.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@5785 dfc29bdd-3216-0410-991c-e03cc46cb475
master
cutealien 2019-03-14 22:45:55 +00:00
parent ed6d0d58fc
commit 58958c362a
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/Irrlicht/CGLXManager.cpp
View File

@ -379,6 +379,16 @@ bool CGLXManager::activateContext(const SExposedVideoData& videoData, bool resto
}
}
}
else if (!restorePrimaryOnZero && !videoData.OpenGLLinux.X11Window && !videoData.OpenGLLinux.X11Display)
{
if (!glXMakeCurrent((Display*)PrimaryContext.OpenGLLinux.X11Display, None, NULL))
{
os::Printer::log("Render Context reset failed.");
return false;
}
CurrentContext.OpenGLLinux.X11Window = 0;
CurrentContext.OpenGLLinux.X11Display = 0;
}
// set back to main context
else if (CurrentContext.OpenGLLinux.X11Display != PrimaryContext.OpenGLLinux.X11Display)
{