From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <ffmpeg-devel-bounces@ffmpeg.org>
Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100])
by master.gitmailbox.com (Postfix) with ESMTPS id 2D6054CB44
for <ffmpegdev@gitmailbox.com>; Thu, 13 Mar 2025 17:04:24 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 68E3668E6B2;
Thu, 13 Mar 2025 19:04:05 +0200 (EET)
Received: from vidala.pars.ee (vidala.pars.ee [116.203.72.101])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A59BE68E554
for <ffmpeg-devel@ffmpeg.org>; Thu, 13 Mar 2025 19:03:57 +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=1741885437; bh=qHkEtm083JhookaLR41QE0A
wJBZyVqCKV/j6zfu/gYk=; b=LAEMn1Gqe/OHjicU2BUqU0Fp78Mdu1o1HApPkhfIh/agRVEb/9
Cs2zfWVzI1zsU5BjZ1/kj0Wpb+ex56Sgirj1CIUCxnmXWIu6OTAh6EDNx9/yXaPkCpUwXk+4DV+
ZilnA1Y7KHZNs9CfdXajfZYpRym80rBMkST2wIVTVc9yf/SHJ8SIQCBsvVVKJINapIr3KmB3zze
6SdaYMY84qGUP99Lk3GBNtTYKEnQr6UF/otdAduUYGTbGG8fuC2kLSaEIznbz1ZIrsiDzTmaNu1
zH/ZZMaD72u7Nt/PZRYlbTpJ5ENMq/FJJ0bxLMuLBl68YZNuOsZul8x4K8QmAfWrQ+Q==;
DKIM-Signature: v=1; a=ed25519-sha256; s=202405e; d=lynne.ee; c=relaxed/relaxed;
h=Message-ID:Date:Subject:To:From; t=1741885437; bh=qHkEtm083JhookaLR41QE0A
wJBZyVqCKV/j6zfu/gYk=; b=dH1ZNsg8IyADZR51tN9JwP2LWBl6h6Hk6+LcUyw6msoEWL1HCY
QadKPMggbBmLJT00eci+4IPivuasgWIAeWCw==;
From: Lynne <dev@lynne.ee>
To: ffmpeg-devel@ffmpeg.org
Date: Thu, 13 Mar 2025 18:03:34 +0100
Message-ID: <20250313170355.92290-3-dev@lynne.ee>
X-Mailer: git-send-email 2.47.2
In-Reply-To: <20250313170355.92290-1-dev@lynne.ee>
References: <20250313170355.92290-1-dev@lynne.ee>
MIME-Version: 1.0
Subject: [FFmpeg-devel] [PATCH v4 02/16] 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 <ffmpeg-devel.ffmpeg.org>
List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe>
List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel>
List-Post: <mailto:ffmpeg-devel@ffmpeg.org>
List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help>
List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe>
Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Cc: Lynne <dev@lynne.ee>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: ffmpeg-devel-bounces@ffmpeg.org
Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org>
Archived-At: <https://master.gitmailbox.com/ffmpegdev/20250313170355.92290-3-dev@lynne.ee/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
---
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".