Mesa (dri3-auto): meson: replace error when dri3 is not enabled for x11 on vulkan with enablement

[GitLab Mirror]

Module: Mesa
Branch: dri3-auto
Commit: 2dff4a8884f7ed82746bd6e295045a500f54972f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2dff4a8884f7ed82746bd6e295045a500f54972f

Author: Eric Engestrom <eric at engestrom.ch>
Date:   Fri Jun 11 12:49:42 2021 +0200

meson: replace error when dri3 is not enabled for x11 on vulkan with enablement

Signed-off-by: Eric Engestrom <eric at engestrom.ch>

---

 meson.build | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/meson.build b/meson.build
index 3ae123dbdce..68851c78146 100644
--- a/meson.build
+++ b/meson.build
@@ -513,9 +513,10 @@ with_dri2 = (with_dri or with_any_vk) and (with_dri_platform == 'drm' or
   host_machine.system() == 'gnu')
 with_dri3 = system_has_kms_drm and with_dri2
 
-if with_any_vk and (with_platform_x11 and not with_dri3)
-  error('Vulkan drivers require dri3 for X11 support')
+if with_any_vk and with_platform_x11
+  with_dri3 = true
 endif
+
 if with_dri
   if with_glx == 'disabled' and not with_egl and not with_gbm
     error('building dri drivers require at least one windowing system')