diff --git a/.gitlab-ci/build/gitlab-ci.yml b/.gitlab-ci/build/gitlab-ci.yml index 7f3c323975b..6f1824f4a0d 100644 --- a/.gitlab-ci/build/gitlab-ci.yml +++ b/.gitlab-ci/build/gitlab-ci.yml @@ -196,7 +196,7 @@ debian-build-x86_64: -D gallium-rusticl=false -D legacy-wayland=bind-wayland-display GALLIUM_DRIVERS: "i915,iris,nouveau,r300,r600,freedreno,llvmpipe,softpipe,svga,v3d,vc4,virgl,etnaviv,panfrost,lima,zink,d3d12,asahi,crocus" - VULKAN_DRIVERS: "intel_hasvk,imagination-experimental,microsoft-experimental,nouveau,swrast" + VULKAN_DRIVERS: "intel_hasvk,imagination,microsoft-experimental,nouveau,swrast" BUILDTYPE: "debugoptimized" EXTRA_OPTION: > -D spirv-to-dxil=true @@ -228,7 +228,7 @@ debian-release: -D gallium-rusticl=false -D llvm=enabled GALLIUM_DRIVERS: "i915,iris,nouveau,r300,freedreno,llvmpipe,softpipe,svga,v3d,vc4,virgl,etnaviv,panfrost,lima,zink,d3d12,asahi,crocus" - VULKAN_DRIVERS: "swrast,intel_hasvk,imagination-experimental,microsoft-experimental" + VULKAN_DRIVERS: "swrast,intel_hasvk,imagination,microsoft-experimental" EXTRA_OPTION: > -D spirv-to-dxil=true -D tools=all @@ -272,7 +272,7 @@ alpine-build-testing: -D microsoft-clc=disabled -D shared-llvm=enabled UNWIND: "disabled" - VULKAN_DRIVERS: "amd,broadcom,freedreno,intel,imagination-experimental" + VULKAN_DRIVERS: "amd,broadcom,freedreno,intel,imagination" fedora-release: extends: @@ -320,7 +320,7 @@ fedora-release: -D microsoft-clc=disabled -D shared-llvm=enabled UNWIND: "disabled" - VULKAN_DRIVERS: "amd,asahi,broadcom,freedreno,imagination-experimental,intel,intel_hasvk" + VULKAN_DRIVERS: "amd,asahi,broadcom,freedreno,imagination,intel,intel_hasvk" debian-android: extends: @@ -550,7 +550,7 @@ debian-arm64-build-test: - .ci-deqp-artifacts - .meson-build-only variables: - VULKAN_DRIVERS: "amd,asahi,imagination-experimental,nouveau" + VULKAN_DRIVERS: "amd,asahi,imagination,nouveau" DRI_LOADERS: -D glvnd=disabled EXTRA_OPTION: > @@ -626,7 +626,7 @@ debian-clang: -D microsoft-clc=disabled -D shared-llvm=enabled GALLIUM_DRIVERS: "iris,nouveau,r300,r600,freedreno,llvmpipe,softpipe,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 + VULKAN_DRIVERS: intel,amd,freedreno,broadcom,virtio,swrast,panfrost,imagination,microsoft-experimental,nouveau EXTRA_OPTION: -D spirv-to-dxil=true -D imagination-srv=true @@ -710,7 +710,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,asahi,broadcom,freedreno,intel,intel_hasvk,panfrost,virtio,imagination-experimental,microsoft-experimental,nouveau + VULKAN_DRIVERS: amd,asahi,broadcom,freedreno,intel,intel_hasvk,panfrost,virtio,imagination,microsoft-experimental,nouveau EXTRA_OPTION: > -D vulkan-layers=device-select,overlay -D build-radv-tests=true diff --git a/meson.build b/meson.build index 8427d26dc3d..7b0ef1a2aa8 100644 --- a/meson.build +++ b/meson.build @@ -270,7 +270,7 @@ 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', + 'imagination', 'microsoft-experimental', 'nouveau', 'asahi', 'gfxstream'] endif @@ -282,7 +282,7 @@ with_panfrost_vk = _vulkan_drivers.contains('panfrost') with_swrast_vk = _vulkan_drivers.contains('swrast') with_virtio_vk = _vulkan_drivers.contains('virtio') with_broadcom_vk = _vulkan_drivers.contains('broadcom') -with_imagination_vk = _vulkan_drivers.contains('imagination-experimental') +with_imagination_vk = _vulkan_drivers.contains('imagination') with_imagination_srv = get_option('imagination-srv') with_microsoft_vk = _vulkan_drivers.contains('microsoft-experimental') with_nouveau_vk = _vulkan_drivers.contains('nouveau') diff --git a/meson.options b/meson.options index 02b921454c3..27d778a3c7a 100644 --- a/meson.options +++ b/meson.options @@ -207,7 +207,7 @@ option( type : 'array', value : ['auto'], choices : ['auto', 'amd', 'broadcom', 'freedreno', 'intel', 'intel_hasvk', - 'panfrost', 'swrast', 'virtio', 'imagination-experimental', + 'panfrost', 'swrast', 'virtio', 'imagination', 'microsoft-experimental', 'nouveau', 'asahi', 'gfxstream', 'all'], description : 'List of vulkan drivers to build. If this is set to auto ' +