This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit e4e6c848a7f1aac6bd970083ae52f02397daeac8 Author: Niklas Haas <[email protected]> AuthorDate: Wed Oct 21 18:52:53 2026 +0200 Commit: Niklas Haas <[email protected]> CommitDate: Sat Oct 24 19:10:48 2026 +0000 swscale/vulkan/ops: factor out descriptor binding registration Will be shared with the filter buffer creation. Co-Authored-By: Claude Opus 5.5 <[email protected]> Signed-off-by: Niklas Haas <[email protected]> --- libswscale/vulkan/ops.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/libswscale/vulkan/ops.c b/libswscale/vulkan/ops.c index 93bd997ff5..cccfa45239 100644 --- a/libswscale/vulkan/ops.c +++ b/libswscale/vulkan/ops.c @@ -710,6 +710,17 @@ static int insert_bitexact_linear(const SwsOp *op, SPICtx *spi, SPIRVIDs *id, res[0], res[1], res[2], res[3]); } +/* Registers the last created buffer in descriptor set 1, returns its binding */ +static int add_buf_binding(SPIRVIDs *id) +{ + VulkanPriv *p = id->priv; + id->buf_desc[p->nb_data_bufs] = (FFVulkanDescriptorSetBinding) { + .type = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, + .stages = VK_SHADER_STAGE_COMPUTE_BIT, + }; + return p->nb_data_bufs++; +} + static int read_filtered(SPICtx *spi, SPIRVIDs *id, const SwsOpList *ops, const SwsOp *op, const struct FilterData *f) { @@ -826,18 +837,13 @@ static int emit_dither(SPICtx *spi, SPIRVIDs *id, const SwsOp *op, int *data) return AVERROR(ENOTSUP); VulkanPriv *p = id->priv; - const int binding = p->nb_data_bufs; - if (binding >= MAX_DATA_BUFS) + if (p->nb_data_bufs >= MAX_DATA_BUFS) return AVERROR(ENOTSUP); - int err = create_dither_buf(p->s, &op->dither, &p->data_bufs[binding]); + int err = create_dither_buf(p->s, &op->dither, &p->data_bufs[p->nb_data_bufs]); if (err < 0) return err; - p->nb_data_bufs++; - id->buf_desc[binding] = (FFVulkanDescriptorSetBinding) { - .type = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, - .stages = VK_SHADER_STAGE_COMPUTE_BIT, - }; + const int binding = add_buf_binding(id); /* Uniform buffer in descriptor set 1: struct { float m[size][size]; } */ const int size = 1 << op->dither.size_log2; -- 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]
