always try to load FBO extensions in case user enables r_fbo later

[d2df-sdl.git] / src / game / sdl2 / g_system.pas

diff --git a/src/game/sdl2/g_system.pas b/src/game/sdl2/g_system.pas
index 89cebaf02b5e84d292118595e878a4a17e680f52..e4bd07046a8576bbecdc7763b13cbe282295e062 100644 (file)
--- a/src/game/sdl2/g_system.pas
+++ b/src/game/sdl2/g_system.pas
@@ -157,17 +157,15 @@ implementation
         if context <> nil then
         begin
           {$IFDEF NOGL_INIT}
-            nogl_Init;
-            glRenderToFBO := False; // TODO: check for GL_OES_framebuffer_object
+          nogl_Init;
+          if (not nogl_ExtensionSupported('GL_OES_framebuffer_object')) and glRenderToFBO then
           {$ELSE}
-            if glRenderToFBO then
-              if not Load_GL_ARB_framebuffer_object() then
-                if not Load_GL_EXT_framebuffer_object() then
-                begin
-                  e_LogWriteln('SDL: no framebuffer support detected');
-                  glRenderToFBO := False
-                end;
+          if (not Load_GL_ARB_framebuffer_object()) and glRenderToFBO then
           {$ENDIF}
+          begin
+            e_LogWriteln('SDL: no framebuffer object support detected');
+            glRenderToFBO := False
+          end;
           if (fullscreen = false) and (maximized = false) and (wc = false) then
           begin
             SDL_GetWindowPosition(window, @x, @y);
@@ -193,8 +191,12 @@ implementation
     end
     else
     begin
+      if fullScreen then flags := SDL_WINDOW_FULLSCREEN else flags := 0;
+      SDL_SetWindowFullscreen(window, flags);
       SDL_SetWindowSize(window, w, h);
-      if wc then
+      if maximized then SDL_MaximizeWindow(window);
+      // always reset to center when changing fullscreen->windowed for safety purposes
+      if wc or (gFullscreen and not fullscreen) or (gWinMaximized and not maximized) then
       begin
         x := SDL_WINDOWPOS_CENTERED;
         y := SDL_WINDOWPOS_CENTERED
@@ -210,10 +212,6 @@ implementation
         SDL_GetWindowPosition(window, @x, @y);
         wx := x; wy := y
       end;
-      if maximized then
-        SDL_MaximizeWindow(window);
-      if fullScreen then flags := SDL_WINDOW_FULLSCREEN else flags := 0;
-      SDL_SetWindowFullscreen(window, flags);
       gFullScreen := fullscreen;
       gWinMaximized := maximized;
       gRC_FullScreen := fullscreen;