fix nasty memory leaks

Author: devshgraphicsprogramming

include/nbl/video/surface/CSurfaceVulkan.h

@@ -28,7 +28,7 @@ class NBL_API2 ISurfaceVulkan : public ISurface
 
     protected:
         explicit inline ISurfaceVulkan(core::smart_refctd_ptr<video::IAPIConnection>&& api, VkSurfaceKHR vk_surface) : base_t(std::move(api)), m_vkSurfaceKHR(vk_surface) {}
-        virtual ~ISurfaceVulkan() = default;
+        virtual ~ISurfaceVulkan();
 
         VkSurfaceKHR m_vkSurfaceKHR = VK_NULL_HANDLE;
 };

src/nbl/video/CSurfaceVulkan.cpp

@@ -119,6 +119,12 @@ bool ISurfaceVulkan::isSupportedForPhysicalDevice(const IPhysicalDevice* physica
 		return true;
 	}
 
+ISurfaceVulkan::~ISurfaceVulkan()
+{
+	vkDestroySurfaceKHR(static_cast<video::CVulkanConnection*>(m_api.get())->getInternalObject(),m_vkSurfaceKHR,nullptr);
+}
+
+
 #ifdef _NBL_PLATFORM_WINDOWS_
 core::smart_refctd_ptr<CSurfaceVulkanWin32> CSurfaceVulkanWin32::create(core::smart_refctd_ptr<video::CVulkanConnection>&& api, core::smart_refctd_ptr<ui::IWindowWin32>&& window)
 {

src/nbl/video/CVulkanBuffer.cpp

@@ -8,7 +8,7 @@ namespace nbl::video
 CVulkanBuffer::~CVulkanBuffer()
 {
 	preDestroyStep();
-	if (m_cachedCreationParams.skipHandleDestroy)
+	if (!m_cachedCreationParams.skipHandleDestroy)
 	{
 		const CVulkanLogicalDevice* vulkanDevice = static_cast<const CVulkanLogicalDevice*>(getOriginDevice());
 		auto* vk = vulkanDevice->getFunctionTable();

src/nbl/video/CVulkanLogicalDevice.cpp

@@ -41,7 +41,17 @@ m_vkdev(vkdev), m_devf(vkdev), m_deferred_op_mempool(NODES_PER_BLOCK_DEFERRED_OP
         }
     }
 
-    m_dummyDSLayout = createDescriptorSetLayout({});
+    {
+        const VkDescriptorSetLayoutCreateInfo vk_createInfo = {
+            .sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO,
+            .pNext = nullptr,
+            .flags = 0,
+            .bindingCount = 0,
+            .pBindings = nullptr
+        };
+        const bool success = m_devf.vk.vkCreateDescriptorSetLayout(m_vkdev,&vk_createInfo,nullptr,&m_dummyDSLayout)==VK_SUCCESS;
+        assert(success);
+    }
 }
 
 
@@ -569,7 +579,7 @@ core::smart_refctd_ptr<IGPUPipelineLayout> CVulkanLogicalDevice::createPipelineL
     {
         if (tmp[i])
             nonNullSetLayoutCount = i;
-        vk_dsLayouts[i] = static_cast<const CVulkanDescriptorSetLayout*>((tmp[i] ? tmp[i]:m_dummyDSLayout).get())->getInternalObject();
+        vk_dsLayouts[i] = tmp[i] ? static_cast<const CVulkanDescriptorSetLayout*>(tmp[i].get())->getInternalObject():m_dummyDSLayout;
     }
     nonNullSetLayoutCount++;
 

src/nbl/video/CVulkanLogicalDevice.h

@@ -91,6 +91,7 @@ class CVulkanLogicalDevice final : public ILogicalDevice
     private:
         inline ~CVulkanLogicalDevice()
         {
+            m_devf.vk.vkDestroyDescriptorSetLayout(m_vkdev,m_dummyDSLayout,nullptr);
             m_devf.vk.vkDestroyDevice(m_vkdev,nullptr);
         }
 
@@ -315,7 +316,7 @@ class CVulkanLogicalDevice final : public ILogicalDevice
         constexpr static inline uint32_t MAX_BLOCK_COUNT_DEFERRED_OP = 256u;
         memory_pool_mt_t m_deferred_op_mempool;
 
-        core::smart_refctd_ptr<video::IGPUDescriptorSetLayout> m_dummyDSLayout = nullptr;
+        VkDescriptorSetLayout m_dummyDSLayout;
 };
 
 }