Fix memory leak and validaiton errors caused by Vulkan::Program

Change-Id: I6d0e609f80ab7dec342c696e6093f50963bff664

diff --git a/dali/internal/graphics/vulkan-impl/vulkan-program-impl.cpp b/dali/internal/graphics/vulkan-impl/vulkan-program-impl.cpp
index af01d72f2ecef45be385cedd9d5a2122e6733b09..ad0e70a6e96e59974d63e97b2f573a94031030ac 100644 (file)
--- a/dali/internal/graphics/vulkan-impl/vulkan-program-impl.cpp
+++ b/dali/internal/graphics/vulkan-impl/vulkan-program-impl.cpp
@@ -53,6 +53,19 @@ struct ProgramImpl::Impl
 
   ~Impl()
   {
+    // Tear down all VkDescriptorPool handles we ever created
+    auto& gfxDevice = controller.GetGraphicsDevice();
+    auto  vkDevice  = gfxDevice.GetLogicalDevice();
+    auto& allocator = gfxDevice.GetAllocator();
+
+    for(auto& descriptorPool : poolList)
+    {
+      if(descriptorPool.vkPool) // valid handle?
+      {
+        vkDevice.destroyDescriptorPool(descriptorPool.vkPool, &allocator);
+      }
+    }
+
     delete createInfo.shaderState;
   }
 
@@ -129,6 +142,7 @@ ProgramImpl::~ProgramImpl() = default;
 
 bool ProgramImpl::Destroy()
 {
+  mImpl.reset();
   return false;
 }
 

diff --git a/dali/internal/graphics/vulkan-impl/vulkan-program.cpp b/dali/internal/graphics/vulkan-impl/vulkan-program.cpp
index d5eda21ea2de1c737498bad52ceccea8ab5f57bd..383182c1f9637a8c43550a0a066a8a4951d09b79 100644 (file)
--- a/dali/internal/graphics/vulkan-impl/vulkan-program.cpp
+++ b/dali/internal/graphics/vulkan-impl/vulkan-program.cpp
@@ -34,6 +34,7 @@ namespace Dali::Graphics::Vulkan
 Program::Program(const Graphics::ProgramCreateInfo& createInfo, VulkanGraphicsController& controller)
 {
   mProgram = new ProgramImpl(createInfo, controller);
+  mProgram->Retain();
 }
 
 Program::~Program()