ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove always exiting behaviour when pausing vulkan enabled stk

Browse Source
This commit is contained in:
Benau 2022-03-28 15:30:42 +08:00
parent 0c147c0a0b
commit cd9e2f0adf
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/irrlicht/source/Irrlicht/CIrrDeviceSDL.cpp
View File

@ -388,6 +388,9 @@ bool CIrrDeviceSDL::createWindow()
os::Printer::log("Current MacOSX version doesn't support Vulkan or MoltenVK failed to load", ELL_WARNING); os::Printer::log("Current MacOSX version doesn't support Vulkan or MoltenVK failed to load", ELL_WARNING);
return false; return false;
} }
#endif
#if SDL_VERSION_ATLEAST(2, 0, 12)
SDL_SetHint(SDL_HINT_VIDEO_EXTERNAL_CONTEXT, "1");
#endif #endif
flags |= SDL_WINDOW_VULKAN; flags |= SDL_WINDOW_VULKAN;
} }
@ -417,6 +420,10 @@ bool CIrrDeviceSDL::createWindow()
if (!Window) if (!Window)
{ {
os::Printer::log( "Could not initialize display!" ); os::Printer::log( "Could not initialize display!" );
#if SDL_VERSION_ATLEAST(2, 0, 12)
if (CreationParams.DriverType == video::EDT_VULKAN)
SDL_SetHint(SDL_HINT_VIDEO_EXTERNAL_CONTEXT, "0");
#endif
return false; return false;
} }
} }
@ -626,6 +633,9 @@ void CIrrDeviceSDL::createDriver()
} }
catch (std::exception& e) catch (std::exception& e)
{ {
#if SDL_VERSION_ATLEAST(2, 0, 12)
SDL_SetHint(SDL_HINT_VIDEO_EXTERNAL_CONTEXT, "0");
#endif
os::Printer::log("createVulkanDriver failed", e.what(), ELL_ERROR); os::Printer::log("createVulkanDriver failed", e.what(), ELL_ERROR);
} }
#else #else