fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-20 16:00:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

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

Browse source 
Set with_dri from with_gallium when DRI GLX is explicitly configured, as
well as when DRI GLX is chosen automatically.

Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
This commit is contained in:
Jon Turney 2018-01-15 19:39:46 +00:00
parent 72fd93370f
commit ab7aa0f10c
No known key found for this signature in database
GPG key ID: C7C86F0370285C81
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
meson.build
View file

@ -263,7 +263,6 @@ if with_glx == 'auto'
elif with_gallium elif with_gallium
# Even when building just gallium drivers the user probably wants dri # Even when building just gallium drivers the user probably wants dri
with_glx = 'dri' with_glx = 'dri'
with_dri = true
elif with_platform_x11 and with_any_opengl and not with_any_vk 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 # The automatic behavior should not be to turn on xlib based glx when
# building only vulkan drivers # building only vulkan drivers
@ -272,6 +271,11 @@ if with_glx == 'auto'
with_glx = 'disabled' with_glx = 'disabled'
endif endif
endif endif
if with_glx == 'dri'
if with_gallium
with_dri = true
endif
endif
if not (with_dri or with_gallium or with_glx == 'xlib' or with_glx == 'gallium-xlib') if not (with_dri or with_gallium or with_glx == 'xlib' or with_glx == 'gallium-xlib')
with_gles1 = false with_gles1 = false