ffmpeg | branch: master | Lynne <d...@lynne.ee> | Sun Mar 2 12:31:33 2025 +0000| [7046e65e37d361baf3fe640674723fab044b4c63] | committer: Lynne
vulkan: rename ff_vk_set_descriptor_image to ff_vk_shader_update_img > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7046e65e37d361baf3fe640674723fab044b4c63 --- libavutil/vulkan.c | 34 +++++++++++++++++----------------- libavutil/vulkan.h | 8 ++++---- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/libavutil/vulkan.c b/libavutil/vulkan.c index 8f6ee8a276..3020f01bee 100644 --- a/libavutil/vulkan.c +++ b/libavutil/vulkan.c @@ -2355,10 +2355,10 @@ static inline void update_set_pool_write(FFVulkanContext *s, FFVkExecContext *e, } } -int ff_vk_set_descriptor_image(FFVulkanContext *s, FFVulkanShader *shd, - FFVkExecContext *e, int set, int bind, int offs, - VkImageView view, VkImageLayout layout, - VkSampler sampler) +int ff_vk_shader_update_img(FFVulkanContext *s, FFVkExecContext *e, + FFVulkanShader *shd, int set, int bind, int offs, + VkImageView view, VkImageLayout layout, + VkSampler sampler) { FFVulkanDescriptorSet *desc_set = &shd->desc_set[set]; @@ -2420,6 +2420,19 @@ int ff_vk_set_descriptor_image(FFVulkanContext *s, FFVulkanShader *shd, return 0; } +void ff_vk_shader_update_img_array(FFVulkanContext *s, FFVkExecContext *e, + FFVulkanShader *shd, AVFrame *f, + VkImageView *views, int set, int binding, + VkImageLayout layout, VkSampler sampler) +{ + AVHWFramesContext *hwfc = (AVHWFramesContext *)f->hw_frames_ctx->data; + const int nb_planes = av_pix_fmt_count_planes(hwfc->sw_format); + + for (int i = 0; i < nb_planes; i++) + ff_vk_shader_update_img(s, e, shd, set, binding, i, + views[i], layout, sampler); +} + int ff_vk_shader_update_desc_buffer(FFVulkanContext *s, FFVkExecContext *e, FFVulkanShader *shd, int set, int bind, int elem, @@ -2486,19 +2499,6 @@ int ff_vk_shader_update_desc_buffer(FFVulkanContext *s, FFVkExecContext *e, return 0; } -void ff_vk_shader_update_img_array(FFVulkanContext *s, FFVkExecContext *e, - FFVulkanShader *shd, AVFrame *f, - VkImageView *views, int set, int binding, - VkImageLayout layout, VkSampler sampler) -{ - AVHWFramesContext *hwfc = (AVHWFramesContext *)f->hw_frames_ctx->data; - 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, shd, e, set, binding, i, - views[i], layout, sampler); -} - void ff_vk_shader_update_push_const(FFVulkanContext *s, FFVkExecContext *e, FFVulkanShader *shd, VkShaderStageFlagBits stage, diff --git a/libavutil/vulkan.h b/libavutil/vulkan.h index 91510cbb69..b0db5b2396 100644 --- a/libavutil/vulkan.h +++ b/libavutil/vulkan.h @@ -590,10 +590,10 @@ int ff_vk_shader_update_desc_buffer(FFVulkanContext *s, FFVkExecContext *e, /** * Sets an image descriptor for specified shader and binding. */ -int ff_vk_set_descriptor_image(FFVulkanContext *s, FFVulkanShader *shd, - FFVkExecContext *e, int set, int bind, int offs, - VkImageView view, VkImageLayout layout, - VkSampler sampler); +int ff_vk_shader_update_img(FFVulkanContext *s, FFVkExecContext *e, + FFVulkanShader *shd, int set, int bind, int offs, + VkImageView view, VkImageLayout layout, + VkSampler sampler); /** * Update a descriptor in a buffer with an image array.. _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
