zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-11 15:21:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed: FDrawInfo must be kept around until DrawEndScene2D finishes.

Browse source 
Otherwise some code crashes on invalid data.
This commit is contained in:
Christoph Oelckers 2018-05-01 19:01:01 +02:00
parent 9bdb0f2e49
commit 14410ae526
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gl/scene/gl_scene.cpp
View file

@ -722,7 +722,6 @@ sector_t * GLSceneDrawer::RenderViewpoint (AActor * camera, GL_IRECT * bounds, f
FDrawInfo::StartDrawInfo(this); FDrawInfo::StartDrawInfo(this);
ProcessScene(toscreen); ProcessScene(toscreen);
if (mainview && toscreen) EndDrawScene(lviewsector); // do not call this for camera textures. if (mainview && toscreen) EndDrawScene(lviewsector); // do not call this for camera textures.
FDrawInfo::EndDrawInfo();
if (mainview && FGLRenderBuffers::IsEnabled()) if (mainview && FGLRenderBuffers::IsEnabled())
{ {
@ -741,6 +740,7 @@ sector_t * GLSceneDrawer::RenderViewpoint (AActor * camera, GL_IRECT * bounds, f
DrawBlend(lviewsector); DrawBlend(lviewsector);
} }
FDrawInfo::EndDrawInfo();
GLRenderer->mDrawingScene2D = false; GLRenderer->mDrawingScene2D = false;
if (!stereo3dMode.IsMono() && FGLRenderBuffers::IsEnabled()) if (!stereo3dMode.IsMono() && FGLRenderBuffers::IsEnabled())
GLRenderer->mBuffers->BlitToEyeTexture(eye_ix); GLRenderer->mBuffers->BlitToEyeTexture(eye_ix);