Mesa (master): meson: remove unreachable with_glx == 'auto' check
Eric Engeström
eric_engestrom at kemper.freedesktop.org
Tue May 29 16:01:10 UTC 2018
Module: Mesa
Branch: master
Commit: 728d1da159e072e7ef9956ba5326cc02f4d2589b
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=728d1da159e072e7ef9956ba5326cc02f4d2589b
Author: Emil Velikov <emil.velikov at collabora.com>
Date: Fri Feb 23 19:32:02 2018 +0000
meson: remove unreachable with_glx == 'auto' check
Cannot happen since, props to the autodetection further up.
Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
Reviewed-by: Dylan Baker <dylan at pnwbakers.com>
Reviewed-by: Eric Engestrom <eric.engestrom at intel.com>
---
meson.build | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/meson.build b/meson.build
index d0cb896163..d4f460e0b6 100644
--- a/meson.build
+++ b/meson.build
@@ -344,11 +344,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')
More information about the mesa-commit
mailing list