Fixes

Author: BMagnu

code/graphics/2d.cpp

@@ -755,7 +755,6 @@ void removeVSyncOption()
 static std::unique_ptr<graphics::util::UniformBufferManager> UniformBufferManager;
 
 // Forward definitions
-static void uniform_buffer_managers_init();
 static void uniform_buffer_managers_deinit();
 static void uniform_buffer_managers_retire_buffers();
 
@@ -1980,9 +1979,6 @@ bool gr_init(std::unique_ptr<os::GraphicsOperations>&& graphicsOps, int d_mode,
 
 	gr_light_init();
 
-	// Initialize uniform buffer managers
-	uniform_buffer_managers_init();
-
 	gpu_heap_init();
 
 	mprintf(("Checking graphics capabilities:\n"));
@@ -2991,7 +2987,7 @@ void gr_print_timestamp(int x, int y, fix timestamp, int resize_mode)
 	gr_string(x, y, time.c_str(), resize_mode);
 }
 
-static void uniform_buffer_managers_init()
+void gr_uniform_buffer_managers_init()
 {
 	if (gr_screen.mode == GR_STUB) {
 		return;

code/graphics/2d.h

@@ -1489,6 +1489,8 @@ void gr_get_post_process_effect_names(SCP_vector<SCP_string> &names);
 
 bool gr_is_viewport_window();
 
+void gr_uniform_buffer_managers_init();
+
 // Include this last to make the 2D rendering function available everywhere
 #include "graphics/render.h"
 

code/graphics/opengl/gropengl.cpp

@@ -119,8 +119,8 @@ void gr_opengl_flip()
 		return;
 
 	if (Cmdline_window_res) {
-		GL_state.PushFramebufferState();
-		GL_state.BindFrameBuffer(0, GL_FRAMEBUFFER);
+		GL_state.PopFramebufferState();
+
 		glViewport(0, 0, Cmdline_window_res->first, Cmdline_window_res->second);
 
 		opengl_shader_set_current(gr_opengl_maybe_create_shader(SDR_TYPE_GAMMA_BLIT, 0));
@@ -137,8 +137,6 @@ void gr_opengl_flip()
 			});
 
 		opengl_draw_full_screen_textured(0.0f, 0.0f, 1.0f, 1.0f);
-
-		GL_state.PopFramebufferState();
 	}
 
 	if (Cmdline_gl_finish)
@@ -1496,6 +1494,8 @@ bool gr_opengl_init(std::unique_ptr<os::GraphicsOperations>&& graphicsOps)
 	Gr_current_green = &Gr_green;
 	Gr_current_alpha = &Gr_alpha;
 
+	// Initialize uniform buffer managers
+	gr_uniform_buffer_managers_init();
 
 	gr_setup_frame();
 	gr_opengl_reset_clip();