Module: Mesa
Branch: master
Commit: 63b95fb291d7978e300c496cedc0851261101332
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=63b95fb291d7978e300c496cedc0851261101332
Author: Emil Velikov <emil.veli...@collabora.com>
Date: Fri Feb 23 19:32:03 2018 +0000
meson: require shared glapi when using DRI based libGL
Just like we do in the autotools build.
Signed-off-by: Emil Velikov <emil.veli...@collabora.com>
Reviewed-by: Dylan Baker <dy...@pnwbakers.com>
Reviewed-by: Eric Engestrom <eric.engest...@intel.com>
---
meson.build | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/meson.build b/meson.build
index d4f460e0b6..4aafba802a 100644
--- a/meson.build
+++ b/meson.build
@@ -357,8 +357,12 @@ if with_glx != 'disabled'
if with_dri
error('xlib conflicts with any dri driver')
endif
- elif with_glx == 'dri' and not with_dri
- error('dri based GLX requires at least one DRI driver')
+ elif with_glx == 'dri'
+ if not with_dri
+ error('dri based GLX requires at least one DRI driver')
+ elif not with_shared_glapi
+ error('dri based GLX requires shared-glapi')
+ endif
endif
endif
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
