From f8cc56ea3a30eb0dc62f9dc7215a36f0ce27434e Mon Sep 17 00:00:00 2001 From: Magnus Norddahl Date: Sat, 13 Aug 2016 23:07:13 +0200 Subject: [PATCH] Move SetOutputViewport to OpenGLFrameBuffer::Update as it cannot be safely called from Begin2D --- src/gl/renderer/gl_renderer.cpp | 3 --- src/gl/system/gl_framebuffer.cpp | 2 ++ 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/gl/renderer/gl_renderer.cpp b/src/gl/renderer/gl_renderer.cpp index ae7c7d93c..84d02159f 100644 --- a/src/gl/renderer/gl_renderer.cpp +++ b/src/gl/renderer/gl_renderer.cpp @@ -286,9 +286,6 @@ void FGLRenderer::Begin2D() { if (FGLRenderBuffers::IsEnabled()) { - if (!mDrawingScene2D) // For when there's no scene rendered (main menu and intermission) - SetOutputViewport(nullptr); - mBuffers->Setup(mScreenViewport.width, mScreenViewport.height, mSceneViewport.width, mSceneViewport.height); if (mDrawingScene2D) mBuffers->BindSceneFB(); diff --git a/src/gl/system/gl_framebuffer.cpp b/src/gl/system/gl_framebuffer.cpp index beaf3bcf3..096a33393 100644 --- a/src/gl/system/gl_framebuffer.cpp +++ b/src/gl/system/gl_framebuffer.cpp @@ -187,6 +187,8 @@ void OpenGLFrameBuffer::Update() DrawRateStuff(); GLRenderer->Flush(); + GLRenderer->SetOutputViewport(nullptr); + if (gl_draw_sync || !swapped) { Swap();