From 7d76038712ea099424e906d8a4c19ad5c932f7e3 Mon Sep 17 00:00:00 2001 From: Yiwei Zhang Date: Wed, 12 Apr 2023 11:15:33 -0700 Subject: [PATCH] meson/ci: promote virtio-experimental to virtio Signed-off-by: Yiwei Zhang Part-of: --- .gitlab-ci/build/gitlab-ci.yml | 12 ++++++------ android/Android.mk | 2 +- meson.build | 2 +- meson_options.txt | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.gitlab-ci/build/gitlab-ci.yml b/.gitlab-ci/build/gitlab-ci.yml index e142f95bfd29f..98e031e55fc3f 100644 --- a/.gitlab-ci/build/gitlab-ci.yml +++ b/.gitlab-ci/build/gitlab-ci.yml @@ -80,7 +80,7 @@ debian-testing: -D dri3=enabled -D gallium-va=enabled GALLIUM_DRIVERS: "swrast,virgl,radeonsi,zink,crocus,iris,i915" - VULKAN_DRIVERS: "swrast,amd,intel,intel_hasvk,virtio-experimental" + VULKAN_DRIVERS: "swrast,amd,intel,intel_hasvk,virtio" BUILDTYPE: "debugoptimized" EXTRA_OPTION: > -D spirv-to-dxil=true @@ -124,7 +124,7 @@ debian-testing-msan: MESON_TEST_ARGS: "--suite glcpp --suite gallium --suite format" # Freedreno dropped because freedreno tools fail at msan. GALLIUM_DRIVERS: "iris,nouveau,kmsro,r300,r600,swrast,svga,v3d,vc4,virgl,etnaviv,panfrost,lima,zink,radeonsi,tegra,d3d12,crocus" - VULKAN_DRIVERS: intel,amd,broadcom,virtio-experimental + VULKAN_DRIVERS: intel,amd,broadcom,virtio .debian-cl-testing: extends: @@ -370,7 +370,7 @@ debian-android: ARTIFACTS_DEBUG_SYMBOLS: 1 MINIO_ARTIFACT_NAME: mesa-x86_64-android script: - - CROSS=aarch64-linux-android GALLIUM_DRIVERS=etnaviv,freedreno,lima,panfrost,vc4,v3d VULKAN_DRIVERS=freedreno,broadcom,virtio-experimental .gitlab-ci/meson/build.sh + - CROSS=aarch64-linux-android GALLIUM_DRIVERS=etnaviv,freedreno,lima,panfrost,vc4,v3d VULKAN_DRIVERS=freedreno,broadcom,virtio .gitlab-ci/meson/build.sh # x86_64 build: # Can't do Intel because gen_decoder.c currently requires libexpat, which # is not a dependency that AOSP wants to accept. Can't do Radeon Gallium @@ -521,7 +521,7 @@ debian-clang: -D shared-llvm=enabled -D opencl-spirv=true 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-experimental,swrast,panfrost,imagination-experimental,microsoft-experimental + VULKAN_DRIVERS: intel,amd,freedreno,broadcom,virtio,swrast,panfrost,imagination-experimental,microsoft-experimental EXTRA_OPTION: -D spirv-to-dxil=true -D osmesa=true @@ -620,7 +620,7 @@ debian-vulkan: -D c_args=-fno-sanitize-recover=all -D cpp_args=-fno-sanitize-recover=all UBSAN_OPTIONS: "print_stacktrace=1" - VULKAN_DRIVERS: intel,amd,freedreno,broadcom,virtio-experimental,imagination-experimental,microsoft-experimental + VULKAN_DRIVERS: intel,amd,freedreno,broadcom,virtio,imagination-experimental,microsoft-experimental EXTRA_OPTION: > -D vulkan-layers=device-select,overlay -D build-aco-tests=true @@ -633,7 +633,7 @@ debian-i386: - .use-debian/i386_build variables: CROSS: i386 - VULKAN_DRIVERS: intel,amd,swrast,virtio-experimental + VULKAN_DRIVERS: intel,amd,swrast,virtio GALLIUM_DRIVERS: "iris,nouveau,r300,r600,radeonsi,swrast,virgl,zink,crocus" LLVM_VERSION: 13 EXTRA_OPTION: > diff --git a/android/Android.mk b/android/Android.mk index 7f1f679391c90..c37e4fa5e9675 100644 --- a/android/Android.mk +++ b/android/Android.mk @@ -34,7 +34,7 @@ MESA_VK_LIB_SUFFIX_intel_hasvk := intel_hasvk MESA_VK_LIB_SUFFIX_freedreno := freedreno MESA_VK_LIB_SUFFIX_broadcom := broadcom MESA_VK_LIB_SUFFIX_panfrost := panfrost -MESA_VK_LIB_SUFFIX_virtio-experimental := virtio +MESA_VK_LIB_SUFFIX_virtio := virtio MESA_VK_LIB_SUFFIX_swrast := lvp include $(CLEAR_VARS) diff --git a/meson.build b/meson.build index 3351d4e4d37c2..73f27c3c1105a 100644 --- a/meson.build +++ b/meson.build @@ -237,7 +237,7 @@ with_amd_vk = _vulkan_drivers.contains('amd') with_freedreno_vk = _vulkan_drivers.contains('freedreno') with_panfrost_vk = _vulkan_drivers.contains('panfrost') with_swrast_vk = _vulkan_drivers.contains('swrast') -with_virtio_vk = _vulkan_drivers.contains('virtio-experimental') +with_virtio_vk = _vulkan_drivers.contains('virtio') with_broadcom_vk = _vulkan_drivers.contains('broadcom') with_imagination_vk = _vulkan_drivers.contains('imagination-experimental') with_imagination_srv = get_option('imagination-srv') diff --git a/meson_options.txt b/meson_options.txt index 8e0bf2a9555af..ac71cf3abeb13 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -195,8 +195,8 @@ option( type : 'array', value : ['auto'], choices : ['auto', 'amd', 'broadcom', 'freedreno', 'intel', 'intel_hasvk', - 'panfrost', 'swrast', 'imagination-experimental', - 'microsoft-experimental', 'virtio-experimental'], + 'panfrost', 'swrast', 'virtio', 'imagination-experimental', + 'microsoft-experimental'], description : 'List of vulkan drivers to build. If this is set to auto ' + 'all drivers applicable to the target OS/architecture ' + 'will be built'