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

vkimagememory: gst_vulkan_image_memory_alloc_with_image_info()

Browse source 
This new method instead of passing a bunch of variables which will fill
`VkImageCreateInfo`, the method accepts this whole structure, so the caller can
customize it as much as they want.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4351>
This commit is contained in:
Víctor Manuel Jáquez Leal 2023-01-04 17:10:11 +01:00 committed by GStreamer Marge Bot
parent 5f5249cf73
commit 64ba7fb2eb
2 changed files with 77 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

86
subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkimagememory.c
View file

@ -188,29 +188,36 @@ gst_vulkan_image_memory_init (GstVulkanImageMemory * mem,
}
static GstVulkanImageMemory *
_vk_image_mem_new_alloc (GstAllocator * allocator, GstMemory * parent,
GstVulkanDevice * device, VkFormat format, gsize width, gsize height,
VkImageTiling tiling, VkImageUsageFlags usage,
VkMemoryPropertyFlags mem_prop_flags, gpointer user_data,
GDestroyNotify notify)
_vk_image_mem_new_alloc_with_image_info (GstAllocator * allocator,
GstMemory * parent, GstVulkanDevice * device,
VkImageCreateInfo * image_info, VkMemoryPropertyFlags mem_prop_flags,
gpointer user_data, GDestroyNotify notify)
{
GstVulkanImageMemory *mem = NULL;
GstAllocationParams params = { 0, };
VkImageCreateInfo image_info;
VkPhysicalDevice gpu;
GError *error = NULL;
GArray *qfi = NULL;
guint32 type_idx;
VkImage image;
VkResult err;
gpu = gst_vulkan_device_get_physical_device (device);
if (!_create_info_from_args (&image_info, format, width, height, tiling,
usage)) {
GST_CAT_ERROR (GST_CAT_VULKAN_IMAGE_MEMORY, "Incorrect image parameters");
goto error;
if (!image_info->pQueueFamilyIndices) {
/* XXX: overwrite the queue indices part of the structure */
qfi = gst_vulkan_device_queue_family_indices (device);
image_info->pQueueFamilyIndices = (uint32_t *) qfi->data;
image_info->queueFamilyIndexCount = qfi->len;
image_info->sharingMode = qfi->len > 1 ? VK_SHARING_MODE_CONCURRENT :
VK_SHARING_MODE_EXCLUSIVE;
}
err = vkCreateImage (device->device, &image_info, NULL, &image);
err = vkCreateImage (device->device, image_info, NULL, &image);
if (qfi)
g_array_unref (qfi);
if (gst_vulkan_error_to_g_error (err, &error, "vkCreateImage") < 0)
goto vk_error;
@ -218,13 +225,16 @@ _vk_image_mem_new_alloc (GstAllocator * allocator, GstMemory * parent,
vkGetImageMemoryRequirements (device->device, image, &mem->requirements);
gst_vulkan_image_memory_init (mem, allocator, parent, device, usage, &params,
mem->requirements.size, user_data, notify);
mem->create_info = image_info;
gst_vulkan_image_memory_init (mem, allocator, parent, device,
image_info->usage, &params, mem->requirements.size, user_data, notify);
mem->create_info = *image_info;
/* XXX: to avoid handling pNext lifetime */
mem->create_info.pNext = NULL;
mem->image = image;
err = vkGetPhysicalDeviceImageFormatProperties (gpu, format, VK_IMAGE_TYPE_2D,
tiling, usage, 0, &mem->format_properties);
err = vkGetPhysicalDeviceImageFormatProperties (gpu, image_info->format,
VK_IMAGE_TYPE_2D, image_info->tiling, image_info->usage, 0,
&mem->format_properties);
if (gst_vulkan_error_to_g_error (err, &error,
"vkGetPhysicalDeviceImageFormatProperties") < 0)
goto vk_error;
@ -266,6 +276,25 @@ error:
}
}
static GstVulkanImageMemory *
_vk_image_mem_new_alloc (GstAllocator * allocator, GstMemory * parent,
GstVulkanDevice * device, VkFormat format, gsize width, gsize height,
VkImageTiling tiling, VkImageUsageFlags usage,
VkMemoryPropertyFlags mem_prop_flags, gpointer user_data,
GDestroyNotify notify)
{
VkImageCreateInfo image_info;
if (!_create_info_from_args (&image_info, format, width, height, tiling,
usage)) {
GST_CAT_ERROR (GST_CAT_VULKAN_IMAGE_MEMORY, "Incorrect image parameters");
return NULL;
}
return _vk_image_mem_new_alloc_with_image_info (allocator, parent, device,
&image_info, mem_prop_flags, user_data, notify);
}
static GstVulkanImageMemory *
_vk_image_mem_new_wrapped (GstAllocator * allocator, GstMemory * parent,
GstVulkanDevice * device, VkImage image, VkFormat format, gsize width,
@ -417,6 +446,31 @@ _vk_image_mem_free (GstAllocator * allocator, GstMemory * memory)
g_free (mem);
}
/**
* gst_vulkan_image_memory_alloc_with_image_info:
* @device: a #GstVulkanDevice
* @image_info: VkImageCreateInfo structure
* @mem_prop_flags: VkMemoryPropertyFlags flags
*
* Returns: a #GstMemory object backed by a vulkan device memory
*
* Since: 1.24
*/
GstMemory *
gst_vulkan_image_memory_alloc_with_image_info (GstVulkanDevice * device,
VkImageCreateInfo * image_info, VkMemoryPropertyFlags mem_prop_flags)
{
GstVulkanImageMemory *mem;
g_return_val_if_fail (image_info
&& image_info->sType == VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO, NULL);
mem = _vk_image_mem_new_alloc_with_image_info (_vulkan_image_memory_allocator,
NULL, device, image_info, mem_prop_flags, NULL, NULL);
return (GstMemory *) mem;
}
/**
* gst_vulkan_image_memory_alloc:
* @device: a #GstVulkanDevice

7
subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkimagememory.h
View file

@ -175,6 +175,13 @@ gboolean gst_vulkan_image_memory_init (GstVulkanImageMemory *
gsize size,
gpointer user_data,
GDestroyNotify notify);
GST_VULKAN_API
GstMemory * gst_vulkan_image_memory_alloc_with_image_info
(GstVulkanDevice * device,
VkImageCreateInfo * image_info,
VkMemoryPropertyFlags mem_prop_flags);
GST_VULKAN_API
GstMemory * gst_vulkan_image_memory_alloc (GstVulkanDevice * device,
VkFormat format,