encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SDL_ReCreateWindow: allow to unload METAL window and switch back to OpenGL. 

On older mac, where METAL Renderer METAL fails to create, it allows to switch back to OpenGL SDL_Renderer
by re-creating the window (METAL flags was previously persistent).
This commit is contained in:
Sylvain Becker 2020-12-02 11:04:53 +01:00
parent 9d40a0f317
commit 93fbab0fac
1 changed files with 30 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/video/SDL_video.c
View File

@ -1672,6 +1672,8 @@ int
SDL_RecreateWindow(SDL_Window * window, Uint32 flags) SDL_RecreateWindow(SDL_Window * window, Uint32 flags)
{ {
SDL_bool loaded_opengl = SDL_FALSE; SDL_bool loaded_opengl = SDL_FALSE;
SDL_bool need_gl_unload = SDL_FALSE;
SDL_bool need_gl_load = SDL_FALSE;
if ((flags & SDL_WINDOW_OPENGL) && !_this->GL_CreateContext) { if ((flags & SDL_WINDOW_OPENGL) && !_this->GL_CreateContext) {
return SDL_SetError("OpenGL support is either not configured in SDL " return SDL_SetError("OpenGL support is either not configured in SDL "
@ -1705,19 +1707,24 @@ SDL_RecreateWindow(SDL_Window * window, Uint32 flags)
if ((window->flags & SDL_WINDOW_OPENGL) != (flags & SDL_WINDOW_OPENGL)) { if ((window->flags & SDL_WINDOW_OPENGL) != (flags & SDL_WINDOW_OPENGL)) {
if (flags & SDL_WINDOW_OPENGL) { if (flags & SDL_WINDOW_OPENGL) {
if (SDL_GL_LoadLibrary(NULL) < 0) { need_gl_load = SDL_TRUE;
return -1;
}
loaded_opengl = SDL_TRUE;
} else { } else {
SDL_GL_UnloadLibrary(); need_gl_unload = SDL_TRUE;
} }
} else if (window->flags & SDL_WINDOW_OPENGL) { } else if (window->flags & SDL_WINDOW_OPENGL) {
SDL_GL_UnloadLibrary(); need_gl_unload = SDL_TRUE;
if (SDL_GL_LoadLibrary(NULL) < 0) { need_gl_load = SDL_TRUE;
return -1;
} }
loaded_opengl = SDL_TRUE;
if ((window->flags & SDL_WINDOW_METAL) != (flags & SDL_WINDOW_METAL)) {
if (flags & SDL_WINDOW_METAL) {
need_gl_load = SDL_TRUE;
} else {
need_gl_unload = SDL_TRUE;
}
} else if (window->flags & SDL_WINDOW_METAL) {
need_gl_unload = SDL_TRUE;
need_gl_load = SDL_TRUE;
} }
if ((window->flags & SDL_WINDOW_VULKAN) != (flags & SDL_WINDOW_VULKAN)) { if ((window->flags & SDL_WINDOW_VULKAN) != (flags & SDL_WINDOW_VULKAN)) {
@ -1725,28 +1732,32 @@ SDL_RecreateWindow(SDL_Window * window, Uint32 flags)
return -1; return -1;
} }
/* if ((flags & SDL_WINDOW_VULKAN) && (flags & SDL_WINDOW_OPENGL)) {
if ((window->flags & SDL_WINDOW_METAL) != (flags & SDL_WINDOW_METAL)) {
SDL_SetError("Can't change SDL_WINDOW_METAL window flag");
return -1;
}
*/
if ((window->flags & SDL_WINDOW_VULKAN) && (flags & SDL_WINDOW_OPENGL)) {
SDL_SetError("Vulkan and OpenGL not supported on same window"); SDL_SetError("Vulkan and OpenGL not supported on same window");
return -1; return -1;
} }
if ((window->flags & SDL_WINDOW_METAL) && (flags & SDL_WINDOW_OPENGL)) { if ((flags & SDL_WINDOW_METAL) && (flags & SDL_WINDOW_OPENGL)) {
SDL_SetError("Metal and OpenGL not supported on same window"); SDL_SetError("Metal and OpenGL not supported on same window");
return -1; return -1;
} }
if ((window->flags & SDL_WINDOW_METAL) && (flags & SDL_WINDOW_VULKAN)) { if ((flags & SDL_WINDOW_METAL) && (flags & SDL_WINDOW_VULKAN)) {
SDL_SetError("Metal and Vulkan not supported on same window"); SDL_SetError("Metal and Vulkan not supported on same window");
return -1; return -1;
} }
if (need_gl_unload) {
SDL_GL_UnloadLibrary();
}
if (need_gl_load) {
if (SDL_GL_LoadLibrary(NULL) < 0) {
return -1;
}
loaded_opengl = SDL_TRUE;
}
window->flags = ((flags & CREATE_FLAGS) | SDL_WINDOW_HIDDEN); window->flags = ((flags & CREATE_FLAGS) | SDL_WINDOW_HIDDEN);
window->last_fullscreen_flags = window->flags; window->last_fullscreen_flags = window->flags;
window->is_destroying = SDL_FALSE; window->is_destroying = SDL_FALSE;