[FFmpeg-devel] [PR] configure: add missing vulkan_1_4 check (PR #21450)

[James Almer via ffmpeg-devel <ffmpeg-devel@ffmpeg.org>]

PR #21450 opened by James Almer (jamrial)
URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21450
Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21450.patch

Removed in f2affdfafb4e7dd0674ba415ea77faa949a11439 by mistake.

Also, fix the logic in probe_glslc() so it doesn't return false when debug is disabled.


>From e50b8a1eebcb2e08de0d759a53cef55e8f926e11 Mon Sep 17 00:00:00 2001
From: James Almer <jamrial@gmail.com>
Date: Tue, 13 Jan 2026 12:33:00 -0300
Subject: [PATCH] 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 <jamrial@gmail.com>
---
 configure | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index 7e885f5100..11c8e880ac 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,13 +7714,17 @@ 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
     for program in $glslc glslc glslang glslangValidator; do
         probe_glslc $program && break
     done
+    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)"
 else
     disable libglslang libshaderc spirv_library spirv_compiler
 fi
-- 
2.49.1

_______________________________________________
ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org
To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org