Mesa (staging/18.2): meson: don't require glx/egl/gbm with gallium drivers

[GitLab Mirror]

Module: Mesa
Branch: staging/18.2
Commit: a3220b3e93c0a37d229e19227b50a0124b278b97
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a3220b3e93c0a37d229e19227b50a0124b278b97

Author: Emil Velikov <emil.velikov at collabora.com>
Date:   Thu Dec 13 03:54:03 2018 +0000

meson: don't require glx/egl/gbm with gallium drivers

The gallium drivers do not require a DRI loader. Drop the artificial
and unnecessary restriction.

Fixes: af9d276134d ("meson: build libmesa_gallium")
Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
Reviewed-by: Dylan Baker <dylan at pnwbakers.com>
(cherry picked from commit 9d10581897ef7cfa0f6c392e2048cc04357281b9)

---

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

diff --git a/meson.build b/meson.build
index b0de22106b..c44eaad391 100644
--- a/meson.build
+++ b/meson.build
@@ -379,9 +379,9 @@ endif
 if with_any_vk and (with_platform_x11 and not with_dri3)
   error('Vulkan drivers require dri3 for X11 support')
 endif
-if with_dri or with_gallium
-  if with_glx == 'disabled' and not with_egl and not with_platform_haiku
-    error('building dri or gallium drivers require at least one window system')
+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')
   endif
 endif