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

meson: fix vulkan-drivers=[]

Browse source 
Fixes: 5608d0a2ce ("meson: use array type options")
Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
This commit is contained in:
Eric Engestrom 2018-05-10 16:05:05 +01:00
parent a425db4d7d
commit a92cdcd598
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
meson.build
View file

@ -170,9 +170,6 @@ if with_gallium and system_has_kms_drm
endif endif
endif endif
with_intel_vk = false
with_amd_vk = false
with_any_vk = false
_vulkan_drivers = get_option('vulkan-drivers') _vulkan_drivers = get_option('vulkan-drivers')
if _vulkan_drivers.contains('auto') if _vulkan_drivers.contains('auto')
if system_has_kms_drm if system_has_kms_drm
@ -188,11 +185,10 @@ if _vulkan_drivers.contains('auto')
error('Unknown OS. Please pass -Dvulkan-drivers to set driver options. Patches gladly accepted to fix this.') error('Unknown OS. Please pass -Dvulkan-drivers to set driver options. Patches gladly accepted to fix this.')
endif endif
endif endif
if _vulkan_drivers != ['']
with_intel_vk = _vulkan_drivers.contains('intel') with_intel_vk = _vulkan_drivers.contains('intel')
with_amd_vk = _vulkan_drivers.contains('amd') with_amd_vk = _vulkan_drivers.contains('amd')
with_any_vk = true with_any_vk = _vulkan_drivers.length() != 0 and _vulkan_drivers != ['']
endif
if with_dri_swrast and (with_gallium_softpipe or with_gallium_swr) if with_dri_swrast and (with_gallium_softpipe or with_gallium_swr)
error('Only one swrast provider can be built') error('Only one swrast provider can be built')