diff options
| author | Alyssa Rosenzweig <alyssa@rosenzweig.io> | 2023-10-25 08:41:55 -0400 |
|---|---|---|
| committer | Eric Engestrom <eric@engestrom.ch> | 2023-10-30 15:47:14 +0000 |
| commit | 048a358bf54f2cd7a19252dea9cef0d5ba3105bd (patch) | |
| tree | 84693ae578401403b60d60056470a43b4480800d | |
| parent | b42d824822350bf5b1e7b169bdf2a470c9c5b831 (diff) | |
| download | mesa-048a358bf54f2cd7a19252dea9cef0d5ba3105bd.tar.gz mesa-048a358bf54f2cd7a19252dea9cef0d5ba3105bd.tar.bz2 mesa-048a358bf54f2cd7a19252dea9cef0d5ba3105bd.zip | |
meson: Add vulkan-drivers=all option
To build-test everything, helpful to check common code changes before pounding
CI.
Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Cc: mesa-stable
Reviewed-by: Eric Engestrom <eric@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25882>
(cherry picked from commit b70e948886976d2fb17b3191c9116c1babe25810)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | meson.build | 6 | ||||
| -rw-r--r-- | meson_options.txt | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/.pick_status.json b/.pick_status.json index 75c0d2551a8..cebeecfa62b 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 19ec5c022ac..d1dc4e2ea01 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 8130c3e9321..a9f9ab1658f 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' |