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

- fix shutdown crash due to GetVulkanFrameBuffer returning null when VulkanFrameBuffer is destroyed

Browse source
This commit is contained in:
Magnus Norddahl 2019-04-30 20:02:00 +02:00
parent ab8378152f
commit 23d0cce395
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/rendering/vulkan/system/vk_framebuffer.cpp
View file

@ -93,9 +93,12 @@ VulkanFrameBuffer::VulkanFrameBuffer(void *hMonitor, bool fullscreen, VulkanDevi
VulkanFrameBuffer::~VulkanFrameBuffer() VulkanFrameBuffer::~VulkanFrameBuffer()
{ {
// screen is already null at this point, but VkHardwareTexture::ResetAll needs it during clean up. Is there a better way we can do this?
auto tmp = screen;
screen = this;
// All descriptors must be destroyed before the descriptor pool in renderpass manager is destroyed // All descriptors must be destroyed before the descriptor pool in renderpass manager is destroyed
VkHardwareTexture::ResetAll(); VkHardwareTexture::ResetAll();
VKBuffer::ResetAll(); VKBuffer::ResetAll();
PPResource::ResetAll(); PPResource::ResetAll();
@ -107,6 +110,8 @@ VulkanFrameBuffer::~VulkanFrameBuffer()
delete mLights; delete mLights;
mShadowMap.Reset(); mShadowMap.Reset();
screen = tmp;
DeleteFrameObjects(); DeleteFrameObjects();
} }