From 06303aaa92c3589e9f9a792ffc8294566dde897d Mon Sep 17 00:00:00 2001
From: Tobias Frisch <tfrisch@uni-koblenz.de>
Date: Mon, 30 Aug 2021 20:33:13 +0200
Subject: [PATCH] [#90] Fixed destructor of descriptor manager
Signed-off-by: Tobias Frisch <tfrisch@uni-koblenz.de>
---
src/vkcv/DescriptorManager.cpp | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/src/vkcv/DescriptorManager.cpp b/src/vkcv/DescriptorManager.cpp
index 78c9c0a7..e7ae9ea2 100644
--- a/src/vkcv/DescriptorManager.cpp
+++ b/src/vkcv/DescriptorManager.cpp
@@ -32,8 +32,13 @@ namespace vkcv
for (uint64_t id = 0; id < m_DescriptorSets.size(); id++) {
destroyDescriptorSetById(id);
}
+
+ for (uint64_t id = 0; id < m_DescriptorSetLayouts.size(); id++) {
+ destroyDescriptorSetLayoutById(id);
+ }
m_DescriptorSets.clear();
+ m_DescriptorSetLayouts.clear();
for (const auto &pool : m_Pools) {
if (pool) {
@@ -285,6 +290,7 @@ namespace vkcv
auto& set = m_DescriptorSets[id];
if (set.vulkanHandle) {
m_Device.freeDescriptorSets(m_Pools[set.poolIndex], 1, &(set.vulkanHandle));
+ set.setLayoutHandle = DescriptorSetLayoutHandle();
set.vulkanHandle = nullptr;
}
}
--
GitLab