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 <[email protected]> Reviewed-by: Eric Engestrom <[email protected]> --- meson.build | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 6ad8c8bbf4b..47234556bd3 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 -- 2.14.3 _______________________________________________ mesa-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-dev
