From b976846b09403990bd5b066f4fa8bb2c5b333ec9 Mon Sep 17 00:00:00 2001
From: Louis Gombert <louisgombert@gmail.com>
Date: Fri, 21 Mar 2025 21:37:10 +0100
Subject: [PATCH] rend_SetPreferredState: allow changing resolution and
 fullscreen mode at the same time

---
 renderer/HardwareBaseGPU.cpp | 17 ++++++++---------
 renderer/HardwareOpenGL.cpp  |  3 ++-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/renderer/HardwareBaseGPU.cpp b/renderer/HardwareBaseGPU.cpp
index e8e75e9c..52305b71 100644
--- a/renderer/HardwareBaseGPU.cpp
+++ b/renderer/HardwareBaseGPU.cpp
@@ -347,18 +347,17 @@ int rend_SetPreferredState(renderer_preferred_state *pref_state, bool reinit) {
   if (gpu_state.initted) {
     LOG_DEBUG << "Inside pref state!";
 
-    // Change gamma if needed
-    if (pref_state->width != gpu_state.screen_width || pref_state->height != gpu_state.screen_height ||
-        old_state.bit_depth != pref_state->bit_depth) {
-      reinit = true;
+    if (old_state.fullscreen != pref_state->fullscreen) {
+      rend_SetFullScreen(pref_state->fullscreen);
     }
 
-    if (reinit) {
-      retval = rend_ReInit();
-    } else if (old_state.gamma != pref_state->gamma) {
+    if (pref_state->width != gpu_state.screen_width || pref_state->height != gpu_state.screen_height ||
+        old_state.bit_depth != pref_state->bit_depth || reinit) {
+      rend_ReInit();
+    }
+
+    if (old_state.gamma != pref_state->gamma) {
       rend_SetGammaValue(pref_state->gamma);
-    } else if (old_state.fullscreen != pref_state->fullscreen) {
-      rend_SetFullScreen(pref_state->fullscreen);
     }
   } else {
     gpu_preferred_state = *pref_state;
diff --git a/renderer/HardwareOpenGL.cpp b/renderer/HardwareOpenGL.cpp
index e05af6af..3f50525d 100644
--- a/renderer/HardwareOpenGL.cpp
+++ b/renderer/HardwareOpenGL.cpp
@@ -443,7 +443,7 @@ int opengl_Setup(oeApplication *app, const int *width, const int *height) {
     SDL_SetWindowRelativeMouseMode(GSDLWindow, grabMouse);
     SDL_SetWindowKeyboardGrab(GSDLWindow, grabMouse);
 
-    SDL_SetWindowFullscreen(GSDLWindow, Game_fullscreen);
+    rend_SetFullScreen(Game_fullscreen);
   } else if (!Game_fullscreen) {
     SDL_SetWindowSize(GSDLWindow, winw, winh);
   }
@@ -1140,6 +1140,7 @@ void rend_SetGammaValue(float val) {
 void rend_SetFullScreen(bool fullscreen) {
   if (GSDLWindow) {
     SDL_SetWindowFullscreen(GSDLWindow, fullscreen);
+    SDL_SyncWindow(GSDLWindow);
   }
 
   if (fullscreen) {