diff options
| author | Jason Ekstrand <jason.ekstrand@intel.com> | 2017-11-11 10:30:35 -0800 |
|---|---|---|
| committer | Jason Ekstrand <jason.ekstrand@intel.com> | 2017-11-13 11:55:06 -0800 |
| commit | 00fb21b570b4f13971546f31177df9e44d828502 (patch) | |
| tree | 5ec090e30209119f071f7b809cdbec4f8c8ed594 | |
| parent | 3a922d6a613231212b6ea7276d1ca416378bd9fd (diff) | |
meson: Move -Dvulkan-drivers handling higher in the file
The window-system auto-detection code (specifically for glx) relies on
with_any_vk being available. This fixes the Vulkan-only build. Also,
this puts it up near the handling of -Ddri-drivers and -Dgallium-drivers
which seems to make a bit more sense.
Fixes: 118a7f044191d4ab15ac9 "meson: add support for xlib glx"
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
| -rw-r--r-- | meson.build | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/meson.build b/meson.build index e4d0e0f80cb..e8467590df2 100644 --- a/meson.build +++ b/meson.build @@ -154,6 +154,29 @@ if _drivers != '' with_gallium = true endif +with_intel_vk = false +with_amd_vk = false +with_any_vk = false +_vulkan_drivers = get_option('vulkan-drivers') +if _vulkan_drivers == 'auto' + if not ['darwin', 'windows'].contains(host_machine.system()) + if host_machine.cpu_family().startswith('x86') + _vulkan_drivers = 'amd,intel' + else + error('Unknown architecture. Please pass -Dvulkan-drivers to set driver options. Patches gladly accepted to fix this.') + endif + else + # No vulkan driver supports windows or macOS currently + _vulkan_drivers = '' + endif +endif +if _vulkan_drivers != '' + _split = _vulkan_drivers.split(',') + with_intel_vk = _split.contains('intel') + with_amd_vk = _split.contains('amd') + with_any_vk = with_amd_vk or with_intel_vk +endif + if with_dri_swrast and with_gallium_softpipe error('Only one swrast provider can be built') endif @@ -285,29 +308,6 @@ if with_vulkan_icd_dir == '' with_vulkan_icd_dir = join_paths(get_option('datadir'), 'vulkan/icd.d') endif -with_intel_vk = false -with_amd_vk = false -with_any_vk = false -_vulkan_drivers = get_option('vulkan-drivers') -if _vulkan_drivers == 'auto' - if not ['darwin', 'windows'].contains(host_machine.system()) - if host_machine.cpu_family().startswith('x86') - _vulkan_drivers = 'amd,intel' - else - error('Unknown architecture. Please pass -Dvulkan-drivers to set driver options. Patches gladly accepted to fix this.') - endif - else - # No vulkan driver supports windows or macOS currently - _vulkan_drivers = '' - endif -endif -if _vulkan_drivers != '' - _split = _vulkan_drivers.split(',') - with_intel_vk = _split.contains('intel') - with_amd_vk = _split.contains('amd') - with_any_vk = with_amd_vk or with_intel_vk -endif - with_dri2 = (with_dri or with_any_vk) and with_dri_platform == 'drm' with_dri3 = get_option('dri3') if with_dri3 == 'auto' |