From 75785749efb1e5a1711c868840e3c32e3038fafe Mon Sep 17 00:00:00 2001 From: Faith Ekstrand Date: Tue, 27 Feb 2024 12:36:24 -0600 Subject: [PATCH] meson: Rename nouveau-experimental to nouveau and build by default on x86 Reviewed-by: Joshua Ashton Part-of: --- .gitlab-ci/build/gitlab-ci.yml | 6 +++--- meson.build | 6 +++--- meson_options.txt | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci/build/gitlab-ci.yml b/.gitlab-ci/build/gitlab-ci.yml index 2a12acb3907..c738122cbc3 100644 --- a/.gitlab-ci/build/gitlab-ci.yml +++ b/.gitlab-ci/build/gitlab-ci.yml @@ -77,7 +77,7 @@ debian-testing: -D gallium-va=enabled -D gallium-rusticl=true GALLIUM_DRIVERS: "swrast,virgl,radeonsi,zink,crocus,iris,i915,r300" - VULKAN_DRIVERS: "swrast,amd,intel,intel_hasvk,virtio,nouveau-experimental" + VULKAN_DRIVERS: "swrast,amd,intel,intel_hasvk,virtio,nouveau" BUILDTYPE: "debugoptimized" EXTRA_OPTION: > -D spirv-to-dxil=true @@ -539,7 +539,7 @@ debian-clang: -D opencl-spirv=true -D shared-glapi=enabled GALLIUM_DRIVERS: "iris,nouveau,kmsro,r300,r600,freedreno,swrast,svga,v3d,vc4,virgl,etnaviv,panfrost,lima,zink,radeonsi,tegra,d3d12,crocus,i915,asahi" - VULKAN_DRIVERS: intel,amd,freedreno,broadcom,virtio,swrast,panfrost,imagination-experimental,microsoft-experimental,nouveau-experimental + VULKAN_DRIVERS: intel,amd,freedreno,broadcom,virtio,swrast,panfrost,imagination-experimental,microsoft-experimental,nouveau EXTRA_OPTION: -D spirv-to-dxil=true -D osmesa=true @@ -617,7 +617,7 @@ debian-vulkan: -D c_args=-fno-sanitize-recover=all -D cpp_args=-fno-sanitize-recover=all UBSAN_OPTIONS: "print_stacktrace=1" - VULKAN_DRIVERS: amd,broadcom,freedreno,intel,intel_hasvk,panfrost,virtio,imagination-experimental,microsoft-experimental,nouveau-experimental + VULKAN_DRIVERS: amd,broadcom,freedreno,intel,intel_hasvk,panfrost,virtio,imagination-experimental,microsoft-experimental,nouveau EXTRA_OPTION: > -D vulkan-layers=device-select,overlay -D build-aco-tests=true diff --git a/meson.build b/meson.build index 9471276131c..00be348cab9 100644 --- a/meson.build +++ b/meson.build @@ -216,7 +216,7 @@ _vulkan_drivers = get_option('vulkan-drivers') if _vulkan_drivers.contains('auto') if system_has_kms_drm if host_machine.cpu_family().startswith('x86') - _vulkan_drivers = ['amd', 'intel', 'intel_hasvk', 'swrast'] + _vulkan_drivers = ['amd', 'intel', 'intel_hasvk', 'nouveau', 'swrast'] elif ['arm', 'aarch64'].contains(host_machine.cpu_family()) _vulkan_drivers = ['swrast', 'intel'] elif ['mips', 'mips64', 'riscv32', 'riscv64'].contains(host_machine.cpu_family()) @@ -239,7 +239,7 @@ elif _vulkan_drivers.contains('all') _vulkan_drivers = ['amd', 'intel', 'intel_hasvk', 'swrast', 'freedreno', 'panfrost', 'virtio', 'broadcom', 'imagination-experimental', 'microsoft-experimental', - 'nouveau-experimental'] + 'nouveau'] endif with_intel_vk = _vulkan_drivers.contains('intel') @@ -253,7 +253,7 @@ with_broadcom_vk = _vulkan_drivers.contains('broadcom') with_imagination_vk = _vulkan_drivers.contains('imagination-experimental') with_imagination_srv = get_option('imagination-srv') with_microsoft_vk = _vulkan_drivers.contains('microsoft-experimental') -with_nouveau_vk = _vulkan_drivers.contains('nouveau-experimental') +with_nouveau_vk = _vulkan_drivers.contains('nouveau') with_any_vk = _vulkan_drivers.length() != 0 with_vk_compiler = [ diff --git a/meson_options.txt b/meson_options.txt index 3da8e6a3350..6ed30f75ca6 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -221,7 +221,7 @@ option( value : ['auto'], choices : ['auto', 'amd', 'broadcom', 'freedreno', 'intel', 'intel_hasvk', 'panfrost', 'swrast', 'virtio', 'imagination-experimental', - 'microsoft-experimental', 'nouveau-experimental', 'all'], + 'microsoft-experimental', 'nouveau', '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'