OGL: Update the window size after swapping buffers, not before

Prevents us from rendering beyond the viewport bounds.

Source/Core/VideoBackends/OGL/FramebufferManager.cpp

@@ -54,6 +54,7 @@ GLuint FramebufferManager::CreateTexture(GLenum texture_type, GLenum internal_fo
                                          GLenum pixel_format, GLenum data_type)
 {
   GLuint texture;
+  glActiveTexture(GL_TEXTURE9);
   glGenTextures(1, &texture);
   glBindTexture(texture_type, texture);
   if (texture_type == GL_TEXTURE_2D_ARRAY)

Source/Core/VideoBackends/OGL/PostProcessing.cpp

@@ -12,6 +12,7 @@
 #include "Core/Config/GraphicsSettings.h"
 
 #include "VideoBackends/OGL/FramebufferManager.h"
+#include "VideoBackends/OGL/OGLTexture.h"
 #include "VideoBackends/OGL/ProgramShaderCache.h"
 #include "VideoBackends/OGL/SamplerCache.h"
 
@@ -121,6 +122,7 @@ void OpenGLPostProcessing::BlitFromTexture(TargetRectangle src, TargetRectangle
   glBindTexture(GL_TEXTURE_2D_ARRAY, src_texture);
   g_sampler_cache->BindLinearSampler(9);
   glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
+  OGLTexture::SetStage();
 }
 
 void OpenGLPostProcessing::ApplyShader()

Source/Core/VideoBackends/OGL/Render.cpp

@@ -1355,11 +1355,37 @@ void Renderer::SwapImpl(AbstractTexture* texture, const EFBRectangle& xfb_region
              xfb_texture->GetConfig().width, xfb_texture->GetConfig().height);
 
   // Finish up the current frame, print some stats
+  glEnable(GL_BLEND);
+  glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 
+  // Reset viewport for drawing text
+  glViewport(0, 0, GLInterface->GetBackBufferWidth(), GLInterface->GetBackBufferHeight());
+  DrawDebugText();
+
+  // Do our OSD callbacks
+  OSD::DoCallbacks(OSD::CallbackType::OnFrame);
+  OSD::DrawMessages();
+
+  // Copy the rendered frame to the real window.
+  GLInterface->Swap();
+
+#ifdef ANDROID
+  // Handle surface changes on Android.
+  if (m_surface_needs_change.IsSet())
+  {
+    GLInterface->UpdateHandle(m_new_surface_handle);
+    GLInterface->UpdateSurface();
+    m_new_surface_handle = nullptr;
+    m_surface_needs_change.Clear();
+    m_surface_changed.Set();
+  }
+#endif
+
+  // Update the render window position and the backbuffer size
   SetWindowSize(xfb_texture->GetConfig().width, xfb_texture->GetConfig().height);
+  GLInterface->Update();
 
-  GLInterface->Update();  // just updates the render window position and the backbuffer size
+  // Was the size changed since the last frame?
-
   bool window_resized = false;
   int window_width = static_cast<int>(std::max(GLInterface->GetBackBufferWidth(), 1u));
   int window_height = static_cast<int>(std::max(GLInterface->GetBackBufferHeight(), 1u));
@@ -1404,33 +1430,6 @@ void Renderer::SwapImpl(AbstractTexture* texture, const EFBRectangle& xfb_region
     BoundingBox::SetTargetSizeChanged(m_target_width, m_target_height);
   }
 
-  // ---------------------------------------------------------------------
-  glEnable(GL_BLEND);
-  glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-
-  // Reset viewport for drawing text
-  glViewport(0, 0, GLInterface->GetBackBufferWidth(), GLInterface->GetBackBufferHeight());
-
-  DrawDebugText();
-
-  // Do our OSD callbacks
-  OSD::DoCallbacks(OSD::CallbackType::OnFrame);
-  OSD::DrawMessages();
-
-#ifdef ANDROID
-  if (m_surface_needs_change.IsSet())
-  {
-    GLInterface->UpdateHandle(m_new_surface_handle);
-    GLInterface->UpdateSurface();
-    m_new_surface_handle = nullptr;
-    m_surface_needs_change.Clear();
-    m_surface_changed.Set();
-  }
-#endif
-
-  // Copy the rendered frame to the real window
-  GLInterface->Swap();
-
   // Clear framebuffer
   glClearColor(0, 0, 0, 0);
   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);