From d4c4c32cf444c51ff6d887dd4b5f2f24b56378a4 Mon Sep 17 00:00:00 2001 From: goeiecool9999 <7033575+goeiecool9999@users.noreply.github.com> Date: Mon, 4 Nov 2024 23:23:08 +0100 Subject: [PATCH] Vulkan: Remove obsolete comments/vector and process destruction queue near the end of destructor --- src/Cafe/HW/Latte/Renderer/Vulkan/VulkanRenderer.cpp | 7 ++----- src/Cafe/HW/Latte/Renderer/Vulkan/VulkanSurfaceCopy.cpp | 1 - 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/Cafe/HW/Latte/Renderer/Vulkan/VulkanRenderer.cpp b/src/Cafe/HW/Latte/Renderer/Vulkan/VulkanRenderer.cpp index dada5479..372fa07c 100644 --- a/src/Cafe/HW/Latte/Renderer/Vulkan/VulkanRenderer.cpp +++ b/src/Cafe/HW/Latte/Renderer/Vulkan/VulkanRenderer.cpp @@ -651,10 +651,6 @@ VulkanRenderer::~VulkanRenderer() memoryManager->DeleteBuffer(m_xfbRingBuffer, m_xfbRingBufferMemory); memoryManager->DeleteBuffer(m_occlusionQueries.bufferQueryResults, m_occlusionQueries.memoryQueryResults); memoryManager->DeleteBuffer(m_bufferCache, m_bufferCacheMemory); - // texture memory - // todo - // upload buffers - // todo m_padSwapchainInfo = nullptr; m_mainSwapchainInfo = nullptr; @@ -699,6 +695,8 @@ VulkanRenderer::~VulkanRenderer() // destroy memory manager memoryManager.reset(); + ProcessDestructionQueue(); + // destroy instance, devices if (m_instance != VK_NULL_HANDLE) { @@ -1824,7 +1822,6 @@ void VulkanRenderer::ImguiEnd() vkCmdEndRenderPass(m_state.currentCommandBuffer); } -std::vector g_imgui_textures; // TODO manage better ImTextureID VulkanRenderer::GenerateTexture(const std::vector& data, const Vector2i& size) { try diff --git a/src/Cafe/HW/Latte/Renderer/Vulkan/VulkanSurfaceCopy.cpp b/src/Cafe/HW/Latte/Renderer/Vulkan/VulkanSurfaceCopy.cpp index 979e90e1..f98eb452 100644 --- a/src/Cafe/HW/Latte/Renderer/Vulkan/VulkanSurfaceCopy.cpp +++ b/src/Cafe/HW/Latte/Renderer/Vulkan/VulkanSurfaceCopy.cpp @@ -871,5 +871,4 @@ void VulkanRenderer::surfaceCopy_cleanup() delete i.second; } m_copySurfacePipelineCache = {}; - // todo - cleanup other resources? }