This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit d6162690352dd1320cfebb01884138cadc3b15d0 Author: Lynne <[email protected]> AuthorDate: Tue Feb 3 14:36:15 2026 +0100 Commit: Lynne <[email protected]> CommitDate: Thu Feb 19 19:42:26 2026 +0100 vulkan: don't set FFVulkanDescriptorSetBinding.name when not necessary It just bloats the code with unused strings. --- libavcodec/vulkan_dpx.c | 30 +++++++++++-------------- libavcodec/vulkan_prores.c | 50 ++++++++++++++++++----------------------- libavcodec/vulkan_prores_raw.c | 8 +++---- libavfilter/vf_avgblur_vulkan.c | 13 ++++------- libavfilter/vf_bwdif_vulkan.c | 42 +++++++++++++++------------------- 5 files changed, 60 insertions(+), 83 deletions(-) diff --git a/libavcodec/vulkan_dpx.c b/libavcodec/vulkan_dpx.c index 17f91c6ce4..a69e93108a 100644 --- a/libavcodec/vulkan_dpx.c +++ b/libavcodec/vulkan_dpx.c @@ -240,26 +240,22 @@ static int init_shader(AVCodecContext *avctx, FFVulkanContext *s, VK_SHADER_STAGE_COMPUTE_BIT); const FFVulkanDescriptorSetBinding desc_set[] = { - { - .name = "dst", - .type = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE, - .stages = VK_SHADER_STAGE_COMPUTE_BIT, - .elems = av_pix_fmt_count_planes(dec_frames_ctx->sw_format), + { /* dst */ + .type = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE, + .stages = VK_SHADER_STAGE_COMPUTE_BIT, + .elems = av_pix_fmt_count_planes(dec_frames_ctx->sw_format), }, - { - .name = "data_buf", - .type = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, - .stages = VK_SHADER_STAGE_COMPUTE_BIT, + { /* data_buf */ + .type = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, + .stages = VK_SHADER_STAGE_COMPUTE_BIT, }, - { - .name = "data_buf16", - .type = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, - .stages = VK_SHADER_STAGE_COMPUTE_BIT, + { /* data_buf16 */ + .type = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, + .stages = VK_SHADER_STAGE_COMPUTE_BIT, }, - { - .name = "data_buf32", - .type = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, - .stages = VK_SHADER_STAGE_COMPUTE_BIT, + { /* data_buf32 */ + .type = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, + .stages = VK_SHADER_STAGE_COMPUTE_BIT, }, }; ff_vk_shader_add_descriptor_set(s, shd, desc_set, 2 + (2*!unpack), 0, 0); diff --git a/libavcodec/vulkan_prores.c b/libavcodec/vulkan_prores.c index c7451c20fd..69a9a080b9 100644 --- a/libavcodec/vulkan_prores.c +++ b/libavcodec/vulkan_prores.c @@ -373,22 +373,19 @@ static int init_decode_shader(AVCodecContext *avctx, FFVulkanContext *s, ff_vk_shader_add_push_const(shd, 0, sizeof(ProresVkParameters), VK_SHADER_STAGE_COMPUTE_BIT); - FFVulkanDescriptorSetBinding desc_set[] = { - { - .name = "slice_offsets_buf", - .type = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, - .stages = VK_SHADER_STAGE_COMPUTE_BIT, + const FFVulkanDescriptorSetBinding desc_set[] = { + { /* slice_offsets_buf */ + .type = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, + .stages = VK_SHADER_STAGE_COMPUTE_BIT, }, - { - .name = "quant_idx_buf", - .type = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, - .stages = VK_SHADER_STAGE_COMPUTE_BIT, + { /* quant_idx_buf */ + .type = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, + .stages = VK_SHADER_STAGE_COMPUTE_BIT, }, - { - .name = "dst", - .type = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE, - .stages = VK_SHADER_STAGE_COMPUTE_BIT, - .elems = av_pix_fmt_count_planes(dec_frames_ctx->sw_format), + { /* dst */ + .type = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE, + .stages = VK_SHADER_STAGE_COMPUTE_BIT, + .elems = av_pix_fmt_count_planes(dec_frames_ctx->sw_format), }, }; ff_vk_shader_add_descriptor_set(s, shd, desc_set, 3, 0, 0); @@ -432,22 +429,19 @@ static int init_idct_shader(AVCodecContext *avctx, FFVulkanContext *s, ff_vk_shader_add_push_const(shd, 0, sizeof(ProresVkParameters), VK_SHADER_STAGE_COMPUTE_BIT); - FFVulkanDescriptorSetBinding desc_set[] = { - { - .name = "quant_idx_buf", - .type = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, - .stages = VK_SHADER_STAGE_COMPUTE_BIT, + const FFVulkanDescriptorSetBinding desc_set[] = { + { /* quant_idx_buf */ + .type = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, + .stages = VK_SHADER_STAGE_COMPUTE_BIT, }, - { - .name = "qmat_buf", - .type = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, - .stages = VK_SHADER_STAGE_COMPUTE_BIT, + { /* qmat_buf */ + .type = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, + .stages = VK_SHADER_STAGE_COMPUTE_BIT, }, - { - .name = "dst", - .type = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE, - .stages = VK_SHADER_STAGE_COMPUTE_BIT, - .elems = av_pix_fmt_count_planes(dec_frames_ctx->sw_format), + { /* dst */ + .type = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE, + .stages = VK_SHADER_STAGE_COMPUTE_BIT, + .elems = av_pix_fmt_count_planes(dec_frames_ctx->sw_format), }, }; RET(ff_vk_shader_add_descriptor_set(s, shd, desc_set, 3, 0, 0)); diff --git a/libavcodec/vulkan_prores_raw.c b/libavcodec/vulkan_prores_raw.c index cd46900047..22d70bcb3f 100644 --- a/libavcodec/vulkan_prores_raw.c +++ b/libavcodec/vulkan_prores_raw.c @@ -284,14 +284,12 @@ fail: static int add_desc(AVCodecContext *avctx, FFVulkanContext *s, FFVulkanShader *shd) { - FFVulkanDescriptorSetBinding desc_set[] = { - { - .name = "dst", + const FFVulkanDescriptorSetBinding desc_set[] = { + { /* dst */ .type = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE, .stages = VK_SHADER_STAGE_COMPUTE_BIT, }, - { - .name = "frame_data_buf", + { /* frame_data_buf */ .type = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, .stages = VK_SHADER_STAGE_COMPUTE_BIT, }, diff --git a/libavfilter/vf_avgblur_vulkan.c b/libavfilter/vf_avgblur_vulkan.c index 847390d064..db0b1b8612 100644 --- a/libavfilter/vf_avgblur_vulkan.c +++ b/libavfilter/vf_avgblur_vulkan.c @@ -54,8 +54,6 @@ static av_cold int init_filter(AVFilterContext *ctx, AVFrame *in) FFVulkanContext *vkctx = &s->vkctx; const int planes = av_pix_fmt_count_planes(s->vkctx.output_format); - FFVulkanDescriptorSetBinding *desc; - s->qf = ff_vk_qf_find(vkctx, VK_QUEUE_COMPUTE_BIT, 0); if (!s->qf) { av_log(ctx, AV_LOG_ERROR, "Device has no compute queues\n"); @@ -71,22 +69,19 @@ static av_cold int init_filter(AVFilterContext *ctx, AVFrame *in) ff_vk_shader_add_push_const(&s->shd, 0, sizeof(s->opts), VK_SHADER_STAGE_COMPUTE_BIT); - desc = (FFVulkanDescriptorSetBinding []) { - { - .name = "input_img", + const FFVulkanDescriptorSetBinding desc_set[] = { + { /* input_img */ .type = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE, .stages = VK_SHADER_STAGE_COMPUTE_BIT, .elems = planes, }, - { - .name = "output_img", + { /* output_img */ .type = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE, .stages = VK_SHADER_STAGE_COMPUTE_BIT, .elems = planes, }, }; - - ff_vk_shader_add_descriptor_set(vkctx, &s->shd, desc, 2, 0, 0); + ff_vk_shader_add_descriptor_set(vkctx, &s->shd, desc_set, 2, 0, 0); RET(ff_vk_shader_link(vkctx, &s->shd, ff_avgblur_comp_spv_data, diff --git a/libavfilter/vf_bwdif_vulkan.c b/libavfilter/vf_bwdif_vulkan.c index c6fb6abe9c..5fefb3396d 100644 --- a/libavfilter/vf_bwdif_vulkan.c +++ b/libavfilter/vf_bwdif_vulkan.c @@ -51,7 +51,6 @@ static av_cold int init_filter(AVFilterContext *ctx) BWDIFVulkanContext *s = ctx->priv; FFVulkanContext *vkctx = &s->vkctx; const int planes = av_pix_fmt_count_planes(s->vkctx.output_format); - FFVulkanDescriptorSetBinding *desc; s->qf = ff_vk_qf_find(vkctx, VK_QUEUE_COMPUTE_BIT, 0); if (!s->qf) { @@ -65,34 +64,29 @@ static av_cold int init_filter(AVFilterContext *ctx) ff_vk_shader_load(&s->shd, VK_SHADER_STAGE_COMPUTE_BIT, NULL, (uint32_t [3]) { 1, 64, planes }, 0); - desc = (FFVulkanDescriptorSetBinding []) { - { - .name = "prev", - .type = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE, - .elems = planes, - .stages = VK_SHADER_STAGE_COMPUTE_BIT, + const FFVulkanDescriptorSetBinding desc_set[] = { + { /* prev */ + .type = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE, + .stages = VK_SHADER_STAGE_COMPUTE_BIT, + .elems = planes, }, - { - .name = "cur", - .type = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE, - .elems = planes, - .stages = VK_SHADER_STAGE_COMPUTE_BIT, + { /* cur */ + .type = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE, + .stages = VK_SHADER_STAGE_COMPUTE_BIT, + .elems = planes, }, - { - .name = "next", - .type = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE, - .elems = planes, - .stages = VK_SHADER_STAGE_COMPUTE_BIT, + { /* next */ + .type = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE, + .stages = VK_SHADER_STAGE_COMPUTE_BIT, + .elems = planes, }, - { - .name = "dst", - .type = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE, - .elems = planes, - .stages = VK_SHADER_STAGE_COMPUTE_BIT, + { /* dst */ + .type = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE, + .stages = VK_SHADER_STAGE_COMPUTE_BIT, + .elems = planes, }, }; - - ff_vk_shader_add_descriptor_set(vkctx, &s->shd, desc, 4, 0, 0); + ff_vk_shader_add_descriptor_set(vkctx, &s->shd, desc_set, 4, 0, 0); ff_vk_shader_add_push_const(&s->shd, 0, sizeof(BWDIFParameters), VK_SHADER_STAGE_COMPUTE_BIT); _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
