[FFmpeg-cvslog] configure: improve non-pkgconfig Vulkan version check

Lynne git at videolan.org
Tue Dec 21 16:31:14 EET 2021


ffmpeg | branch: master | Lynne <dev at lynne.ee> | Tue Dec 21 15:28:50 2021 +0100| [14b6805eb29d193105998e530e92525d7fe98d6d] | committer: Lynne

configure: improve non-pkgconfig Vulkan version check

Check for the patch version as well as the major+minor version.

The VK_API_VERSION macros are not usable in preprocessor code due
to casts.
The patch (header) version is meant to linearly increment and
not be reset, however it's better to trust, but verify.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=14b6805eb29d193105998e530e92525d7fe98d6d
---

 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure b/configure
index 05ac32b825..0ccd3bda11 100755
--- a/configure
+++ b/configure
@@ -6915,7 +6915,7 @@ enabled crystalhd && check_lib crystalhd "stdint.h libcrystalhd/libcrystalhd_if.
 
 if enabled vulkan; then
     check_pkg_config_header_only vulkan "vulkan >= 1.2.189" "vulkan/vulkan.h" "defined VK_VERSION_1_2" ||
-        check_cpp_condition vulkan "vulkan/vulkan.h" "defined VK_VERSION_1_2"
+        check_cpp_condition vulkan "vulkan/vulkan.h" "defined(VK_VERSION_1_3) || (defined(VK_VERSION_1_2) && VK_HEADER_VERSION >= 189)"
 fi
 
 if enabled x86; then



More information about the ffmpeg-cvslog mailing list