zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2025-02-02 22:01:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix viewpoint buffer not getting cleared when in the menus

Browse source
This commit is contained in:
Magnus Norddahl 2022-07-28 13:46:47 +02:00 committed by Christoph Oelckers
parent aae85a1b91
commit 742ae8c907
4 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/common/rendering/gl/gl_framebuffer.cpp
View file

@ -484,6 +484,7 @@ void OpenGLFrameBuffer::SetSaveBuffers(bool yes)
void OpenGLFrameBuffer::BeginFrame() void OpenGLFrameBuffer::BeginFrame()
{ {
SetViewportRects(nullptr); SetViewportRects(nullptr);
mViewpoints->Clear();
if (GLRenderer != nullptr) if (GLRenderer != nullptr)
GLRenderer->BeginFrame(); GLRenderer->BeginFrame();
} }

1
src/common/rendering/gles/gles_framebuffer.cpp
View file

@ -369,6 +369,7 @@ void OpenGLFrameBuffer::WaitForCommands(bool finish)
void OpenGLFrameBuffer::BeginFrame() void OpenGLFrameBuffer::BeginFrame()
{ {
SetViewportRects(nullptr); SetViewportRects(nullptr);
mViewpoints->Clear();
if (GLRenderer != nullptr) if (GLRenderer != nullptr)
GLRenderer->BeginFrame(); GLRenderer->BeginFrame();
} }

9
src/common/rendering/hwrenderer/data/hw_viewpointbuffer.cpp
View file

@ -117,11 +117,16 @@ int HWViewpointBuffer::SetViewpoint(FRenderState &di, HWViewpointUniforms *vp)
void HWViewpointBuffer::Clear() void HWViewpointBuffer::Clear()
{ {
bool needNewPipeline = mUploadIndex > 0; // Clear might be called multiple times before any actual rendering
mUploadIndex = 0; mUploadIndex = 0;
mClipPlaneInfo.Clear(); mClipPlaneInfo.Clear();
mPipelinePos++; if (needNewPipeline)
mPipelinePos %= mPipelineNbr; {
mPipelinePos++;
mPipelinePos %= mPipelineNbr;
}
mBuffer = mBufferPipeline[mPipelinePos]; mBuffer = mBufferPipeline[mPipelinePos];
} }

1
src/common/rendering/vulkan/system/vk_framebuffer.cpp
View file

@ -419,6 +419,7 @@ TArray<uint8_t> VulkanFrameBuffer::GetScreenshotBuffer(int &pitch, ESSType &colo
void VulkanFrameBuffer::BeginFrame() void VulkanFrameBuffer::BeginFrame()
{ {
SetViewportRects(nullptr); SetViewportRects(nullptr);
mViewpoints->Clear();
mCommands->BeginFrame(); mCommands->BeginFrame();
mTextureManager->BeginFrame(); mTextureManager->BeginFrame();
mScreenBuffers->BeginFrame(screen->mScreenViewport.width, screen->mScreenViewport.height, screen->mSceneViewport.width, screen->mSceneViewport.height); mScreenBuffers->BeginFrame(screen->mScreenViewport.width, screen->mScreenViewport.height, screen->mSceneViewport.width, screen->mSceneViewport.height);