Commit 93fbab0fac9693c26e7764b0e5f5c36591416f59
2020-12-02T11:04:53
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).
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90
diff --git a/src/video/SDL_video.c b/src/video/SDL_video.c
index 3980e26..65aafc6 100644
--- a/src/video/SDL_video.c
+++ b/src/video/SDL_video.c
@@ -1672,6 +1672,8 @@ int
SDL_RecreateWindow(SDL_Window * window, Uint32 flags)
{
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) {
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 (flags & SDL_WINDOW_OPENGL) {
- if (SDL_GL_LoadLibrary(NULL) < 0) {
- return -1;
- }
- loaded_opengl = SDL_TRUE;
+ need_gl_load = SDL_TRUE;
} else {
- SDL_GL_UnloadLibrary();
+ need_gl_unload = SDL_TRUE;
}
} else if (window->flags & SDL_WINDOW_OPENGL) {
- SDL_GL_UnloadLibrary();
- if (SDL_GL_LoadLibrary(NULL) < 0) {
- return -1;
+ need_gl_unload = SDL_TRUE;
+ need_gl_load = 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;
}
- loaded_opengl = 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)) {
@@ -1725,28 +1732,32 @@ SDL_RecreateWindow(SDL_Window * window, Uint32 flags)
return -1;
}
- /*
- 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)) {
+ if ((flags & SDL_WINDOW_VULKAN) && (flags & SDL_WINDOW_OPENGL)) {
SDL_SetError("Vulkan and OpenGL not supported on same window");
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");
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");
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->last_fullscreen_flags = window->flags;
window->is_destroying = SDL_FALSE;