This is an automated email from the git hooks/post-receive script.
Git pushed a commit to branch master
in repository ffmpeg.
The following commit(s) were added to refs/heads/master by this push:
new 68046d0b33 Revert "swscale/vulkan/ops: move buffer desc setting to
helper function"
68046d0b33 is described below
commit 68046d0b3310513ddbdab64e25b5f7b69bd05963
Author: Niklas Haas <[email protected]>
AuthorDate: Mon Mar 9 12:15:43 2026 +0100
Commit: Niklas Haas <[email protected]>
CommitDate: Mon Mar 9 12:16:42 2026 +0100
Revert "swscale/vulkan/ops: move buffer desc setting to helper function"
This reverts commit 32554fc1075abe8d0b9c1d058013146c5abb5287.
Accidentally pushed this commit twice, with the wrong location.
Correct version is 97682155e6f84b2e157a1b167768d0ffb5a94554.
Signed-off-by: Niklas Haas <[email protected]>
---
libswscale/vulkan/ops.c | 22 ----------------------
1 file changed, 22 deletions(-)
diff --git a/libswscale/vulkan/ops.c b/libswscale/vulkan/ops.c
index 6446a803ef..3392414af6 100644
--- a/libswscale/vulkan/ops.c
+++ b/libswscale/vulkan/ops.c
@@ -157,28 +157,6 @@ static void free_fn(void *priv)
av_free(priv);
}
-static void add_desc_read_write(FFVulkanDescriptorSetBinding *out_desc,
- enum FFVkShaderRepFormat *out_rep,
- const SwsOp *op)
-{
- const char *img_type = op->type == SWS_PIXEL_F32 ? "rgba32f" :
- op->type == SWS_PIXEL_U32 ? "rgba32ui" :
- op->type == SWS_PIXEL_U16 ? "rgba16ui" :
- "rgba8ui";
-
- *out_desc = (FFVulkanDescriptorSetBinding) {
- .name = op->op == SWS_OP_WRITE ? "dst_img" : "src_img",
- .type = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE,
- .mem_layout = img_type,
- .mem_quali = op->op == SWS_OP_WRITE ? "writeonly" : "readonly",
- .dimensions = 2,
- .elems = op->rw.packed ? 1 : op->rw.elems,
- .stages = VK_SHADER_STAGE_COMPUTE_BIT,
- };
-
- *out_rep = op->type == SWS_PIXEL_F32 ? FF_VK_REP_FLOAT : FF_VK_REP_UINT;
-}
-
#if CONFIG_LIBSHADERC || CONFIG_LIBGLSLANG
static void add_desc_read_write(FFVulkanDescriptorSetBinding *out_desc,
enum FFVkShaderRepFormat *out_rep,
_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]
