1 files changed, 124 insertions, 6 deletions

diff --git a/gst-libs/gst/vulkan/gstvkfence.c b/gst-libs/gst/vulkan/gstvkfence.c
index 8e4ffaf6b..a624b9bcb 100644
--- a/gst-libs/gst/vulkan/gstvkfence.c
+++ b/gst-libs/gst/vulkan/gstvkfence.c
@@ -23,6 +23,7 @@
 #endif
 
 #include "gstvkfence.h"
+#include "gstvkdevice.h"
 
 /**
  * SECTION:vkfence
@@ -36,6 +37,8 @@
 GST_DEBUG_CATEGORY (gst_debug_vulkan_fence);
 #define GST_CAT_DEFAULT gst_debug_vulkan_fence
 
+#define gst_vulkan_fence_cache_release(c,f) gst_vulkan_handle_pool_release(GST_VULKAN_HANDLE_POOL (c), f)
+
 static void
 _init_debug (void)
 {
@@ -48,6 +51,23 @@ _init_debug (void)
   }
 }
 
+static gboolean
+gst_vulkan_fence_dispose (GstVulkanFence * fence)
+{
+  GstVulkanFenceCache *cache;
+
+  /* no pool, do free */
+  if ((cache = fence->cache) == NULL)
+    return TRUE;
+
+  /* keep the buffer alive */
+  gst_vulkan_fence_ref (fence);
+  /* return the buffer to the cache */
+  gst_vulkan_fence_cache_release (cache, fence);
+
+  return FALSE;
+}
+
 static void
 gst_vulkan_fence_free (GstVulkanFence * fence)
 {
@@ -59,7 +79,7 @@ gst_vulkan_fence_free (GstVulkanFence * fence)
   if (fence->fence)
     vkDestroyFence (fence->device->device, fence->fence, NULL);
 
-  gst_object_unref (fence->device);
+  gst_clear_object (&fence->device);
 
   g_free (fence);
 }
@@ -67,7 +87,6 @@ gst_vulkan_fence_free (GstVulkanFence * fence)
 /**
  * gst_vulkan_fence_new:
  * @device: the parent #GstVulkanDevice
- * @flags: set of flags to create the fence with
  * @error: a #GError for the failure condition
  *
  * Returns: whether a new #GstVulkanFence or %NULL on error
@@ -75,8 +94,7 @@ gst_vulkan_fence_free (GstVulkanFence * fence)
  * Since: 1.18
  */
 GstVulkanFence *
-gst_vulkan_fence_new (GstVulkanDevice * device, VkFenceCreateFlags flags,
-    GError ** error)
+gst_vulkan_fence_new (GstVulkanDevice * device, GError ** error)
 {
   VkFenceCreateInfo fence_info = { 0, };
   GstVulkanFence *fence;
@@ -92,7 +110,7 @@ gst_vulkan_fence_new (GstVulkanDevice * device, VkFenceCreateFlags flags,
 
   fence_info.sType = VK_STRUCTURE_TYPE_FENCE_CREATE_INFO;
   fence_info.pNext = NULL;
-  fence_info.flags = flags;
+  fence_info.flags = 0;
 
   err = vkCreateFence (device->device, &fence_info, NULL, &fence->fence);
   if (gst_vulkan_error_to_g_error (err, error, "vkCreateFence") < 0) {
@@ -102,7 +120,8 @@ gst_vulkan_fence_new (GstVulkanDevice * device, VkFenceCreateFlags flags,
   }
 
   gst_mini_object_init (GST_MINI_OBJECT_CAST (fence), 0, GST_TYPE_VULKAN_FENCE,
-      NULL, NULL, (GstMiniObjectFreeFunction) gst_vulkan_fence_free);
+      NULL, (GstMiniObjectDisposeFunction) gst_vulkan_fence_dispose,
+      (GstMiniObjectFreeFunction) gst_vulkan_fence_free);
 
   return fence;
 }
@@ -152,4 +171,103 @@ gst_vulkan_fence_is_signaled (GstVulkanFence * fence)
   return vkGetFenceStatus (fence->device->device, fence->fence) == VK_SUCCESS;
 }
 
+void
+gst_vulkan_fence_reset (GstVulkanFence * fence)
+{
+  g_return_if_fail (fence != NULL);
+
+  if (!fence->fence)
+    return;
+
+  GST_TRACE ("resetting fence %p", fence);
+  vkResetFences (fence->device->device, 1, &fence->fence);
+}
+
 GST_DEFINE_MINI_OBJECT_TYPE (GstVulkanFence, gst_vulkan_fence);
+
+#define parent_class gst_vulkan_fence_cache_parent_class
+G_DEFINE_TYPE_WITH_CODE (GstVulkanFenceCache, gst_vulkan_fence_cache,
+    GST_TYPE_VULKAN_HANDLE_POOL, _init_debug ());
+
+GstVulkanFenceCache *
+gst_vulkan_fence_cache_new (GstVulkanDevice * device)
+{
+  GstVulkanFenceCache *ret;
+  GstVulkanHandlePool *pool;
+
+  g_return_val_if_fail (GST_IS_VULKAN_DEVICE (device), NULL);
+
+  ret = g_object_new (GST_TYPE_VULKAN_FENCE_CACHE, NULL);
+
+  pool = GST_VULKAN_HANDLE_POOL (ret);
+  pool->device = gst_object_ref (device);
+
+  gst_object_ref_sink (ret);
+
+  return ret;
+}
+
+static gpointer
+gst_vulkan_fence_cache_alloc (GstVulkanHandlePool * pool, GError ** error)
+{
+  return gst_vulkan_fence_new (pool->device, error);
+}
+
+static gpointer
+gst_vulkan_fence_cache_acquire_impl (GstVulkanHandlePool * pool,
+    GError ** error)
+{
+  GstVulkanFence *fence;
+
+  if ((fence =
+          GST_VULKAN_HANDLE_POOL_CLASS (parent_class)->acquire (pool, error))) {
+    fence->cache = gst_object_ref (pool);
+    if (!fence->device)
+      fence->device = gst_object_ref (pool->device);
+  }
+
+  return fence;
+}
+
+static void
+gst_vulkan_fence_cache_release_impl (GstVulkanHandlePool * pool,
+    gpointer handle)
+{
+  GstVulkanFence *fence = handle;
+
+  gst_vulkan_fence_reset (fence);
+
+  GST_VULKAN_HANDLE_POOL_CLASS (parent_class)->release (pool, handle);
+
+  if (fence) {
+    gst_clear_object (&fence->cache);
+    gst_clear_object (&fence->device);
+  }
+}
+
+static void
+gst_vulkan_fence_cache_free (GstVulkanHandlePool * pool, gpointer handle)
+{
+  GstVulkanFence *fence = handle;
+
+  if (!fence->device)
+    fence->device = gst_object_ref (pool->device);
+
+  gst_vulkan_fence_unref (handle);
+}
+
+static void
+gst_vulkan_fence_cache_init (GstVulkanFenceCache * cache)
+{
+}
+
+static void
+gst_vulkan_fence_cache_class_init (GstVulkanFenceCacheClass * klass)
+{
+  GstVulkanHandlePoolClass *handle_class = (GstVulkanHandlePoolClass *) klass;
+
+  handle_class->acquire = gst_vulkan_fence_cache_acquire_impl;
+  handle_class->alloc = gst_vulkan_fence_cache_alloc;
+  handle_class->release = gst_vulkan_fence_cache_release_impl;
+  handle_class->free = gst_vulkan_fence_cache_free;
+}