diff options
| author | Eric Engestrom <eric.engestrom@intel.com> | 2018-05-10 16:05:05 +0100 |
|---|---|---|
| committer | Eric Engestrom <eric.engestrom@intel.com> | 2018-06-01 17:53:06 +0100 |
| commit | a92cdcd5989717ec7d60e558cf648a6cf56c739b (patch) | |
| tree | d4341e3809d93ba16b75ceb7978a10c1cb4982dd | |
| parent | a425db4d7dc327667ac1a8c3ee0f6a6e1cb96433 (diff) | |
| download | mesa-a92cdcd5989717ec7d60e558cf648a6cf56c739b.tar.gz mesa-a92cdcd5989717ec7d60e558cf648a6cf56c739b.tar.xz | |
meson: fix vulkan-drivers=[]
Fixes: 5608d0a2cee47c7d037f ("meson: use array type options")
Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
| -rw-r--r-- | meson.build | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/meson.build b/meson.build index a09122479d..8db260c952 100644 --- a/meson.build +++ b/meson.build @@ -170,9 +170,6 @@ if with_gallium and system_has_kms_drm endif endif -with_intel_vk = false -with_amd_vk = false -with_any_vk = false _vulkan_drivers = get_option('vulkan-drivers') if _vulkan_drivers.contains('auto') 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.') endif endif -if _vulkan_drivers != [''] - with_intel_vk = _vulkan_drivers.contains('intel') - with_amd_vk = _vulkan_drivers.contains('amd') - with_any_vk = true -endif + +with_intel_vk = _vulkan_drivers.contains('intel') +with_amd_vk = _vulkan_drivers.contains('amd') +with_any_vk = _vulkan_drivers.length() != 0 and _vulkan_drivers != [''] if with_dri_swrast and (with_gallium_softpipe or with_gallium_swr) error('Only one swrast provider can be built') |