This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit 721a02e3eb4486a3527b4619c4d1938be886a594 Author: Niklas Haas <[email protected]> AuthorDate: Tue Oct 20 02:16:04 2026 +0200 Commit: Niklas Haas <[email protected]> CommitDate: Tue Oct 20 19:50:40 2026 +0000 swscale/vulkan/ops: use separate arrays for each descriptor set The image descriptor array was reused for the buffer descriptors. Co-Authored-By: Claude Opus 5.5 <[email protected]> Signed-off-by: Niklas Haas <[email protected]> --- libswscale/vulkan/ops.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libswscale/vulkan/ops.c b/libswscale/vulkan/ops.c index cb8cb09c6b..c07a4b9540 100644 --- a/libswscale/vulkan/ops.c +++ b/libswscale/vulkan/ops.c @@ -956,7 +956,7 @@ static int add_ops_spirv(SwsContext *sws, VulkanPriv *p, FFVulkanOpsCtx *s, if (err < 0) return err; - FFVulkanDescriptorSetBinding desc_set[MAX_DATA_BUFS] = { + FFVulkanDescriptorSetBinding img_desc[2] = { { .type = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE, .stages = VK_SHADER_STAGE_COMPUTE_BIT, @@ -968,7 +968,7 @@ static int add_ops_spirv(SwsContext *sws, VulkanPriv *p, FFVulkanOpsCtx *s, .elems = 4, }, }; - ff_vk_shader_add_descriptor_set(&s->vkctx, shd, desc_set, 2, 0); + ff_vk_shader_add_descriptor_set(&s->vkctx, shd, img_desc, 2, 0); /* Create dither buffers */ err = create_bufs(s, p, ops); @@ -985,6 +985,7 @@ static int add_ops_spirv(SwsContext *sws, VulkanPriv *p, FFVulkanOpsCtx *s, * op order, so the bindings match the buffer order from create_bufs().*/ id->nb_dither_bufs = 0; id->nb_filter_bufs = 0; + FFVulkanDescriptorSetBinding buf_desc[MAX_DATA_BUFS]; int nb_data_bufs = 0; for (int n = 0; n < ops->num_ops; n++) { const SwsOp *op = &ops->ops[n]; @@ -1022,13 +1023,13 @@ static int add_ops_spirv(SwsContext *sws, VulkanPriv *p, FFVulkanOpsCtx *s, } id->iface[id->nb_iface++] = var_id; - desc_set[nb_data_bufs++] = (FFVulkanDescriptorSetBinding) { + buf_desc[nb_data_bufs++] = (FFVulkanDescriptorSetBinding) { .type = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, .stages = VK_SHADER_STAGE_COMPUTE_BIT, }; } if (nb_data_bufs) - ff_vk_shader_add_descriptor_set(&s->vkctx, shd, desc_set, + ff_vk_shader_add_descriptor_set(&s->vkctx, shd, buf_desc, nb_data_bufs, 1); if (id->interlaced) { -- To stop receiving notification emails like this one, please contact [email protected]. _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
