[Mesa-dev] [PATCH 08/28] configure: error out when building X11 Vulkan without DRI3

[Emil Velikov]

From: Emil Velikov <emil.velikov at collabora.com>

Vulkan supports only DRI3 enabled X11 platforms. Make it obvious,
should one consider building without it.

Cc: Jason Ekstrand <jason at jlekstrand.net>
Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
---
XXX: worth porting to stable... it would require previous commit and
the invasive

commit f79b1d325722f8aa3d0f76de56b1992476d13a31
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date:   Sun Nov 27 00:25:28 2016 +0000

    configure: check once for DRI3 dependencies
---
 configure.ac | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 997eeaf..602b2c7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1875,10 +1875,15 @@ AC_ARG_WITH([vulkan-icddir],
     [VULKAN_ICD_INSTALL_DIR='${datarootdir}/vulkan/icd.d'])
 AC_SUBST([VULKAN_ICD_INSTALL_DIR])
 
-require_sha1() {
+require_sha1_and_dri3() {
     if test "x$with_sha1" == "x"; then
         AC_MSG_ERROR([$1 Vulkan driver requires SHA1])
     fi
+    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
@@ -1889,13 +1894,13 @@ if test -n "$with_vulkan_drivers"; then
             if test "x$HAVE_I965_DRI" != xyes; then
                 AC_MSG_ERROR([Intel Vulkan driver requires the i965 dri driver])
             fi
-            require_sha1 "Intel"
+            require_sha1_and_dri3 "Intel"
             HAVE_INTEL_VULKAN=yes;
             ;;
         xradeon)
             PKG_CHECK_MODULES([AMDGPU], [libdrm_amdgpu >= $LIBDRM_AMDGPU_REQUIRED])
             radeon_llvm_check $LLVM_REQUIRED_RADV "radv"
-            require_sha1 "radv"
+            require_sha1_and_dri3 "radv"
             HAVE_RADEON_VULKAN=yes;
             ;;
         *)
-- 
2.10.2