zdoom/qzdoom-gpl
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom-gpl.git synced 2024-11-24 04:41:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move SetOutputViewport to OpenGLFrameBuffer::Update as it cannot be safely called from Begin2D

Browse source
This commit is contained in:
Magnus Norddahl 2016-08-13 23:07:13 +02:00 committed by Christoph Oelckers
parent fd4422eb62
commit f8cc56ea3a
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/gl/renderer/gl_renderer.cpp
View file

@ -286,9 +286,6 @@ void FGLRenderer::Begin2D()
{ {
if (FGLRenderBuffers::IsEnabled()) 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); mBuffers->Setup(mScreenViewport.width, mScreenViewport.height, mSceneViewport.width, mSceneViewport.height);
if (mDrawingScene2D) if (mDrawingScene2D)
mBuffers->BindSceneFB(); mBuffers->BindSceneFB();

2
src/gl/system/gl_framebuffer.cpp
View file

@ -187,6 +187,8 @@ void OpenGLFrameBuffer::Update()
DrawRateStuff(); DrawRateStuff();
GLRenderer->Flush(); GLRenderer->Flush();
GLRenderer->SetOutputViewport(nullptr);
if (gl_draw_sync || !swapped) if (gl_draw_sync || !swapped)
{ {
Swap(); Swap();