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

ci: remove llvmpipe in the job that disables llvm

Browse Source 
Instead of removing it from all the arm build jobs and only adding it
back on arm64.

Fixes: 35cb0c350e ("ci: replace gallium-drivers=swrast with gallium-drivers=llvmpipe,softpipe")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30366>
This commit is contained in:
Eric Engestrom
2024-07-25 16:18:21 +02:00
committed by Marge Bot
parent 5d84e6cf26
commit c3b25dd357
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -433,7 +433,7 @@ debian-android:
- debian/arm64_build - debian/arm64_build
variables: variables:
VULKAN_DRIVERS: freedreno,broadcom VULKAN_DRIVERS: freedreno,broadcom
GALLIUM_DRIVERS: "etnaviv,freedreno,kmsro,lima,nouveau,panfrost,softpipe,tegra,v3d,vc4,zink" GALLIUM_DRIVERS: "etnaviv,freedreno,kmsro,lima,nouveau,panfrost,llvmpipe,softpipe,tegra,v3d,vc4,zink"
BUILDTYPE: "debugoptimized" BUILDTYPE: "debugoptimized"
tags: tags:
- aarch64 - aarch64
@@ -446,6 +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
GALLIUM_DRIVERS: "etnaviv,freedreno,kmsro,lima,nouveau,panfrost,softpipe,tegra,v3d,vc4,zink"
EXTRA_OPTION: > EXTRA_OPTION: >
-D llvm=disabled -D llvm=disabled
-D valgrind=disabled -D valgrind=disabled
@@ -480,7 +482,6 @@ debian-arm64:
C_ARGS: > C_ARGS: >
-Wno-error=array-bounds -Wno-error=array-bounds
-Wno-error=stringop-truncation -Wno-error=stringop-truncation
GALLIUM_DRIVERS: "etnaviv,freedreno,kmsro,lima,nouveau,panfrost,llvmpipe,softpipe,tegra,v3d,vc4,zink"
VULKAN_DRIVERS: "freedreno,broadcom,panfrost,imagination-experimental" VULKAN_DRIVERS: "freedreno,broadcom,panfrost,imagination-experimental"
DRI_LOADERS: DRI_LOADERS:
-D glvnd=disabled -D glvnd=disabled