Commit 8a36f025 authored by Dylan Baker's avatar Dylan Baker Committed by Emil Velikov
Browse files

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: default avatarDylan Baker <>
Reviewed-by: default avatarEric Engestrom <>
Acked-by: default avatarEmil Velikov <>
parent 85a01723
......@@ -231,8 +231,12 @@ if with_glx != 'disabled'
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')
# TODO: toggle for this
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment