default to using FBO; can be disabled via command line

diff --git a/src/game/g_main.pas b/src/game/g_main.pas
index 6e393b262f29152ce225cb4698b108970389a58f..ab6e1d8498b9de28c655539f2bf4c985c8a1a8c7 100644 (file)
--- a/src/game/g_main.pas
+++ b/src/game/g_main.pas
@@ -438,10 +438,9 @@ begin
   {$ENDIF}
   for i := 1 to ParamCount do
   begin
-    if (ParamStr(i) = '--con-stdout') then
-    begin
-      conbufDumpToStdOut := true;
-      break
+    case ParamStr(i) of
+      '--con-stdout': conbufDumpToStdOut := true;
+      '--no-fbo': glRenderToFBO := false;
     end
   end;
 

diff --git a/src/game/g_options.pas b/src/game/g_options.pas
index 706ca33a1a357d740a82b0282c9557e590a8f929..e89521ddaab4800819bc475058c861fc2bf01c02 100644 (file)
--- a/src/game/g_options.pas
+++ b/src/game/g_options.pas
@@ -815,7 +815,6 @@ initialization
   conRegVar('r_vsync', @gVSync, '', '');
   conRegVar('r_texfilter', @gTextureFilter, '', '');
   conRegVar('r_npot', @glNPOTOverride, '', '');
-  conRegVar('r_fbo', @glRenderToFBO, '', '');
 
   (* Sound *)
   conRegVar('s_nosound', @gNoSound, '', '');

diff --git a/src/game/sdl/g_system.pas b/src/game/sdl/g_system.pas
index a4cbe649a3f7b4fcb39f7d908365e366776c9903..bba2caea3efb5b0c8fba366594002bec6f6057ed 100644 (file)
--- a/src/game/sdl/g_system.pas
+++ b/src/game/sdl/g_system.pas
@@ -127,9 +127,9 @@ implementation
       begin
         {$IFDEF NOGL_INIT}
         nogl_Init;
-        if (not nogl_ExtensionSupported('GL_OES_framebuffer_object')) and glRenderToFBO then
+        if glRenderToFBO and (not nogl_ExtensionSupported('GL_OES_framebuffer_object')) then
         {$ELSE}
-        if (not Load_GL_ARB_framebuffer_object()) and glRenderToFBO then
+        if glRenderToFBO and (not Load_GL_ARB_framebuffer_object()) then
         {$ENDIF}
         begin
           e_LogWriteln('SDL: no framebuffer object support detected');

diff --git a/src/game/sdl2/g_system.pas b/src/game/sdl2/g_system.pas
index e4bd07046a8576bbecdc7763b13cbe282295e062..29a81b01e0a38102289a515cf5500aa2156530ef 100644 (file)
--- a/src/game/sdl2/g_system.pas
+++ b/src/game/sdl2/g_system.pas
@@ -158,9 +158,9 @@ implementation
         begin
           {$IFDEF NOGL_INIT}
           nogl_Init;
-          if (not nogl_ExtensionSupported('GL_OES_framebuffer_object')) and glRenderToFBO then
+          if glRenderToFBO and (not nogl_ExtensionSupported('GL_OES_framebuffer_object')) then
           {$ELSE}
-          if (not Load_GL_ARB_framebuffer_object()) and glRenderToFBO then
+          if glRenderToFBO and (not Load_GL_ARB_framebuffer_object()) then
           {$ENDIF}
           begin
             e_LogWriteln('SDL: no framebuffer object support detected');