Fixes: 5608d0a2cee47c7d037f ("meson: use array type options") Signed-off-by: Eric Engestrom <eric.engest...@intel.com> --- meson.build | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/meson.build b/meson.build index 6b069ae5dfc52adba1b7..a8999f37bd06a84cf7c0 100644 --- a/meson.build +++ b/meson.build @@ -180,9 +180,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 @@ -198,11 +195,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 = with_intel_vk or with_amd_vk if with_dri_swrast and (with_gallium_softpipe or with_gallium_swr) error('Only one swrast provider can be built') -- Cheers, Eric _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev