Module: Mesa
Branch: master
Commit: 8a36f025f46011f0ca56924633e8f6d9f1c9aaaf
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=8a36f025f46011f0ca56924633e8f6d9f1c9aaaf
Author: Dylan Baker <dy...@pnwbakers.com>
Date: Wed Nov 1 10:24:10 2017 -0700
meson: Allow building glvnd with EGL and non-dri based GLX
Because meson mirrors the auototools logic, it needs the same changes to
allow building glvnd based egl.
v2: - change if to elif (Eric)
Signed-off-by: Dylan Baker <dylanx.c.ba...@intel.com>
Reviewed-by: Eric Engestrom <eric.engest...@imgtec.com>
Acked-by: Emil Velikov <emil.veli...@collabora.com>
---
meson.build | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/meson.build b/meson.build
index 44e062e01e..cd70651022 100644
--- a/meson.build
+++ b/meson.build
@@ -231,8 +231,12 @@ if with_glx != 'disabled'
endif
with_glvnd = get_option('glvnd')
-if with_glvnd and with_glx != 'dri'
- message('glvnd requires dri based glx')
+if with_glvnd
+ if with_glx == 'xlib' or with_glx == 'gallium-xlib'
+ error('Cannot build glvnd support for GLX that is not DRI based.')
+ elif with_glx == 'disabled' and not with_egl
+ error('glvnd requires DRI based GLX and/or EGL')
+ endif
endif
# TODO: toggle for this
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
