diff --git a/renderdoc/driver/vulkan/vk_core.cpp b/renderdoc/driver/vulkan/vk_core.cpp index c6336e2b9..53450bf5a 100644 --- a/renderdoc/driver/vulkan/vk_core.cpp +++ b/renderdoc/driver/vulkan/vk_core.cpp @@ -772,7 +772,6 @@ void WrappedVulkan::ReadLogInitialisation() m_PhysicalReplayData[m_SwapPhysDevice].cmdpool != VK_NULL_HANDLE); // VKTODOLOW maybe better place to put this? - // VKTODOLOW leaking debug manager m_PhysicalReplayData[m_SwapPhysDevice].debugMan = new VulkanDebugManager(this, GetDev()); } @@ -823,11 +822,6 @@ void WrappedVulkan::ContextReplayLog(LogState readType, uint32_t startEventID, u m_LastEventID = ~0U; } - // VKTODOMED I think this is a legacy concept that doesn't really mean anything anymore, - // even on GL/D3D11. Creates are all shifted before the frame, only command bfufers remain - // in vulkan - //GetResourceManager()->MarkInFrame(true); - while(1) { if(m_State == EXECUTING && m_RootEventID > endEventID) @@ -877,9 +871,6 @@ void WrappedVulkan::ContextReplayLog(LogState readType, uint32_t startEventID, u m_ParentDrawcall.children.clear(); } - // VKTODOMED See above - //GetResourceManager()->MarkInFrame(false); - if(m_PartialReplayData.resultPartialCmdBuffer != VK_NULL_HANDLE) { ObjDisp(GetDev())->DeviceWaitIdle(Unwrap(m_PartialReplayData.partialDevice)); @@ -969,9 +960,8 @@ void WrappedVulkan::ProcessChunk(uint64_t offset, VulkanChunkType context) Serialise_vkFlushMappedMemoryRanges(GetMainSerialiser(), VK_NULL_HANDLE, 0, NULL); break; case FREE_MEM: - // VKTODOMED see vkFreeMemory - //Serialise_vkFreeMemory(GetMainSerialiser(), VK_NULL_HANDLE, VK_NULL_HANDLE); - //break; + RDCERR("vkFreeMemory should not be serialised directly"); + break; case CREATE_CMD_POOL: Serialise_vkCreateCommandPool(GetMainSerialiser(), VK_NULL_HANDLE, NULL, NULL); break; diff --git a/renderdoc/driver/vulkan/vk_core.h b/renderdoc/driver/vulkan/vk_core.h index 324f9c7ea..0a3e36f83 100644 --- a/renderdoc/driver/vulkan/vk_core.h +++ b/renderdoc/driver/vulkan/vk_core.h @@ -160,7 +160,6 @@ private: struct ReplayData { - // VKTODOHIGH need to release/destroy these somewhere ReplayData() : inst(VK_NULL_HANDLE), phys(VK_NULL_HANDLE) , qFamilyIdx(0), dev(VK_NULL_HANDLE), q(VK_NULL_HANDLE) @@ -258,7 +257,7 @@ private: // vkCmd chunks) is NOT unique. // However, a single baked command list can be submitted multiple // times - so we have to have a list of base events - // VKTODO change this to a sorted vector similar to the image + // VKTODOLOW change this to a sorted vector similar to the image // states // Map from bakeID -> vector map > cmdBufferSubmits; diff --git a/renderdoc/driver/vulkan/wrappers/vk_resource_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_resource_funcs.cpp index 807715575..77f4d8ad0 100644 --- a/renderdoc/driver/vulkan/wrappers/vk_resource_funcs.cpp +++ b/renderdoc/driver/vulkan/wrappers/vk_resource_funcs.cpp @@ -118,10 +118,6 @@ void WrappedVulkan::vkFreeMemory( VkDevice device, VkDeviceMemory mem) { - // VKTODOMED I don't think I need to serialise this. - // the resource record just stays around until there are - // no references (which should be the same since lifetime - // tracking is app responsibility) // we just need to clean up after ourselves on replay WrappedVkNonDispRes *wrapped = (WrappedVkNonDispRes *)GetWrapped(mem); m_MemoryInfo.erase(wrapped->id);