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 80a3ba7d79 configure: add missing vulkan_1_4 check
80a3ba7d79 is described below
commit 80a3ba7d79e0fc168e186bc67be61ea342eeff9a
Author: James Almer <[email protected]>
AuthorDate: Tue Jan 13 12:33:00 2026 -0300
Commit: James Almer <[email protected]>
CommitDate: Tue Jan 13 13:28:23 2026 -0300
configure: add missing vulkan_1_4 check
Removed in f2affdfafb4e7dd0674ba415ea77faa949a11439 by mistake.
Also, fix the logic in probe_glslc() so it doesn't return false when debug
is disabled.
Signed-off-by: James Almer <[email protected]>
---
configure | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
index 7e885f5100..60e33e26e4 100755
--- a/configure
+++ b/configure
@@ -6841,7 +6841,6 @@ fi
# _deps results in it always passing.
# Disable it explicitly to fix this.
disable spirv_library
-disable spirv_compiler
check_func_headers malloc.h _aligned_malloc && enable aligned_malloc
check_func ${malloc_prefix}memalign && enable memalign
@@ -7715,10 +7714,14 @@ probe_glslc(){
else
append GLSLCFLAGS $glslc_opt_none
fi
- enabled debug && append GLSLCFLAGS $glslc_debug
+ if enabled debug; then
+ append GLSLCFLAGS $glslc_debug
+ fi
}
if enabled vulkan; then
+ check_pkg_config_header_only vulkan_1_4 "vulkan >= 1.4.317"
"vulkan/vulkan.h" "defined VK_VERSION_1_4" ||
+ check_cpp_condition vulkan_1_4 "vulkan/vulkan.h"
"defined(VK_VERSION_1_5) || (defined(VK_VERSION_1_4) && VK_HEADER_VERSION >=
317)"
for program in $glslc glslc glslang glslangValidator; do
probe_glslc $program && break
done
_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]
