OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

meson/ci: promote virtio-experimental to virtio

Browse Source 
Signed-off-by: Yiwei Zhang <zzyiwei@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22547>
This commit is contained in:
Yiwei Zhang
2023-04-12 11:15:33 -07:00
committed by Marge Bot
parent e9c26e6920
commit 7d76038712
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
.gitlab-ci/build/gitlab-ci.yml
View File

@@ -80,7 +80,7 @@ debian-testing:
-D dri3=enabled -D dri3=enabled
-D gallium-va=enabled -D gallium-va=enabled
GALLIUM_DRIVERS: "swrast,virgl,radeonsi,zink,crocus,iris,i915" 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" BUILDTYPE: "debugoptimized"
EXTRA_OPTION: > EXTRA_OPTION: >
-D spirv-to-dxil=true -D spirv-to-dxil=true
@@ -124,7 +124,7 @@ debian-testing-msan:
MESON_TEST_ARGS: "--suite glcpp --suite gallium --suite format" MESON_TEST_ARGS: "--suite glcpp --suite gallium --suite format"
# Freedreno dropped because freedreno tools fail at msan. # 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" 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: .debian-cl-testing:
extends: extends:
@@ -370,7 +370,7 @@ debian-android:
ARTIFACTS_DEBUG_SYMBOLS: 1 ARTIFACTS_DEBUG_SYMBOLS: 1
MINIO_ARTIFACT_NAME: mesa-x86_64-android MINIO_ARTIFACT_NAME: mesa-x86_64-android
script: 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: # x86_64 build:
# Can't do Intel because gen_decoder.c currently requires libexpat, which # 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 # 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 shared-llvm=enabled
-D opencl-spirv=true -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" 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: EXTRA_OPTION:
-D spirv-to-dxil=true -D spirv-to-dxil=true
-D osmesa=true -D osmesa=true
@@ -620,7 +620,7 @@ debian-vulkan:
-D c_args=-fno-sanitize-recover=all -D c_args=-fno-sanitize-recover=all
-D cpp_args=-fno-sanitize-recover=all -D cpp_args=-fno-sanitize-recover=all
UBSAN_OPTIONS: "print_stacktrace=1" 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: > EXTRA_OPTION: >
-D vulkan-layers=device-select,overlay -D vulkan-layers=device-select,overlay
-D build-aco-tests=true -D build-aco-tests=true
@@ -633,7 +633,7 @@ debian-i386:
- .use-debian/i386_build - .use-debian/i386_build
variables: variables:
CROSS: i386 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" GALLIUM_DRIVERS: "iris,nouveau,r300,r600,radeonsi,swrast,virgl,zink,crocus"
LLVM_VERSION: 13 LLVM_VERSION: 13
EXTRA_OPTION: > EXTRA_OPTION: >

2
android/Android.mk
View File

@@ -34,7 +34,7 @@ MESA_VK_LIB_SUFFIX_intel_hasvk := intel_hasvk
MESA_VK_LIB_SUFFIX_freedreno := freedreno MESA_VK_LIB_SUFFIX_freedreno := freedreno
MESA_VK_LIB_SUFFIX_broadcom := broadcom MESA_VK_LIB_SUFFIX_broadcom := broadcom
MESA_VK_LIB_SUFFIX_panfrost := panfrost 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 MESA_VK_LIB_SUFFIX_swrast := lvp
include $(CLEAR_VARS) include $(CLEAR_VARS)

2
meson.build
View File

@@ -237,7 +237,7 @@ with_amd_vk = _vulkan_drivers.contains('amd')
with_freedreno_vk = _vulkan_drivers.contains('freedreno') with_freedreno_vk = _vulkan_drivers.contains('freedreno')
with_panfrost_vk = _vulkan_drivers.contains('panfrost') with_panfrost_vk = _vulkan_drivers.contains('panfrost')
with_swrast_vk = _vulkan_drivers.contains('swrast') 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_broadcom_vk = _vulkan_drivers.contains('broadcom')
with_imagination_vk = _vulkan_drivers.contains('imagination-experimental') with_imagination_vk = _vulkan_drivers.contains('imagination-experimental')
with_imagination_srv = get_option('imagination-srv') with_imagination_srv = get_option('imagination-srv')

4
meson_options.txt
View File

@@ -195,8 +195,8 @@ option(
type : 'array', type : 'array',
value : ['auto'], value : ['auto'],
choices : ['auto', 'amd', 'broadcom', 'freedreno', 'intel', 'intel_hasvk', choices : ['auto', 'amd', 'broadcom', 'freedreno', 'intel', 'intel_hasvk',
'panfrost', 'swrast', 'imagination-experimental', 'panfrost', 'swrast', 'virtio', 'imagination-experimental',
'microsoft-experimental', 'virtio-experimental'], 'microsoft-experimental'],
description : 'List of vulkan drivers to build. If this is set to auto ' + description : 'List of vulkan drivers to build. If this is set to auto ' +
'all drivers applicable to the target OS/architecture ' + 'all drivers applicable to the target OS/architecture ' +
'will be built' 'will be built'