aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmil Velikov <[email protected]>2016-12-05 20:14:24 +0000
committerJuan A. Suarez Romero <[email protected]>2017-05-31 22:32:03 +0200
commit023b1da8c0ce8b399e94edf57734f1ce5b2623fc (patch)
treea22338d0376e492bdea011c4c4eace0950d2c2f7
parent15fc135cdaae98e954e9cbb0006f56bf3bfe24bc (diff)
configure: error out when building X11 Vulkan without DRI3
Vulkan supports only DRI3 enabled X11 platforms. Make it obvious, should one consider building without it. Cc: Jason Ekstrand <[email protected]> Cc: Ville Syrjälä <[email protected]> Cc: [email protected] Signed-off-by: Emil Velikov <[email protected]> Reviewed-by: Eric Engestrom <[email protected]> (cherry picked from commit 05043e0e8e0bd5e3019f480557d452b4c165f8f2) Signed-off-by: Juan A. Suarez Romero <[email protected]>
-rw-r--r--configure.ac10
1 files changed, 10 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index 08513e106c9..1d2e6ac5cf0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1930,6 +1930,14 @@ AC_ARG_WITH([vulkan-icddir],
[VULKAN_ICD_INSTALL_DIR='${datarootdir}/vulkan/icd.d'])
AC_SUBST([VULKAN_ICD_INSTALL_DIR])
+require_x11_dri3() {
+ if echo "$platforms" | grep -q 'x11'; then
+ if test "x$enable_dri3" != xyes; then
+ AC_MSG_ERROR([$1 Vulkan driver requires DRI3 when built with X11])
+ fi
+ fi
+}
+
if test -n "$with_vulkan_drivers"; then
if test "x$ac_cv_func_dl_iterate_phdr" = xno; then
AC_MSG_ERROR([Vulkan drivers require the dl_iterate_phdr function])
@@ -1941,12 +1949,14 @@ if test -n "$with_vulkan_drivers"; then
xintel)
require_libdrm "ANV"
PKG_CHECK_MODULES([INTEL], [libdrm >= $LIBDRM_INTEL_REQUIRED libdrm_intel >= $LIBDRM_INTEL_REQUIRED])
+ require_x11_dri3 "ANV"
HAVE_INTEL_VULKAN=yes
;;
xradeon)
require_libdrm "radv"
PKG_CHECK_MODULES([AMDGPU], [libdrm >= $LIBDRM_AMDGPU_REQUIRED libdrm_amdgpu >= $LIBDRM_AMDGPU_REQUIRED])
radeon_llvm_check $LLVM_REQUIRED_RADV "radv"
+ require_x11_dri3 "radv"
HAVE_RADEON_VULKAN=yes
;;
*)