diff options
author | Víctor Manuel Jáquez Leal <vjaquez@igalia.com> | 2021-03-05 09:18:15 +0100 |
---|---|---|
committer | GStreamer Marge Bot <gitlab-merge-bot@gstreamer-foundation.org> | 2021-07-12 05:08:09 +0000 |
commit | c22ae0700be432d0ddbf08a8e2c1abbc23881f7d (patch) | |
tree | 00c1d24c3db6e07359606d4473bb449c7426062d /gst-libs | |
parent | 9c3363a25d5218642ef9f3270fb4d95ae5283f2d (diff) | |
download | gstreamer-plugins-bad-c22ae0700be432d0ddbf08a8e2c1abbc23881f7d.tar.gz |
vulkan: Declare missing auto-pointer cleanup functions.
Also removed a couple guards since, given the glib dependency, they
are set.
Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/2396>
Diffstat (limited to 'gst-libs')
-rw-r--r-- | gst-libs/gst/vulkan/gstvkcommandpool.h | 2 | ||||
-rw-r--r-- | gst-libs/gst/vulkan/gstvkdescriptorcache.h | 4 | ||||
-rw-r--r-- | gst-libs/gst/vulkan/gstvkdevice.h | 2 | ||||
-rw-r--r-- | gst-libs/gst/vulkan/gstvkdisplay.h | 2 | ||||
-rw-r--r-- | gst-libs/gst/vulkan/gstvkfullscreenquad.h | 2 | ||||
-rw-r--r-- | gst-libs/gst/vulkan/gstvkhandlepool.h | 2 | ||||
-rw-r--r-- | gst-libs/gst/vulkan/gstvkinstance.h | 2 | ||||
-rw-r--r-- | gst-libs/gst/vulkan/gstvkphysicaldevice.h | 2 | ||||
-rw-r--r-- | gst-libs/gst/vulkan/gstvkqueue.h | 4 | ||||
-rw-r--r-- | gst-libs/gst/vulkan/gstvkswapper.h | 2 | ||||
-rw-r--r-- | gst-libs/gst/vulkan/gstvktrash.h | 4 | ||||
-rw-r--r-- | gst-libs/gst/vulkan/gstvkwindow.h | 2 |
12 files changed, 24 insertions, 6 deletions
diff --git a/gst-libs/gst/vulkan/gstvkcommandpool.h b/gst-libs/gst/vulkan/gstvkcommandpool.h index 82565793b..7b4972edc 100644 --- a/gst-libs/gst/vulkan/gstvkcommandpool.h +++ b/gst-libs/gst/vulkan/gstvkcommandpool.h @@ -66,6 +66,8 @@ struct _GstVulkanCommandPoolClass gpointer _reserved [GST_PADDING]; }; +G_DEFINE_AUTOPTR_CLEANUP_FUNC (GstVulkanCommandPool, gst_object_unref) + GST_VULKAN_API GstVulkanQueue * gst_vulkan_command_pool_get_queue (GstVulkanCommandPool * pool); diff --git a/gst-libs/gst/vulkan/gstvkdescriptorcache.h b/gst-libs/gst/vulkan/gstvkdescriptorcache.h index dd996cd7a..dc8bf4ce6 100644 --- a/gst-libs/gst/vulkan/gstvkdescriptorcache.h +++ b/gst-libs/gst/vulkan/gstvkdescriptorcache.h @@ -35,7 +35,7 @@ GType gst_vulkan_descriptor_cache_get_type (void); /** * GstVulkanDescriptorCache: - * @parent: the parent #GstObject + * @parent: the parent #GstVulkanHandlePool * @pool: the #GstVulkanDescriptorPool to cache descriptor sets for * * Since: 1.18 @@ -64,6 +64,8 @@ struct _GstVulkanDescriptorCacheClass gpointer _reserved [GST_PADDING]; }; +G_DEFINE_AUTOPTR_CLEANUP_FUNC (GstVulkanDescriptorCache, gst_object_unref) + GST_VULKAN_API GstVulkanDescriptorCache * gst_vulkan_descriptor_cache_new (GstVulkanDescriptorPool * pool, guint n_layouts, diff --git a/gst-libs/gst/vulkan/gstvkdevice.h b/gst-libs/gst/vulkan/gstvkdevice.h index 5f380518a..e48668569 100644 --- a/gst-libs/gst/vulkan/gstvkdevice.h +++ b/gst-libs/gst/vulkan/gstvkdevice.h @@ -84,6 +84,8 @@ struct _GstVulkanDeviceClass gpointer _reserved [GST_PADDING]; }; +G_DEFINE_AUTOPTR_CLEANUP_FUNC (GstVulkanDevice, gst_object_unref) + GST_VULKAN_API GstVulkanDevice * gst_vulkan_device_new (GstVulkanPhysicalDevice * physical_device); GST_VULKAN_API diff --git a/gst-libs/gst/vulkan/gstvkdisplay.h b/gst-libs/gst/vulkan/gstvkdisplay.h index 836cf0ec4..a879b9663 100644 --- a/gst-libs/gst/vulkan/gstvkdisplay.h +++ b/gst-libs/gst/vulkan/gstvkdisplay.h @@ -125,6 +125,8 @@ struct _GstVulkanDisplayClass gpointer _reserved [GST_PADDING]; }; +G_DEFINE_AUTOPTR_CLEANUP_FUNC (GstVulkanDisplay, gst_object_unref) + GST_VULKAN_API GstVulkanDisplay * gst_vulkan_display_new (GstVulkanInstance *instance); GST_VULKAN_API diff --git a/gst-libs/gst/vulkan/gstvkfullscreenquad.h b/gst-libs/gst/vulkan/gstvkfullscreenquad.h index 907053aaf..5e1a54bfc 100644 --- a/gst-libs/gst/vulkan/gstvkfullscreenquad.h +++ b/gst-libs/gst/vulkan/gstvkfullscreenquad.h @@ -99,6 +99,8 @@ struct _GstVulkanFullScreenQuadClass gpointer _reserved [GST_PADDING]; }; +G_DEFINE_AUTOPTR_CLEANUP_FUNC (GstVulkanFullScreenQuad, gst_object_unref) + GST_VULKAN_API GstVulkanFullScreenQuad * gst_vulkan_full_screen_quad_new (GstVulkanQueue * queue); diff --git a/gst-libs/gst/vulkan/gstvkhandlepool.h b/gst-libs/gst/vulkan/gstvkhandlepool.h index a2654ad3c..6a15e7d91 100644 --- a/gst-libs/gst/vulkan/gstvkhandlepool.h +++ b/gst-libs/gst/vulkan/gstvkhandlepool.h @@ -89,6 +89,8 @@ struct _GstVulkanHandlePoolClass gpointer _padding[GST_PADDING]; }; +G_DEFINE_AUTOPTR_CLEANUP_FUNC (GstVulkanHandlePool, gst_object_unref) + GST_VULKAN_API gpointer gst_vulkan_handle_pool_alloc (GstVulkanHandlePool * pool, GError ** error); GST_VULKAN_API diff --git a/gst-libs/gst/vulkan/gstvkinstance.h b/gst-libs/gst/vulkan/gstvkinstance.h index 4af34d5e0..4c3a8f386 100644 --- a/gst-libs/gst/vulkan/gstvkinstance.h +++ b/gst-libs/gst/vulkan/gstvkinstance.h @@ -76,6 +76,8 @@ struct _GstVulkanInstanceClass gpointer _reserved [GST_PADDING]; }; +G_DEFINE_AUTOPTR_CLEANUP_FUNC (GstVulkanInstance, gst_object_unref) + GST_VULKAN_API GstVulkanInstance * gst_vulkan_instance_new (void); GST_VULKAN_API diff --git a/gst-libs/gst/vulkan/gstvkphysicaldevice.h b/gst-libs/gst/vulkan/gstvkphysicaldevice.h index d500570d0..ce7e0da53 100644 --- a/gst-libs/gst/vulkan/gstvkphysicaldevice.h +++ b/gst-libs/gst/vulkan/gstvkphysicaldevice.h @@ -83,6 +83,8 @@ struct _GstVulkanPhysicalDeviceClass gpointer _reserved [GST_PADDING]; }; +G_DEFINE_AUTOPTR_CLEANUP_FUNC (GstVulkanPhysicalDevice, gst_object_unref) + GST_VULKAN_API GstVulkanPhysicalDevice * gst_vulkan_physical_device_new (GstVulkanInstance * instance, guint device_index); diff --git a/gst-libs/gst/vulkan/gstvkqueue.h b/gst-libs/gst/vulkan/gstvkqueue.h index 4909149d0..4c1831ecf 100644 --- a/gst-libs/gst/vulkan/gstvkqueue.h +++ b/gst-libs/gst/vulkan/gstvkqueue.h @@ -78,7 +78,9 @@ struct _GstVulkanQueueClass gpointer _reserved [GST_PADDING]; }; -GST_VULKAN_API +G_DEFINE_AUTOPTR_CLEANUP_FUNC (GstVulkanQueue, gst_object_unref) + + GST_VULKAN_API GstVulkanDevice * gst_vulkan_queue_get_device (GstVulkanQueue * queue); GST_VULKAN_API diff --git a/gst-libs/gst/vulkan/gstvkswapper.h b/gst-libs/gst/vulkan/gstvkswapper.h index ae19b61bb..34f18800f 100644 --- a/gst-libs/gst/vulkan/gstvkswapper.h +++ b/gst-libs/gst/vulkan/gstvkswapper.h @@ -84,6 +84,8 @@ struct _GstVulkanSwapperClass gpointer _reserved [GST_PADDING]; }; +G_DEFINE_AUTOPTR_CLEANUP_FUNC (GstVulkanSwapper, gst_object_unref) + GST_VULKAN_API GstVulkanSwapper * gst_vulkan_swapper_new (GstVulkanDevice * device, GstVulkanWindow * window); diff --git a/gst-libs/gst/vulkan/gstvktrash.h b/gst-libs/gst/vulkan/gstvktrash.h index b6d837e02..3c1eda71e 100644 --- a/gst-libs/gst/vulkan/gstvktrash.h +++ b/gst-libs/gst/vulkan/gstvktrash.h @@ -96,9 +96,7 @@ gst_vulkan_trash_unref (GstVulkanTrash * trash) gst_mini_object_unref (GST_MINI_OBJECT_CAST (trash)); } -#ifdef G_DEFINE_AUTOPTR_CLEANUP_FUNC G_DEFINE_AUTOPTR_CLEANUP_FUNC(GstVulkanTrash, gst_vulkan_trash_unref) -#endif GST_VULKAN_API GstVulkanTrash * gst_vulkan_trash_new (GstVulkanFence * fence, @@ -163,9 +161,7 @@ GType gst_vulkan_trash_list_get_type (void); #define GST_IS_VULKAN_TRASH_LIST(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_VULKAN_TRASH_LIST)) #define GST_IS_VULKAN_TRASH_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_VULKAN_TRASH_LIST)) -#ifdef G_DEFINE_AUTOPTR_CLEANUP_FUNC G_DEFINE_AUTOPTR_CLEANUP_FUNC(GstVulkanTrashList, gst_object_unref) -#endif /** * GstVulkanTrashList: diff --git a/gst-libs/gst/vulkan/gstvkwindow.h b/gst-libs/gst/vulkan/gstvkwindow.h index 72231ace8..2cec13d61 100644 --- a/gst-libs/gst/vulkan/gstvkwindow.h +++ b/gst-libs/gst/vulkan/gstvkwindow.h @@ -140,6 +140,8 @@ struct _GstVulkanWindowClass { gpointer _reserved[GST_PADDING]; }; +G_DEFINE_AUTOPTR_CLEANUP_FUNC(GstVulkanWindow, gst_object_unref) + GST_VULKAN_API GstVulkanWindow * gst_vulkan_window_new (GstVulkanDisplay *display); |