From 89553408398766ef3afe949aead6e1c9b1e43961 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Wed, 15 Feb 2023 19:18:27 +0000 Subject: [PATCH] meson: make GLX require OpenGL This isn't strictly true, but making that work isn't worth the effort; see https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21343#note_1774683 Suggested-by: Adam Jackson Signed-off-by: Eric Engestrom Part-of: --- meson.build | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 518d77b2b2f..affeca8c611 100644 --- a/meson.build +++ b/meson.build @@ -320,7 +320,9 @@ with_platform_windows = _platforms.contains('windows') with_glx = get_option('glx') if with_glx == 'auto' - if with_platform_android + if not with_opengl + with_glx = 'disabled' + elif with_platform_android with_glx = 'disabled' elif with_dri with_glx = 'dri' @@ -345,6 +347,10 @@ if with_glx == 'dri' endif endif +if not with_opengl and with_glx != 'disabled' + error('Building GLX without OpenGL is not supported.') \ +endif + if not (with_dri or with_gallium or with_glx != 'disabled') with_gles1 = false with_gles2 = false