Merge pull request #830 from Devsh-Graphics-Programming/ali_cmd

video: free command buffers when destroyed

Author: devshgraphicsprogramming

cmake/adjust/flags.cmake

@@ -200,6 +200,6 @@ function(nbl_adjust_flags)
 			list(APPEND _D_NBL_COMPILE_OPTIONS_ $<$<CONFIG:${NBL_MAP_CONFIGURATION_FROM}>:${NBL_TO_CONFIG_COMPILE_OPTIONS}>)
 		endforeach()
 
-		set_directory_properties(PROPERTIES COMPILE_OPTIONS ${_D_NBL_COMPILE_OPTIONS_})
+		set_directory_properties(PROPERTIES COMPILE_OPTIONS "${_D_NBL_COMPILE_OPTIONS_}")
 	endif()
 endfunction()

src/nbl/video/CVulkanCommandBuffer.cpp

@@ -9,6 +9,18 @@ using namespace nbl;
 using namespace nbl::video;
 
 
+nbl::video::CVulkanCommandBuffer::~CVulkanCommandBuffer()
+{
+    const auto* vulkanDevice = static_cast<const CVulkanLogicalDevice*>(getOriginDevice());
+	auto* vk = vulkanDevice->getFunctionTable();
+
+    const auto* vulkanCmdPool = IBackendObject::device_compatibility_cast<const CVulkanCommandPool*>(getPool(), getOriginDevice());
+	assert(vulkanCmdPool);
+
+    vk->vk.vkFreeCommandBuffers(vulkanDevice->getInternalObject(), vulkanCmdPool->getInternalObject(), 1, &m_cmdbuf);
+    out_of_order_dtor();
+}
+
 const VolkDeviceTable& CVulkanCommandBuffer::getFunctionTable() const
 {
     return static_cast<const CVulkanLogicalDevice*>(getOriginDevice())->getFunctionTable()->vk;

src/nbl/video/CVulkanCommandBuffer.h

@@ -270,10 +270,7 @@ class CVulkanCommandBuffer final : public IGPUCommandBuffer
         }
 
     private:
-        virtual ~CVulkanCommandBuffer() final
-        {
-            out_of_order_dtor();
-        }
+        ~CVulkanCommandBuffer();
 
         const VolkDeviceTable& getFunctionTable() const;