igl | vulkan | Deferred deletion of VkPipelineLayout

Summary: Deferred deletion of `VkPipelineLayout`. Reviewed By: mmaurer Differential Revision: D52185644 fbshipit-source-id: 42741dafa68b56cb3c86d0a003936ed5faff2f3e
facebook · Dec 15, 2023 · d208a19 · d208a19
1 parent f26c8bc
commit d208a19
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 20 deletions.
diff --git a/src/igl/vulkan/VulkanContext.cpp b/src/igl/vulkan/VulkanContext.cpp
@@ -1010,7 +1010,7 @@ void VulkanContext::updatePipelineLayouts() {
 
   // create pipeline layout
   pipelineLayoutGraphics_ = std::make_unique<VulkanPipelineLayout>(
-      vf_,
+      *this,
       device,
       DSLs,
       static_cast<uint32_t>(config_.enableDescriptorIndexing ? IGL_ARRAY_NUM_ELEMENTS(DSLs)
@@ -1020,7 +1020,7 @@ void VulkanContext::updatePipelineLayouts() {
       "Pipeline Layout: VulkanContext::pipelineLayoutGraphics_");
 
   pipelineLayoutCompute_ = std::make_unique<VulkanPipelineLayout>(
-      vf_,
+      *this,
       device,
       DSLs,
       static_cast<uint32_t>(config_.enableDescriptorIndexing ? IGL_ARRAY_NUM_ELEMENTS(DSLs)

diff --git a/src/igl/vulkan/VulkanPipelineLayout.cpp b/src/igl/vulkan/VulkanPipelineLayout.cpp
@@ -8,33 +8,34 @@
 #include "VulkanPipelineLayout.h"
 
 #include <igl/vulkan/Common.h>
+#include <igl/vulkan/VulkanContext.h>
+#include <igl/vulkan/VulkanFunctionTable.h>
 
-namespace igl {
+namespace igl::vulkan {
 
-namespace vulkan {
-
-VulkanPipelineLayout::VulkanPipelineLayout(const VulkanFunctionTable& vf,
+VulkanPipelineLayout::VulkanPipelineLayout(const VulkanContext& ctx,
                                            VkDevice device,
                                            const VkDescriptorSetLayout* layouts,
                                            uint32_t numLayouts,
                                            const VkPushConstantRange& range,
                                            const char* debugName) :
-  vf_(vf), device_(device) {
+  ctx_(ctx), device_(device) {
   IGL_PROFILER_FUNCTION_COLOR(IGL_PROFILER_COLOR_CREATE);
 
   const VkPipelineLayoutCreateInfo ci = ivkGetPipelineLayoutCreateInfo(numLayouts, layouts, &range);
 
-  VK_ASSERT(vf_.vkCreatePipelineLayout(device, &ci, nullptr, &vkPipelineLayout_));
+  VK_ASSERT(ctx.vf_.vkCreatePipelineLayout(device, &ci, nullptr, &vkPipelineLayout_));
   VK_ASSERT(ivkSetDebugObjectName(
-      &vf_, device_, VK_OBJECT_TYPE_PIPELINE_LAYOUT, (uint64_t)vkPipelineLayout_, debugName));
+      &ctx.vf_, device_, VK_OBJECT_TYPE_PIPELINE_LAYOUT, (uint64_t)vkPipelineLayout_, debugName));
 }
 
 VulkanPipelineLayout::~VulkanPipelineLayout() {
   IGL_PROFILER_FUNCTION_COLOR(IGL_PROFILER_COLOR_DESTROY);
 
-  vf_.vkDestroyPipelineLayout(device_, vkPipelineLayout_, nullptr);
+  ctx_.deferredTask(std::packaged_task<void()>(
+      [vf = &ctx_.vf_, device = ctx_.getVkDevice(), layout = vkPipelineLayout_]() {
+        vf->vkDestroyPipelineLayout(device, layout, nullptr);
+      }));
 }
 
-} // namespace vulkan
-
-} // namespace igl
+} // namespace igl::vulkan
diff --git a/src/igl/vulkan/VulkanPipelineLayout.h b/src/igl/vulkan/VulkanPipelineLayout.h
@@ -7,15 +7,15 @@
 
 #pragma once
 
-#include <igl/vulkan/VulkanFunctions.h>
 #include <igl/vulkan/VulkanHelpers.h>
 
-namespace igl {
-namespace vulkan {
+namespace igl::vulkan {
+
+class VulkanContext;
 
 class VulkanPipelineLayout final {
  public:
-  explicit VulkanPipelineLayout(const VulkanFunctionTable& vf,
+  explicit VulkanPipelineLayout(const VulkanContext& ctx,
                                 VkDevice device,
                                 const VkDescriptorSetLayout* layouts,
                                 uint32_t numLayouts,
@@ -31,10 +31,9 @@ class VulkanPipelineLayout final {
   }
 
  public:
-  const VulkanFunctionTable& vf_;
+  const VulkanContext& ctx_;
   VkDevice device_ = VK_NULL_HANDLE;
   VkPipelineLayout vkPipelineLayout_ = VK_NULL_HANDLE;
 };
 
-} // namespace vulkan
-} // namespace igl
+} // namespace igl::vulkan