From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id D4E364E1EC for ; Mon, 10 Mar 2025 03:09:04 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 60E4968E4C7; Mon, 10 Mar 2025 05:08:47 +0200 (EET) Received: from vidala.pars.ee (vidala.pars.ee [116.203.72.101]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BCF3968E774 for ; Mon, 10 Mar 2025 05:08:39 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; s=202405r; d=lynne.ee; c=relaxed/relaxed; h=Message-ID:Date:Subject:To:From; t=1741576119; bh=735udTKAzfXyuG1dOIGCRxy p9wTIOjFXxM0vqv7UqTA=; b=GU7Hh6Zoi5Q6cMZHUf74tMLHKPq0WI/k0J3nX4i/jo0esfhaP9 8QAd7wCP9cpcPdXrgIUyu0KjJnOSCyLJGiZmZkGpTuyNCnBPnwKEUcthENdtGeMoeZlteSsxbUN EA66xLuKqwgbEqMpI3k+4XR3/WdR+GpcciWyw4ze1YZwpXWjTn3B7alfhOaGIfBQn/8OxCqn0hk fVdShLXqqCOC1gblGX1V2wNUJ92FGjrKTWZpvSZ89n1QN5QcD0NIXShwyA4VCyJn4x2B8OfG3I0 PlkpcD4ktqaHOCxnSrAVYAfWmeGBl7U0x70s6bvERKZJ6tcryLMI53/JzlxVn2MpMZA==; DKIM-Signature: v=1; a=ed25519-sha256; s=202405e; d=lynne.ee; c=relaxed/relaxed; h=Message-ID:Date:Subject:To:From; t=1741576119; bh=735udTKAzfXyuG1dOIGCRxy p9wTIOjFXxM0vqv7UqTA=; b=CmW7k5ahUa88uBH7MAsvlxhd+7hfwxtiAzQurhlwmPD2pEEuUN tnqg7DVM9s2/pJnmrGqFfqIFdI5ggoSfrwBw==; From: Lynne To: ffmpeg-devel@ffmpeg.org Date: Mon, 10 Mar 2025 04:08:20 +0100 Message-ID: <20250310030837.60814-1-dev@lynne.ee> X-Mailer: git-send-email 2.47.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 01/13] vulkan: rename ff_vk_set_descriptor_image to ff_vk_shader_update_img X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Lynne Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --- 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 2ae619967a..51372965e0 100644 --- a/libavutil/vulkan.c +++ b/libavutil/vulkan.c @@ -2390,10 +2390,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]; @@ -2455,6 +2455,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, @@ -2521,19 +2534,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 617df952c4..41071b245e 100644 --- a/libavutil/vulkan.h +++ b/libavutil/vulkan.h @@ -593,10 +593,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".