mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-05 06:58:56 +00:00
Code Issues 1 Projects Releases Wiki Activity

vulkan/trash: remove free functions covered by GstVulkanHandle

Browse source
This commit is contained in:
Matthew Waters 2019-11-26 18:29:14 +11:00 committed by GStreamer Merge Bot
parent f810147709
commit 5177c24a7e
2 changed files with 3 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
gst-libs/gst/vulkan/gstvktrash.c
View file

@ -129,15 +129,7 @@ G_PASTE(gst_vulkan_trash_new_free_,type_name) (GstVulkanFence * fence, \
return trash; \ return trash; \
} }
FREE_DESTROY_FUNC (vkDestroyDescriptorPool, VkDescriptorPool, descriptor_pool); FREE_DESTROY_FUNC (vkDestroySemaphore, VkSemaphore, semaphore);
FREE_DESTROY_FUNC (vkDestroyDescriptorSetLayout, VkDescriptorSetLayout,
descriptor_set_layout);
FREE_DESTROY_FUNC (vkDestroyFramebuffer, VkFramebuffer, framebuffer);
FREE_DESTROY_FUNC (vkDestroyPipeline, VkPipeline, pipeline);
FREE_DESTROY_FUNC (vkDestroyPipelineLayout, VkPipelineLayout, pipeline_layout);
FREE_DESTROY_FUNC (vkDestroyRenderPass, VkRenderPass, render_pass);
FREE_DESTROY_FUNC (vkDestroySemaphore, VkSemaphore, semaphore)
FREE_DESTROY_FUNC (vkDestroySampler, VkSampler, sampler);
#define FREE_WITH_VK_PARENT(func, type, type_name, parent_type) \ #define FREE_WITH_VK_PARENT(func, type, type_name, parent_type) \
struct G_PASTE(free_parent_info_,type_name) \ struct G_PASTE(free_parent_info_,type_name) \
{ \ { \
@ -167,11 +159,9 @@ G_PASTE(gst_vulkan_trash_new_free_,type_name) (GstVulkanFence * fence, \
(GstVulkanTrashNotify) G_PASTE(_free_,type_name), info); \ (GstVulkanTrashNotify) G_PASTE(_free_,type_name), info); \
return trash; \ return trash; \
} }
FREE_WITH_VK_PARENT (vkFreeDescriptorSets, VkDescriptorSet, descriptor_set,
VkDescriptorPool);
static void static void
_trash_object_unref (GstVulkanDevice * device, GstObject * object) _trash_object_unref (GstVulkanDevice * device, GstObject * object)
{ {
gst_object_unref (object); gst_object_unref (object);
} }

28
gst-libs/gst/vulkan/gstvktrash.h
View file

@ -78,37 +78,9 @@ GST_VULKAN_API
GstVulkanTrash * gst_vulkan_trash_new (GstVulkanFence * fence, GstVulkanTrash * gst_vulkan_trash_new (GstVulkanFence * fence,
GstVulkanTrashNotify notify, GstVulkanTrashNotify notify,
gpointer user_data); gpointer user_data);
GST_VULKAN_API
GstVulkanTrash * gst_vulkan_trash_new_free_descriptor_pool (GstVulkanFence * fence,
VkDescriptorPool descriptor_pool);
GST_VULKAN_API
GstVulkanTrash * gst_vulkan_trash_new_free_descriptor_set_layout (GstVulkanFence * fence,
VkDescriptorSetLayout descriptor_set_layout);
GST_VULKAN_API
GstVulkanTrash * gst_vulkan_trash_new_free_framebuffer (GstVulkanFence * fence,
VkFramebuffer framebuffer);
GST_VULKAN_API
GstVulkanTrash * gst_vulkan_trash_new_free_pipeline (GstVulkanFence * fence,
VkPipeline pipeline);
GST_VULKAN_API
GstVulkanTrash * gst_vulkan_trash_new_free_pipeline_layout (GstVulkanFence * fence,
VkPipelineLayout pipeline_layout);
GST_VULKAN_API
GstVulkanTrash * gst_vulkan_trash_new_free_render_pass (GstVulkanFence * fence,
VkRenderPass render_pass);
GST_VULKAN_API
GstVulkanTrash * gst_vulkan_trash_new_free_sampler (GstVulkanFence * fence,
VkSampler sampler);
GST_VULKAN_API GST_VULKAN_API
GstVulkanTrash * gst_vulkan_trash_new_free_semaphore (GstVulkanFence * fence, GstVulkanTrash * gst_vulkan_trash_new_free_semaphore (GstVulkanFence * fence,
VkSemaphore semaphore); VkSemaphore semaphore);
GST_VULKAN_API
GstVulkanTrash * gst_vulkan_trash_new_free_descriptor_set (GstVulkanFence * fence,
VkDescriptorPool parent,
VkDescriptorSet descriptor_set);
GST_VULKAN_API GST_VULKAN_API
GstVulkanTrash * gst_vulkan_trash_new_object_unref (GstVulkanFence * fence, GstVulkanTrash * gst_vulkan_trash_new_object_unref (GstVulkanFence * fence,
GstObject * object); GstObject * object);