archive/Cemu
1
0
Fork 0
mirror of https://github.com/cemu-project/Cemu.git synced 2025-07-07 23:41:18 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Vulkan: Manage ownership of memory manager with unique_ptr

Browse source
This commit is contained in:
goeiecool9999 2024-11-04 19:51:43 +01:00
parent 4581281a19
commit d6a5693aa0
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/Cafe/HW/Latte/Renderer/Vulkan/VulkanRenderer.cpp
View file

@ -439,7 +439,7 @@ VulkanRenderer::VulkanRenderer()
GetDeviceFeatures(); GetDeviceFeatures();
// init memory manager // init memory manager
memoryManager = new VKRMemoryManager(this); memoryManager.reset(new VKRMemoryManager(this));
try try
{ {
@ -679,6 +679,9 @@ VulkanRenderer::~VulkanRenderer()
vkDestroyDebugUtilsMessengerEXT(m_instance, m_debugCallback, nullptr); vkDestroyDebugUtilsMessengerEXT(m_instance, m_debugCallback, nullptr);
} }
// destroy memory manager
memoryManager.reset();
// destroy instance, devices // destroy instance, devices
if (m_instance != VK_NULL_HANDLE) if (m_instance != VK_NULL_HANDLE)
{ {
@ -690,9 +693,6 @@ VulkanRenderer::~VulkanRenderer()
vkDestroyInstance(m_instance, nullptr); vkDestroyInstance(m_instance, nullptr);
} }
// destroy memory manager
delete memoryManager;
// crashes? // crashes?
//glslang::FinalizeProcess(); //glslang::FinalizeProcess();
} }

4
src/Cafe/HW/Latte/Renderer/Vulkan/VulkanRenderer.h
View file

@ -137,8 +137,8 @@ class VulkanRenderer : public Renderer
public: public:
// memory management // memory management
VKRMemoryManager* memoryManager{}; std::unique_ptr<VKRMemoryManager> memoryManager;
VKRMemoryManager* GetMemoryManager() const { return memoryManager; }; const std::unique_ptr<VKRMemoryManager>& GetMemoryManager() const { return memoryManager; };
VkSupportedFormatInfo_t m_supportedFormatInfo; VkSupportedFormatInfo_t m_supportedFormatInfo;