github-mirrors/FFmpeg
1
0
Fork 0
mirror of https://mirror.skon.top/https://github.com/FFmpeg/FFmpeg synced 2026-04-21 21:30:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

configure: add missing vulkan_1_4 check

Browse Source 
Removed in f2affdfafb by mistake.
Also, fix the logic in probe_glslc() so it doesn't return false when debug is disabled.

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer
2026-01-13 12:33:00 -03:00
parent f897bcd122
commit 80a3ba7d79
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
configure vendored
View File

@@ -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