diff options
| author | Matthew Waters <matthew@centricular.com> | 2019-11-26 18:29:14 +1100 |
|---|---|---|
| committer | GStreamer Merge Bot <gitlab-merge-bot@gstreamer-foundation.org> | 2019-11-28 23:27:21 +0000 |
| commit | 5177c24a7eb59b28022a696d483f540fe489f221 (patch) | |
| tree | 41779ab9a976e75b5d8168f13c7e28b7b6c9cb95 /gst-libs/gst/vulkan | |
| parent | f8101477095155402e0300d972dbe4e4fca25ca0 (diff) | |
| download | gstreamer-plugins-bad-5177c24a7eb59b28022a696d483f540fe489f221.tar.gz | |
vulkan/trash: remove free functions covered by GstVulkanHandle
Diffstat (limited to 'gst-libs/gst/vulkan')
| -rw-r--r-- | gst-libs/gst/vulkan/gstvktrash.c | 16 | ||||
| -rw-r--r-- | gst-libs/gst/vulkan/gstvktrash.h | 28 |
2 files changed, 3 insertions, 41 deletions
diff --git a/gst-libs/gst/vulkan/gstvktrash.c b/gst-libs/gst/vulkan/gstvktrash.c index a20364c88..f911d16c8 100644 --- a/gst-libs/gst/vulkan/gstvktrash.c +++ b/gst-libs/gst/vulkan/gstvktrash.c @@ -129,15 +129,7 @@ G_PASTE(gst_vulkan_trash_new_free_,type_name) (GstVulkanFence * fence, \ return trash; \ } -FREE_DESTROY_FUNC (vkDestroyDescriptorPool, VkDescriptorPool, descriptor_pool); -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); +FREE_DESTROY_FUNC (vkDestroySemaphore, VkSemaphore, semaphore); #define FREE_WITH_VK_PARENT(func, type, type_name, parent_type) \ 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); \ return trash; \ } -FREE_WITH_VK_PARENT (vkFreeDescriptorSets, VkDescriptorSet, descriptor_set, - VkDescriptorPool); - static void - _trash_object_unref (GstVulkanDevice * device, GstObject * object) +static void +_trash_object_unref (GstVulkanDevice * device, GstObject * object) { gst_object_unref (object); } diff --git a/gst-libs/gst/vulkan/gstvktrash.h b/gst-libs/gst/vulkan/gstvktrash.h index 9f397a26c..d00902224 100644 --- a/gst-libs/gst/vulkan/gstvktrash.h +++ b/gst-libs/gst/vulkan/gstvktrash.h @@ -78,37 +78,9 @@ GST_VULKAN_API GstVulkanTrash * gst_vulkan_trash_new (GstVulkanFence * fence, GstVulkanTrashNotify notify, 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 GstVulkanTrash * gst_vulkan_trash_new_free_semaphore (GstVulkanFence * fence, VkSemaphore semaphore); - -GST_VULKAN_API -GstVulkanTrash * gst_vulkan_trash_new_free_descriptor_set (GstVulkanFence * fence, - VkDescriptorPool parent, - VkDescriptorSet descriptor_set); - GST_VULKAN_API GstVulkanTrash * gst_vulkan_trash_new_object_unref (GstVulkanFence * fence, GstObject * object); |