From 667e72b79aa5ed482273eb42c9d0bdf89b9e8798 Mon Sep 17 00:00:00 2001
From: Tobias Frisch <tfrisch@uni-koblenz.de>
Date: Thu, 4 Jul 2024 02:52:16 +0200
Subject: [PATCH] Update submodules and fix handle resource management
Signed-off-by: Tobias Frisch <tfrisch@uni-koblenz.de>
---
include/vkcv/Core.hpp | 8 ++++----
include/vkcv/Handles.hpp | 5 +++++
lib/SPIRV-Cross | 2 +-
lib/Vulkan-Headers | 2 +-
lib/Vulkan-Hpp | 2 +-
lib/VulkanMemoryAllocator | 2 +-
modules/gui/lib/imgui | 2 +-
modules/shader_compiler/lib/SPIRV-Headers | 2 +-
modules/shader_compiler/lib/glslang | 2 +-
src/vkcv/Core.cpp | 24 +++++++++++++----------
src/vkcv/DescriptorSetLayoutManager.cpp | 4 ++--
src/vkcv/DescriptorSetManager.cpp | 3 ++-
src/vkcv/Handles.cpp | 20 +++++++++++++------
src/vkcv/SwapchainManager.cpp | 2 +-
src/vkcv/Window.cpp | 3 +++
15 files changed, 52 insertions(+), 31 deletions(-)
diff --git a/include/vkcv/Core.hpp b/include/vkcv/Core.hpp
index 5939988c..010c4ec7 100644
--- a/include/vkcv/Core.hpp
+++ b/include/vkcv/Core.hpp
@@ -73,10 +73,6 @@ namespace vkcv {
Context m_Context;
- std::unique_ptr<PassManager> m_PassManager;
- std::unique_ptr<GraphicsPipelineManager> m_GraphicsPipelineManager;
- std::unique_ptr<ComputePipelineManager> m_ComputePipelineManager;
- std::unique_ptr<RayTracingPipelineManager> m_RayTracingPipelineManager;
std::unique_ptr<DescriptorSetLayoutManager> m_DescriptorSetLayoutManager;
std::unique_ptr<DescriptorSetManager> m_DescriptorSetManager;
std::unique_ptr<BufferManager> m_BufferManager;
@@ -86,6 +82,10 @@ namespace vkcv {
std::unique_ptr<CommandStreamManager> m_CommandStreamManager;
std::unique_ptr<WindowManager> m_WindowManager;
std::unique_ptr<SwapchainManager> m_SwapchainManager;
+ std::unique_ptr<PassManager> m_PassManager;
+ std::unique_ptr<GraphicsPipelineManager> m_GraphicsPipelineManager;
+ std::unique_ptr<ComputePipelineManager> m_ComputePipelineManager;
+ std::unique_ptr<RayTracingPipelineManager> m_RayTracingPipelineManager;
Vector<vk::CommandPool> m_CommandPools;
vk::Semaphore m_RenderFinished;
diff --git a/include/vkcv/Handles.hpp b/include/vkcv/Handles.hpp
index c338cac3..f35eeaa3 100644
--- a/include/vkcv/Handles.hpp
+++ b/include/vkcv/Handles.hpp
@@ -28,6 +28,11 @@ namespace vkcv {
HandleDestroyFunction m_destroy;
+ /**
+ * @brief Private internal method to destroy handle.
+ */
+ void destroy();
+
protected:
/**
* @brief Constructor of an invalid handle
diff --git a/lib/SPIRV-Cross b/lib/SPIRV-Cross
index 2d990d35..6fd1f756 160000
--- a/lib/SPIRV-Cross
+++ b/lib/SPIRV-Cross
@@ -1 +1 @@
-Subproject commit 2d990d355a296ae1e368585810f884ebadcc4773
+Subproject commit 6fd1f75636b1c424b809ad8a84804654cf5ae48b
diff --git a/lib/Vulkan-Headers b/lib/Vulkan-Headers
index d192041a..190d2cb2 160000
--- a/lib/Vulkan-Headers
+++ b/lib/Vulkan-Headers
@@ -1 +1 @@
-Subproject commit d192041a2fc9c9fd8ae67d8ae3f32c5511541f04
+Subproject commit 190d2cb24e90e5bf2bec0a75604a9b3586485b6d
diff --git a/lib/Vulkan-Hpp b/lib/Vulkan-Hpp
index 6fb0c202..630d8da8 160000
--- a/lib/Vulkan-Hpp
+++ b/lib/Vulkan-Hpp
@@ -1 +1 @@
-Subproject commit 6fb0c202be3a13ae8e630fcc734340a6679e8502
+Subproject commit 630d8da8c6b606ac0978bda2d9a37227fd49dd32
diff --git a/lib/VulkanMemoryAllocator b/lib/VulkanMemoryAllocator
index 7942b798..257138b8 160000
--- a/lib/VulkanMemoryAllocator
+++ b/lib/VulkanMemoryAllocator
@@ -1 +1 @@
-Subproject commit 7942b798289f752dc23b0a79516fd8545febd718
+Subproject commit 257138b8f5686ae84491a3df9f90a77d5660c3bd
diff --git a/modules/gui/lib/imgui b/modules/gui/lib/imgui
index b902fa4c..2d0baaab 160000
--- a/modules/gui/lib/imgui
+++ b/modules/gui/lib/imgui
@@ -1 +1 @@
-Subproject commit b902fa4c4490ddffb713f8153d1a65e1940e58d1
+Subproject commit 2d0baaabe62a4bd71bfc871933d9002425c45435
diff --git a/modules/shader_compiler/lib/SPIRV-Headers b/modules/shader_compiler/lib/SPIRV-Headers
index eb49bb7b..41a8eb27 160000
--- a/modules/shader_compiler/lib/SPIRV-Headers
+++ b/modules/shader_compiler/lib/SPIRV-Headers
@@ -1 +1 @@
-Subproject commit eb49bb7b1136298b77945c52b4bbbc433f7885de
+Subproject commit 41a8eb27f1a7554dadfcdd45819954eaa94935e6
diff --git a/modules/shader_compiler/lib/glslang b/modules/shader_compiler/lib/glslang
index 68821c4d..5939e32b 160000
--- a/modules/shader_compiler/lib/glslang
+++ b/modules/shader_compiler/lib/glslang
@@ -1 +1 @@
-Subproject commit 68821c4da8189262228bbd51e56ed75971b2d2c9
+Subproject commit 5939e32b87487fa9c72ab336ebfcc5ae26d9ab6d
diff --git a/src/vkcv/Core.cpp b/src/vkcv/Core.cpp
index 9f1274b2..70421cb8 100644
--- a/src/vkcv/Core.cpp
+++ b/src/vkcv/Core.cpp
@@ -91,10 +91,7 @@ namespace vkcv {
}
Core::Core(Context &&context) noexcept :
- m_Context(std::move(context)), m_PassManager(std::make_unique<PassManager>()),
- m_GraphicsPipelineManager(std::make_unique<GraphicsPipelineManager>()),
- m_ComputePipelineManager(std::make_unique<ComputePipelineManager>()),
- m_RayTracingPipelineManager(std::make_unique<RayTracingPipelineManager>()),
+ m_Context(std::move(context)),
m_DescriptorSetLayoutManager(std::make_unique<DescriptorSetLayoutManager>()),
m_DescriptorSetManager(std::make_unique<DescriptorSetManager>()),
m_BufferManager(std::make_unique<BufferManager>()),
@@ -103,18 +100,21 @@ namespace vkcv {
m_AccelerationStructureManager(std::make_unique<AccelerationStructureManager>()),
m_CommandStreamManager { std::make_unique<CommandStreamManager>() },
m_WindowManager(std::make_unique<WindowManager>()),
- m_SwapchainManager(std::make_unique<SwapchainManager>()), m_CommandPools(),
- m_RenderFinished(), m_SwapchainImageAcquired(), m_downsampler(nullptr) {
+ m_SwapchainManager(std::make_unique<SwapchainManager>()),
+ m_PassManager(std::make_unique<PassManager>()),
+ m_GraphicsPipelineManager(std::make_unique<GraphicsPipelineManager>()),
+ m_ComputePipelineManager(std::make_unique<ComputePipelineManager>()),
+ m_RayTracingPipelineManager(std::make_unique<RayTracingPipelineManager>()),
+ m_CommandPools(),
+ m_RenderFinished(),
+ m_SwapchainImageAcquired(),
+ m_downsampler(nullptr) {
m_CommandPools = createCommandPools(
m_Context.getDevice(), generateQueueFamilyIndexSet(m_Context.getQueueManager()));
m_RenderFinished = m_Context.getDevice().createSemaphore({});
m_SwapchainImageAcquired = m_Context.getDevice().createSemaphore({});
- m_PassManager->init(*this);
- m_GraphicsPipelineManager->init(*this);
- m_ComputePipelineManager->init(*this);
- m_RayTracingPipelineManager->init(*this);
m_DescriptorSetLayoutManager->init(*this);
m_DescriptorSetManager->init(*this, *m_DescriptorSetLayoutManager);
m_BufferManager->init(*this);
@@ -123,6 +123,10 @@ namespace vkcv {
m_AccelerationStructureManager->init(*this, *m_BufferManager);
m_CommandStreamManager->init(*this);
m_SwapchainManager->init(*this);
+ m_PassManager->init(*this);
+ m_GraphicsPipelineManager->init(*this);
+ m_ComputePipelineManager->init(*this);
+ m_RayTracingPipelineManager->init(*this);
m_downsampler = std::unique_ptr<Downsampler>(new BlitDownsampler(*this, *m_ImageManager));
}
diff --git a/src/vkcv/DescriptorSetLayoutManager.cpp b/src/vkcv/DescriptorSetLayoutManager.cpp
index 6bbdb099..b0ed1064 100644
--- a/src/vkcv/DescriptorSetLayoutManager.cpp
+++ b/src/vkcv/DescriptorSetLayoutManager.cpp
@@ -34,8 +34,8 @@ namespace vkcv {
DescriptorSetLayoutManager::~DescriptorSetLayoutManager() noexcept {
for (uint64_t id = 0; id < getCount(); id++) {
- // Resets the usage count to zero for destruction.
- getById(id).layoutUsageCount = 0;
+ // Resets the usage count to one for destruction.
+ getById(id).layoutUsageCount = 1;
}
clear();
diff --git a/src/vkcv/DescriptorSetManager.cpp b/src/vkcv/DescriptorSetManager.cpp
index 4a3d4f5b..0c16267e 100644
--- a/src/vkcv/DescriptorSetManager.cpp
+++ b/src/vkcv/DescriptorSetManager.cpp
@@ -55,9 +55,10 @@ namespace vkcv {
if (set.vulkanHandle) {
getCore().getContext().getDevice().freeDescriptorSets(m_Pools [set.poolIndex], 1,
&(set.vulkanHandle));
- set.setLayoutHandle = DescriptorSetLayoutHandle();
set.vulkanHandle = nullptr;
}
+
+ set.setLayoutHandle = DescriptorSetLayoutHandle();
}
bool DescriptorSetManager::allocateDescriptorPool() {
diff --git a/src/vkcv/Handles.cpp b/src/vkcv/Handles.cpp
index 64ab3080..578e4676 100644
--- a/src/vkcv/Handles.cpp
+++ b/src/vkcv/Handles.cpp
@@ -5,12 +5,7 @@
namespace vkcv {
- Handle::Handle() : m_id(std::numeric_limits<uint64_t>::max()), m_rc(nullptr), m_destroy(nullptr) {}
-
- Handle::Handle(uint64_t id, const HandleDestroyFunction &destroy) :
- m_id(id), m_rc(new uint64_t(1)), m_destroy(destroy) {}
-
- Handle::~Handle() {
+ void Handle::destroy() {
if ((m_rc) && (*m_rc > 0) && (--(*m_rc) == 0)) {
if (m_destroy) {
m_destroy(m_id);
@@ -20,6 +15,15 @@ namespace vkcv {
}
}
+ Handle::Handle() : m_id(std::numeric_limits<uint64_t>::max()), m_rc(nullptr), m_destroy(nullptr) {}
+
+ Handle::Handle(uint64_t id, const HandleDestroyFunction &destroy) :
+ m_id(id), m_rc(new uint64_t(1)), m_destroy(destroy) {}
+
+ Handle::~Handle() {
+ destroy();
+ }
+
Handle::Handle(const Handle &other) :
m_id(other.m_id), m_rc(other.m_rc), m_destroy(other.m_destroy) {
if (m_rc) {
@@ -38,6 +42,8 @@ namespace vkcv {
return *this;
}
+ destroy();
+
m_id = other.m_id;
m_rc = other.m_rc;
m_destroy = other.m_destroy;
@@ -50,6 +56,8 @@ namespace vkcv {
}
Handle &Handle::operator=(Handle &&other) noexcept {
+ destroy();
+
m_id = other.m_id;
m_rc = other.m_rc;
m_destroy = other.m_destroy;
diff --git a/src/vkcv/SwapchainManager.cpp b/src/vkcv/SwapchainManager.cpp
index c8984530..03dbdc01 100644
--- a/src/vkcv/SwapchainManager.cpp
+++ b/src/vkcv/SwapchainManager.cpp
@@ -207,7 +207,7 @@ namespace vkcv {
vk::CompositeAlphaFlagBitsKHR::eOpaque, chosenPresentMode, true, entry.m_Swapchain);
entry.m_Swapchain = device.createSwapchainKHR(swapchainCreateInfo);
- return true;
+ return entry.m_Swapchain? true : false;
}
SwapchainHandle SwapchainManager::createSwapchain(Window &window) {
diff --git a/src/vkcv/Window.cpp b/src/vkcv/Window.cpp
index 78afe0f2..d7107660 100644
--- a/src/vkcv/Window.cpp
+++ b/src/vkcv/Window.cpp
@@ -122,6 +122,9 @@ namespace vkcv {
Window::e_char.unlock();
Window::e_gamepad.unlock();
Window::e_resize.remove(m_resizeHandle);
+
+ m_swapchainHandle = SwapchainHandle();
+
if (m_window) {
s_Windows.erase(std::find(s_Windows.begin(), s_Windows.end(), m_window));
glfwDestroyWindow(m_window);
--
GitLab