From c346c097af1e5ca0fe809607b716ca3b6c52e314 Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Sun, 3 Mar 2024 17:36:52 +0100 Subject: [PATCH] avutil/vulkan: Make ff_vk_set_descriptor_image() static Only used in vulkan.c. Reviewed-by: Lynne Signed-off-by: Andreas Rheinhardt --- libavutil/vulkan.c | 11 ++++++----- libavutil/vulkan.h | 3 --- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/libavutil/vulkan.c b/libavutil/vulkan.c index 4392a77d6c..c725634fef 100644 --- a/libavutil/vulkan.c +++ b/libavutil/vulkan.c @@ -1659,9 +1659,10 @@ int ff_vk_set_descriptor_sampler(FFVulkanContext *s, FFVulkanPipeline *pl, return 0; } -int ff_vk_set_descriptor_image(FFVulkanContext *s, FFVulkanPipeline *pl, - FFVkExecContext *e, int set, int bind, int offs, - VkImageView view, VkImageLayout layout, VkSampler sampler) +static int vk_set_descriptor_image(FFVulkanContext *s, FFVulkanPipeline *pl, + FFVkExecContext *e, int set, int bind, int offs, + VkImageView view, VkImageLayout layout, + VkSampler sampler) { FFVulkanDescriptorSet *desc_set = &pl->desc_set[set]; VkDescriptorGetInfoEXT desc_get_info = { @@ -1758,8 +1759,8 @@ void ff_vk_update_descriptor_img_array(FFVulkanContext *s, FFVulkanPipeline *pl, const int nb_planes = av_pix_fmt_count_planes(hwfc->sw_format); for (int i = 0; i < nb_planes; i++) - ff_vk_set_descriptor_image(s, pl, e, set, binding, i, - views[i], layout, sampler); + vk_set_descriptor_image(s, pl, e, set, binding, i, + views[i], layout, sampler); } void ff_vk_update_push_exec(FFVulkanContext *s, FFVkExecContext *e, diff --git a/libavutil/vulkan.h b/libavutil/vulkan.h index 184d58ff5c..c04a43e278 100644 --- a/libavutil/vulkan.h +++ b/libavutil/vulkan.h @@ -485,9 +485,6 @@ void ff_vk_exec_bind_pipeline(FFVulkanContext *s, FFVkExecContext *e, int ff_vk_set_descriptor_sampler(FFVulkanContext *s, FFVulkanPipeline *pl, FFVkExecContext *e, int set, int bind, int offs, VkSampler *sampler); -int ff_vk_set_descriptor_image(FFVulkanContext *s, FFVulkanPipeline *pl, - FFVkExecContext *e, int set, int bind, int offs, - VkImageView view, VkImageLayout layout, VkSampler sampler); int ff_vk_set_descriptor_buffer(FFVulkanContext *s, FFVulkanPipeline *pl, FFVkExecContext *e, int set, int bind, int offs, VkDeviceAddress addr, VkDeviceSize len, VkFormat fmt);