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

ci/build: add honeykrisp (asahi vk) to several builds

Browse Source 
Specifically:
- `alpine-build-testing`
- `fedora-release`
- `.meson-arm` (inherited by all the arm build jobs)
- `debian-arm64` (because it overrides the inherited list)
- `debian-vulkan`

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30658>
This commit is contained in:
Eric Engestrom
2024-08-14 12:57:52 +02:00
committed by Marge Bot
parent b3a2233f88
commit 91c9393da1
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -289,7 +289,7 @@ alpine-build-testing:
-D microsoft-clc=disabled -D microsoft-clc=disabled
-D shared-llvm=enabled -D shared-llvm=enabled
UNWIND: "disabled" UNWIND: "disabled"
VULKAN_DRIVERS: "amd,broadcom,freedreno,intel,imagination-experimental" VULKAN_DRIVERS: "amd,asahi,broadcom,freedreno,intel,imagination-experimental"
fedora-release: fedora-release:
extends: extends:
@@ -338,7 +338,7 @@ fedora-release:
-D shared-llvm=enabled -D shared-llvm=enabled
LLVM_VERSION: "" LLVM_VERSION: ""
UNWIND: "disabled" UNWIND: "disabled"
VULKAN_DRIVERS: "amd,broadcom,freedreno,imagination-experimental,intel,intel_hasvk" VULKAN_DRIVERS: "amd,asahi,broadcom,freedreno,imagination-experimental,intel,intel_hasvk"
debian-android: debian-android:
extends: extends:
@@ -432,7 +432,7 @@ debian-android:
needs: needs:
- debian/arm64_build - debian/arm64_build
variables: variables:
VULKAN_DRIVERS: freedreno,broadcom VULKAN_DRIVERS: asahi,freedreno,broadcom
GALLIUM_DRIVERS: "etnaviv,freedreno,lima,nouveau,panfrost,llvmpipe,softpipe,tegra,v3d,vc4,zink" GALLIUM_DRIVERS: "etnaviv,freedreno,lima,nouveau,panfrost,llvmpipe,softpipe,tegra,v3d,vc4,zink"
BUILDTYPE: "debugoptimized" BUILDTYPE: "debugoptimized"
tags: tags:
@@ -446,7 +446,8 @@ debian-arm32:
CROSS: armhf CROSS: armhf
DRI_LOADERS: DRI_LOADERS:
-D glvnd=disabled -D glvnd=disabled
# remove llvmpipe from the .meson-arm list because here we have llvm=disabled # remove asahi & llvmpipe from the .meson-arm list because here we have llvm=disabled
VULKAN_DRIVERS: freedreno,broadcom
GALLIUM_DRIVERS: "etnaviv,freedreno,lima,nouveau,panfrost,softpipe,tegra,v3d,vc4,zink" GALLIUM_DRIVERS: "etnaviv,freedreno,lima,nouveau,panfrost,softpipe,tegra,v3d,vc4,zink"
EXTRA_OPTION: > EXTRA_OPTION: >
-D llvm=disabled -D llvm=disabled
@@ -482,7 +483,7 @@ debian-arm64:
C_ARGS: > C_ARGS: >
-Wno-error=array-bounds -Wno-error=array-bounds
-Wno-error=stringop-truncation -Wno-error=stringop-truncation
VULKAN_DRIVERS: "freedreno,broadcom,panfrost,imagination-experimental" VULKAN_DRIVERS: "asahi,freedreno,broadcom,panfrost,imagination-experimental"
DRI_LOADERS: DRI_LOADERS:
-D glvnd=disabled -D glvnd=disabled
EXTRA_OPTION: > EXTRA_OPTION: >
@@ -655,7 +656,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: amd,broadcom,freedreno,intel,intel_hasvk,panfrost,virtio,imagination-experimental,microsoft-experimental,nouveau VULKAN_DRIVERS: amd,asahi,broadcom,freedreno,intel,intel_hasvk,panfrost,virtio,imagination-experimental,microsoft-experimental,nouveau
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