minetest/irrlicht
1
0
Fork 0
mirror of https://github.com/minetest/irrlicht.git synced 2025-07-02 16:20:27 +02:00
Code Issues Projects Releases Wiki Activity

Merging r6122 through r6127 from trunk to ogl-es branch

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6128 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
cutealien
2020-06-20 15:26:29 +00:00
parent eaefca2cd1
commit 048aa500b9
7 changed files with 150 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/Irrlicht/CNSOGLManager.mm
View File

@ -188,8 +188,9 @@ const SExposedVideoData& CNSOGLManager::getContext() const
return CurrentContext;
}
bool CNSOGLManager::activateContext(const SExposedVideoData& videoData)
bool CNSOGLManager::activateContext(const SExposedVideoData& videoData, bool restorePrimaryOnZero)
{
//TODO: handle restorePrimaryOnZero
if (videoData.OpenGLOSX.Context)
{
if ((NSOpenGLContext*)videoData.OpenGLOSX.Context != [NSOpenGLContext currentContext])