From 048a358bf54f2cd7a19252dea9cef0d5ba3105bd Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Wed, 25 Oct 2023 08:41:55 -0400 Subject: [PATCH] meson: Add vulkan-drivers=all option To build-test everything, helpful to check common code changes before pounding CI. Signed-off-by: Alyssa Rosenzweig Cc: mesa-stable Reviewed-by: Eric Engestrom Part-of: (cherry picked from commit b70e948886976d2fb17b3191c9116c1babe25810) --- .pick_status.json | 2 +- meson.build | 6 ++++++ meson_options.txt | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 75c0d25..cebeecf 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1184,7 +1184,7 @@ "description": "meson: Add vulkan-drivers=all option", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/meson.build b/meson.build index 19ec5c0..d1dc4e2 100644 --- a/meson.build +++ b/meson.build @@ -213,6 +213,12 @@ if _vulkan_drivers.contains('auto') error('Unknown OS @0@. Please pass -Dvulkan-drivers to set driver options. Patches gladly accepted to fix this.'.format( host_machine.system())) endif +elif _vulkan_drivers.contains('all') + # Build every vulkan driver regardless of architecture. + _vulkan_drivers = ['amd', 'intel', 'intel_hasvk', 'swrast', + 'freedreno', 'panfrost', 'virtio', 'broadcom', + 'imagination-experimental', 'microsoft-experimental', + 'nouveau-experimental'] endif with_intel_vk = _vulkan_drivers.contains('intel') diff --git a/meson_options.txt b/meson_options.txt index 8130c3e..a9f9ab1 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -211,7 +211,7 @@ option( value : ['auto'], choices : ['auto', 'amd', 'broadcom', 'freedreno', 'intel', 'intel_hasvk', 'panfrost', 'swrast', 'virtio', 'imagination-experimental', - 'microsoft-experimental', 'nouveau-experimental'], + 'microsoft-experimental', 'nouveau-experimental', 'all'], description : 'List of vulkan drivers to build. If this is set to auto ' + 'all drivers applicable to the target OS/architecture ' + 'will be built' -- 2.7.4