zdoom
/
gzdoom-gles
mirror of https://github.com/ZDoom/gzdoom-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

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 (!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();

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

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