[Mesa-dev] [PATCH 3/9] meson: remove unreachable with_glx == 'auto' check

Emil Velikov emil.l.velikov at gmail.com
Fri Feb 23 19:32:02 UTC 2018


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

Cannot happen since, props to the autodetection further up.

Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
---
 meson.build | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/meson.build b/meson.build
index 3329eb9f7be..417b9b4a79f 100644
--- a/meson.build
+++ b/meson.build
@@ -334,11 +334,7 @@ endif
 pre_args += '-DGLX_USE_TLS'
 if with_glx != 'disabled'
   if not (with_platform_x11 and with_any_opengl)
-    if with_glx == 'auto'
-      with_glx = 'disabled'
-    else
-      error('Cannot build GLX support without X11 platform support and at least one OpenGL API')
-    endif
+    error('Cannot build GLX support without X11 platform support and at least one OpenGL API')
   elif with_glx == 'gallium-xlib' 
     if not with_gallium
       error('Gallium-xlib based GLX requires at least one gallium driver')
-- 
2.16.0



More information about the mesa-dev mailing list