Unverified Commit ab7aa0f1 authored by Jon Turney's avatar Jon Turney
Browse files

meson: Set with_dri from with_gallium when DRI glx is explicitly configured

Set with_dri from with_gallium when DRI GLX is explicitly configured, as
well as when DRI GLX is chosen automatically.
Signed-off-by: default avatarJon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: default avatarDylan Baker <dylan@pnwbakers.com>
parent 72fd9337
......@@ -263,7 +263,6 @@ if with_glx == 'auto'
elif with_gallium
# Even when building just gallium drivers the user probably wants dri
with_glx = 'dri'
with_dri = true
elif with_platform_x11 and with_any_opengl and not with_any_vk
# The automatic behavior should not be to turn on xlib based glx when
# building only vulkan drivers
......@@ -272,6 +271,11 @@ if with_glx == 'auto'
with_glx = 'disabled'
if with_glx == 'dri'
if with_gallium
with_dri = true
if not (with_dri or with_gallium or with_glx == 'xlib' or with_glx == 'gallium-xlib')
with_gles1 = false
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