From a9bf0a25388ca373266d42a6099af06df61194e7 Mon Sep 17 00:00:00 2001 From: baldurk Date: Fri, 16 Oct 2015 10:28:03 +0200 Subject: [PATCH] Destroy debug manager and serialiser on shutdown --- renderdoc/driver/vulkan/vk_core.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/renderdoc/driver/vulkan/vk_core.cpp b/renderdoc/driver/vulkan/vk_core.cpp index b4bc0b828..e11b3b335 100644 --- a/renderdoc/driver/vulkan/vk_core.cpp +++ b/renderdoc/driver/vulkan/vk_core.cpp @@ -409,14 +409,17 @@ WrappedVulkan::~WrappedVulkan() m_SwapChainInfo.clear(); + // VKTODOLOW shutdown order is really up in the air + for(size_t i=0; i < m_PhysicalReplayData.size(); i++) + SAFE_DELETE(m_PhysicalReplayData[i].debugMan); + m_ResourceManager->Shutdown(); delete m_ResourceManager; - - // VKTODOLOW shutdown order is really up in the air + for(size_t i=0; i < m_PhysicalReplayData.size(); i++) if(m_PhysicalReplayData[i].dev != VK_NULL_HANDLE) vkDestroyDevice(m_PhysicalReplayData[i].dev); - + // VKTODOLOW only one instance if(m_PhysicalReplayData[0].inst != VK_NULL_HANDLE) { @@ -424,6 +427,8 @@ WrappedVulkan::~WrappedVulkan() ObjDisp(m_PhysicalReplayData[0].inst)->DestroyInstance(instance); } + + SAFE_DELETE(m_pSerialiser); } const char * WrappedVulkan::GetChunkName(uint32_t idx)