From c6a3b2ab85b2c15a20becb2ebf10a4e6b8b67fc0 Mon Sep 17 00:00:00 2001 From: Chris Spencer Date: Tue, 2 Apr 2024 16:23:31 +0100 Subject: [PATCH] vkbufferpool: correct usage flags type Part-of: --- girs/GstVulkan-1.0.gir | 2 +- .../gst-plugins-bad/gst-libs/gst/vulkan/gstvkbufferpool.c | 6 +++--- .../gst-plugins-bad/gst-libs/gst/vulkan/gstvkbufferpool.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/girs/GstVulkan-1.0.gir b/girs/GstVulkan-1.0.gir index 03047e892d..9eb2306581 100644 --- a/girs/GstVulkan-1.0.gir +++ b/girs/GstVulkan-1.0.gir @@ -1115,7 +1115,7 @@ multiple times. This must be called before any other #GstVulkanBufferMemory ope The Vulkan buffer usage flags. - + diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkbufferpool.c b/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkbufferpool.c index 94704b8190..bd4c314278 100644 --- a/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkbufferpool.c +++ b/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkbufferpool.c @@ -44,7 +44,7 @@ struct _GstVulkanBufferPoolPrivate GstCaps *caps; GstVideoInfo v_info; gboolean add_videometa; - VkImageUsageFlags usage; + VkBufferUsageFlags usage; VkMemoryPropertyFlags mem_props; gsize alloc_sizes[GST_VIDEO_MAX_PLANES]; }; @@ -74,7 +74,7 @@ gst_vulkan_buffer_pool_get_options (GstBufferPool * pool) static inline gboolean gst_vulkan_buffer_pool_config_get_allocation_params (GstStructure * - config, VkImageUsageFlags * usage, VkMemoryPropertyFlags * mem_props) + config, VkBufferUsageFlags * usage, VkMemoryPropertyFlags * mem_props) { if (!gst_structure_get_uint (config, "usage", usage)) { *usage = @@ -98,7 +98,7 @@ gst_vulkan_buffer_pool_config_get_allocation_params (GstStructure * */ void gst_vulkan_buffer_pool_config_set_allocation_params (GstStructure * - config, VkImageUsageFlags usage, VkMemoryPropertyFlags mem_properties) + config, VkBufferUsageFlags usage, VkMemoryPropertyFlags mem_properties) { /* assumption: G_TYPE_UINT is compatible with uint32_t (VkFlags) */ gst_structure_set (config, "usage", G_TYPE_UINT, usage, "memory-properties", diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkbufferpool.h b/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkbufferpool.h index d2b0fcb63d..a70a28dd17 100644 --- a/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkbufferpool.h +++ b/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/gstvkbufferpool.h @@ -84,7 +84,7 @@ GstBufferPool *gst_vulkan_buffer_pool_new (GstVulkanDevice * devic GST_VULKAN_API void gst_vulkan_buffer_pool_config_set_allocation_params (GstStructure * config, - VkImageUsageFlags usage, + VkBufferUsageFlags usage, VkMemoryPropertyFlags mem_properties); G_END_DECLS