mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 12:11:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

vulkan: fix up some gir annotations

Browse source
This commit is contained in:
Matthew Waters 2019-11-29 11:05:50 +11:00
parent 812d593c4e
commit dee29aa8e7
3 changed files with 32 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gst-libs/gst/vulkan/gstvkimagememory.c
View file

@ -568,8 +568,6 @@ gst_vulkan_image_memory_release_view (GstVulkanImageMemory * image,
* @image: a #GstVulkanImageMemory * @image: a #GstVulkanImageMemory
* @view: a #GstVulkanImageView * @view: a #GstVulkanImageView
* *
* Return: the height of @image
*
* Since: 1.18 * Since: 1.18
*/ */
void void
@ -620,8 +618,8 @@ find_view_func (GstVulkanImageView * view, gpointer user_data)
/** /**
* gst_vulkan_image_memory_find_view: * gst_vulkan_image_memory_find_view:
* @image: a #GstVulkanImageMemory * @image: a #GstVulkanImageMemory
* @find_func: #GstVulkanImageMemoryFindViewFunc to search with * @find_func: (scope call): #GstVulkanImageMemoryFindViewFunc to search with
* @data: user data to call @finc_func with * @user_data: user data to call @finc_func with
* *
* Return: (transfer full): the first #GstVulkanImageView that @find_func * Return: (transfer full): the first #GstVulkanImageView that @find_func
* returns %TRUE for, or %NULL * returns %TRUE for, or %NULL
@ -630,7 +628,7 @@ find_view_func (GstVulkanImageView * view, gpointer user_data)
*/ */
GstVulkanImageView * GstVulkanImageView *
gst_vulkan_image_memory_find_view (GstVulkanImageMemory * image, gst_vulkan_image_memory_find_view (GstVulkanImageMemory * image,
GstVulkanImageMemoryFindViewFunc find_func, gpointer data) GstVulkanImageMemoryFindViewFunc find_func, gpointer user_data)
{ {
GstVulkanImageView *ret = NULL; GstVulkanImageView *ret = NULL;
struct view_data view; struct view_data view;
@ -643,7 +641,7 @@ gst_vulkan_image_memory_find_view (GstVulkanImageMemory * image,
g_mutex_lock (&image->lock); g_mutex_lock (&image->lock);
view.img = image; view.img = image;
view.find_func = find_func; view.find_func = find_func;
view.find_data = data; view.find_data = user_data;
if (g_ptr_array_find_with_equal_func (image->outstanding_views, &view, if (g_ptr_array_find_with_equal_func (image->outstanding_views, &view,
(GEqualFunc) find_view_func, &index)) { (GEqualFunc) find_view_func, &index)) {

18
gst-libs/gst/vulkan/gstvkphysicaldevice.c
View file

@ -625,7 +625,7 @@ error:
} }
/** /**
* gst_vulkan_physical_device_get_physical_device: (skip) * gst_vulkan_physical_device_get_handle: (skip)
* @device: a #GstVulkanPhysicalDevice * @device: a #GstVulkanPhysicalDevice
* *
* Returns: The associated `VkPhysicalDevice` handle * Returns: The associated `VkPhysicalDevice` handle
@ -639,3 +639,19 @@ gst_vulkan_physical_device_get_handle (GstVulkanPhysicalDevice * device)
return device->device; return device->device;
} }
/**
* gst_vulkan_physical_device_get_instance:
* @device: a #GstVulkanPhysicalDevice
*
* Returns: (transfer full): The #GstVulkanInstance associated with this physical device
*
* Since: 1.18
*/
GstVulkanInstance *
gst_vulkan_physical_device_get_instance (GstVulkanPhysicalDevice * device)
{
g_return_val_if_fail (GST_IS_VULKAN_PHYSICAL_DEVICE (device), NULL);
return device->instance ? gst_object_ref (device->instance) : NULL;
}

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

@ -54,7 +54,7 @@ gst_vulkan_trash_dispose (GstVulkanTrash * trash)
/* keep the buffer alive */ /* keep the buffer alive */
gst_vulkan_trash_ref (trash); gst_vulkan_trash_ref (trash);
/* return the buffer to the pool */ /* return the trash object to the pool */
gst_vulkan_trash_release (cache, trash); gst_vulkan_trash_release (cache, trash);
return FALSE; return FALSE;
@ -299,6 +299,16 @@ gst_vulkan_trash_list_init (GstVulkanTrashList * trash_list)
{ {
} }
/**
* gst_vulkan_trash_list_acquire:
* @trash_list: a #GstVulkanTrashList
* @fence: a #GstVulkanFence to wait for signalling
* @notify: (scope async): notify function for when @fence is signalled
* @user_data: user data for @notify
*
* Returns: (transfer full): a new or reused #GstVulkanTrash for the provided
* parameters.
*/
GstVulkanTrash * GstVulkanTrash *
gst_vulkan_trash_list_acquire (GstVulkanTrashList * trash_list, gst_vulkan_trash_list_acquire (GstVulkanTrashList * trash_list,
GstVulkanFence * fence, GstVulkanTrashNotify notify, gpointer user_data) GstVulkanFence * fence, GstVulkanTrashNotify notify, gpointer user_data)