From: Lynne <dev@lynne.ee> To: ffmpeg-devel@ffmpeg.org Cc: Lynne <dev@lynne.ee> Subject: [FFmpeg-devel] [PATCH v4 02/16] vulkan: rename ff_vk_set_descriptor_image to ff_vk_shader_update_img Date: Thu, 13 Mar 2025 18:03:34 +0100 Message-ID: <20250313170355.92290-3-dev@lynne.ee> (raw) In-Reply-To: <20250313170355.92290-1-dev@lynne.ee> --- 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.. -- 2.47.2 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
next prev parent reply other threads:[~2025-03-13 17:04 UTC|newest] Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top 2025-03-13 17:03 [FFmpeg-devel] [PATCH v4 00/16] Add a Vulkan compute based FFv1 hwaccel Lynne 2025-03-13 17:03 ` [FFmpeg-devel] [PATCH v4 01/16] pixfmt: add AV_PIX_FMT_GBRAP32 Lynne 2025-03-14 15:13 ` Michael Niedermayer 2025-03-14 15:59 ` Lynne 2025-03-14 18:34 ` Marton Balint 2025-03-13 17:03 ` Lynne [this message] 2025-03-13 17:03 ` [FFmpeg-devel] [PATCH v4 03/16] vulkan: add ff_vk_create_imageview Lynne 2025-03-13 17:03 ` [FFmpeg-devel] [PATCH v4 04/16] vulkan: copy host-mapping buffer code from hwcontext Lynne 2025-03-13 17:03 ` [FFmpeg-devel] [PATCH v4 05/16] hwcontext_vulkan: use the common host map function to map frame data Lynne 2025-03-13 17:03 ` [FFmpeg-devel] [PATCH v4 06/16] vulkan: workaround BGR storage image undefined behaviour Lynne 2025-03-13 17:03 ` [FFmpeg-devel] [PATCH v4 07/16] vulkan_decode: support software-defined decoders Lynne 2025-03-13 17:03 ` [FFmpeg-devel] [PATCH v4 08/16] vulkan_decode: support multiple image views Lynne 2025-03-13 17:03 ` [FFmpeg-devel] [PATCH v4 09/16] vulkan_decode: adjust number of async contexts created Lynne 2025-03-13 17:03 ` [FFmpeg-devel] [PATCH v4 10/16] ffv1enc_vulkan: refactor shaders slightly to support sharing Lynne 2025-03-13 17:03 ` [FFmpeg-devel] [PATCH v4 11/16] vulkan: unify handling of BGR and simplify ffv1_rct Lynne 2025-03-13 17:03 ` [FFmpeg-devel] [PATCH v4 12/16] vulkan: add ff_vk_exec_add_dep_wait_sem() Lynne 2025-03-13 17:03 ` [FFmpeg-devel] [PATCH v4 13/16] vulkan: add support for AV_PIX_FMT_GBRAP32 Lynne 2025-03-13 17:03 ` [FFmpeg-devel] [PATCH v4 14/16] ffv1dec: add support for hwaccels Lynne 2025-03-13 17:03 ` [FFmpeg-devel] [PATCH v4 15/16] FFHWAccel: add buffer_ref argument to start_frame Lynne 2025-03-13 22:08 ` Andreas Rheinhardt 2025-03-13 23:03 ` Lynne 2025-03-14 2:23 ` Lynne 2025-03-13 17:03 ` [FFmpeg-devel] [PATCH v4 16/16] ffv1: add a Vulkan-based decoder Lynne
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20250313170355.92290-3-dev@lynne.ee \ --to=dev@lynne.ee \ --cc=ffmpeg-devel@ffmpeg.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel This inbox may be cloned and mirrored by anyone: git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \ ffmpegdev@gitmailbox.com public-inbox-index ffmpegdev Example config snippet for mirrors. AGPL code for this site: git clone https://public-inbox.org/public-inbox.git