zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2025-02-22 11:52:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

- destroy SDL window on Vulkan to OpenGL fallback

Browse source 
https://forum.zdoom.org/viewtopic.php?t=64412
This commit is contained in:
alexey.lysiuk 2019-04-23 13:05:33 +03:00
parent 23e2b1c0c0
commit 6b5f7b4763
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/posix/sdl/sdlglvideo.cpp
View file

@ -145,6 +145,14 @@ namespace Priv
} }
} }
void DestroyWindow()
{
assert(Priv::window != nullptr);
SDL_DestroyWindow(Priv::window);
Priv::window = nullptr;
}
void SetupPixelFormat(int multisample, const int *glver) void SetupPixelFormat(int multisample, const int *glver)
{ {
SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 8); SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 8);
@ -276,6 +284,11 @@ DFrameBuffer *SDLVideo::CreateFrameBuffer ()
} }
catch (CRecoverableError const&) catch (CRecoverableError const&)
{ {
if (Priv::window != nullptr)
{
Priv::DestroyWindow();
}
Priv::vulkanEnabled = false; Priv::vulkanEnabled = false;
} }
} }
@ -428,8 +441,7 @@ SystemGLFrameBuffer::SystemGLFrameBuffer(void *hMonitor, bool fullscreen)
GLContext = SDL_GL_CreateContext(Priv::window); GLContext = SDL_GL_CreateContext(Priv::window);
if (GLContext == nullptr) if (GLContext == nullptr)
{ {
SDL_DestroyWindow(Priv::window); Priv::DestroyWindow();
Priv::window = nullptr;
} }
else else
{ {
@ -447,8 +459,7 @@ SystemGLFrameBuffer::~SystemGLFrameBuffer ()
SDL_GL_DeleteContext(GLContext); SDL_GL_DeleteContext(GLContext);
} }
SDL_DestroyWindow(Priv::window); Priv::DestroyWindow();
Priv::window = nullptr;
} }
} }