This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit 8dcf02ac63d8f86b7d993e4a605c4b2875039c74 Author: Lynne <[email protected]> AuthorDate: Fri Jan 16 16:09:05 2026 +0100 Commit: Lynne <[email protected]> CommitDate: Mon Jan 19 16:37:15 2026 +0100 vulkan: remove IS_WITHIN macro This is the more correct GLSL solution. --- libavcodec/vulkan/common.comp | 3 --- libavcodec/vulkan/dpx_unpack.comp.glsl | 2 +- libavfilter/vulkan/avgblur.comp.glsl | 3 +-- libavfilter/vulkan/bwdif.comp.glsl | 4 ++-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/libavcodec/vulkan/common.comp b/libavcodec/vulkan/common.comp index 8a658f8524..1ec9ae7e7c 100644 --- a/libavcodec/vulkan/common.comp +++ b/libavcodec/vulkan/common.comp @@ -107,9 +107,6 @@ layout(buffer_reference, buffer_reference_align = 8) buffer u64buf { #define ceil_rshift(a, b) \ (-((-(a)) >> (b))) -#define IS_WITHIN(v1, v2) \ - ((v1.x < v2.x) && (v1.y < v2.y)) - /* TODO: optimize */ uint align(uint src, uint a) { diff --git a/libavcodec/vulkan/dpx_unpack.comp.glsl b/libavcodec/vulkan/dpx_unpack.comp.glsl index 93fda6142d..3850cbf3e9 100644 --- a/libavcodec/vulkan/dpx_unpack.comp.glsl +++ b/libavcodec/vulkan/dpx_unpack.comp.glsl @@ -91,7 +91,7 @@ i16vec4 parse_packed_in_32(ivec2 pos, int stride) void main(void) { ivec2 pos = ivec2(gl_GlobalInvocationID.xy); - if (!IS_WITHIN(pos, imageSize(dst[0]))) + if (any(greaterThanEqual(pos, imageSize(dst[0])))) return; i16vec4 p; diff --git a/libavfilter/vulkan/avgblur.comp.glsl b/libavfilter/vulkan/avgblur.comp.glsl index e7a476b98c..b53ec4092c 100644 --- a/libavfilter/vulkan/avgblur.comp.glsl +++ b/libavfilter/vulkan/avgblur.comp.glsl @@ -40,9 +40,8 @@ void main() { const ivec2 pos = ivec2(gl_GlobalInvocationID.xy); -#define IS_WITHIN(v1, v2) ((v1.x < v2.x) && (v1.y < v2.y)) ivec2 size = imageSize(output_img[nonuniformEXT(gl_LocalInvocationID.z)]); - if (!IS_WITHIN(pos, size)) + if (any(greaterThanEqual(pos, size))) return; if ((planes & (1 << gl_LocalInvocationID.z)) == 0) { diff --git a/libavfilter/vulkan/bwdif.comp.glsl b/libavfilter/vulkan/bwdif.comp.glsl index 043ded0d24..fb18af3915 100644 --- a/libavfilter/vulkan/bwdif.comp.glsl +++ b/libavfilter/vulkan/bwdif.comp.glsl @@ -151,8 +151,8 @@ void main() bool filter_field = ((pos.y ^ parity) & 1) == 1; bool is_intra = filter_field && (current_field == 0); -#define IS_WITHIN(v1, v2) ((v1.x < v2.x) && (v1.y < v2.y)) - if (!IS_WITHIN(pos, imageSize(dst[nonuniformEXT(gl_LocalInvocationID.z)]))) { + ivec2 size = imageSize(dst[nonuniformEXT(gl_LocalInvocationID.z)]); + if (any(greaterThanEqual(pos, size))) { return; } else if (is_intra) { process_plane_intra(pos); _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
