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

pvr: ci: Initial freedesktop CI integration

Browse Source 
This patch adds the PowerVR driver to the following shared builds:

 * debian-arm64
 * debian-clang
 * debian-release
 * debian-vulkan
 * fedora-release

It also adds the associated "tools" to these builds:

 * debian-arm64-build-test
 * debian-release (already uses -Dtools=all)
 * fedora-release

And removes them from these builds by expanding -Dtools=all:

 * debian-gallium

Signed-off-by: Matt Coster <matt.coster@imgtec.com>
Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15284>
This commit is contained in:
Matt Coster
2022-03-07 11:25:17 +00:00
parent 97c4ce44e9
commit c80fa97d18
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
.gitlab-ci.yml
View File

@@ -845,7 +845,7 @@ debian-gallium:
VULKAN_DRIVERS: swrast VULKAN_DRIVERS: swrast
EXTRA_OPTION: > EXTRA_OPTION: >
-D osmesa=true -D osmesa=true
-D tools=all -D tools=drm-shim,etnaviv,freedreno,glsl,intel,intel-ui,nir,nouveau,xvmc,lima,panfrost,asahi
script: script:
- .gitlab-ci/meson/build.sh - .gitlab-ci/meson/build.sh
- .gitlab-ci/run-shader-db.sh - .gitlab-ci/run-shader-db.sh
@@ -872,12 +872,13 @@ debian-release:
-D gallium-opencl=disabled -D gallium-opencl=disabled
-D llvm=enabled -D llvm=enabled
GALLIUM_DRIVERS: "i915,iris,nouveau,kmsro,freedreno,r300,svga,swrast,v3d,vc4,virgl,etnaviv,panfrost,lima,zink,d3d12,crocus" GALLIUM_DRIVERS: "i915,iris,nouveau,kmsro,freedreno,r300,svga,swrast,v3d,vc4,virgl,etnaviv,panfrost,lima,zink,d3d12,crocus"
VULKAN_DRIVERS: "amd" VULKAN_DRIVERS: "amd,imagination-experimental"
BUILDTYPE: "release" BUILDTYPE: "release"
EXTRA_OPTION: > EXTRA_OPTION: >
-D osmesa=true -D osmesa=true
-D tools=all -D tools=all
-D intel-clc=enabled -D intel-clc=enabled
-D imagination-srv=true
script: script:
- .gitlab-ci/meson/build.sh - .gitlab-ci/meson/build.sh
@@ -903,8 +904,9 @@ fedora-release:
EXTRA_OPTION: > EXTRA_OPTION: >
-D osmesa=true -D osmesa=true
-D selinux=true -D selinux=true
-D tools=drm-shim,etnaviv,freedreno,glsl,intel,nir,nouveau,lima,panfrost -D tools=drm-shim,etnaviv,freedreno,glsl,intel,nir,nouveau,lima,panfrost,imagination
-D intel-clc=enabled -D intel-clc=enabled
-D imagination-srv=true
GALLIUM_DRIVERS: "crocus,etnaviv,freedreno,iris,kmsro,lima,nouveau,panfrost,r300,r600,radeonsi,svga,swrast,tegra,v3d,vc4,virgl,zink" GALLIUM_DRIVERS: "crocus,etnaviv,freedreno,iris,kmsro,lima,nouveau,panfrost,r300,r600,radeonsi,svga,swrast,tegra,v3d,vc4,virgl,zink"
GALLIUM_ST: > GALLIUM_ST: >
-D dri3=enabled -D dri3=enabled
@@ -924,7 +926,7 @@ fedora-release:
-D vulkan-device-select-layer=true -D vulkan-device-select-layer=true
LLVM_VERSION: "" LLVM_VERSION: ""
UNWIND: "disabled" UNWIND: "disabled"
VULKAN_DRIVERS: "amd,broadcom,freedreno,intel" VULKAN_DRIVERS: "amd,broadcom,freedreno,intel,imagination-experimental"
script: script:
- .gitlab-ci/meson/build.sh - .gitlab-ci/meson/build.sh
@@ -1027,10 +1029,11 @@ debian-arm64:
- .meson-arm - .meson-arm
- .ci-deqp-artifacts - .ci-deqp-artifacts
variables: variables:
VULKAN_DRIVERS: "freedreno,broadcom,panfrost" VULKAN_DRIVERS: "freedreno,broadcom,panfrost,imagination-experimental"
EXTRA_OPTION: > EXTRA_OPTION: >
-D llvm=disabled -D llvm=disabled
-D valgrind=false -D valgrind=false
-D imagination-srv=true
MINIO_ARTIFACT_NAME: mesa-arm64 MINIO_ARTIFACT_NAME: mesa-arm64
script: script:
- .gitlab-ci/meson/build.sh - .gitlab-ci/meson/build.sh
@@ -1058,7 +1061,7 @@ debian-arm64-build-test:
variables: variables:
VULKAN_DRIVERS: "amd" VULKAN_DRIVERS: "amd"
EXTRA_OPTION: > EXTRA_OPTION: >
-Dtools=panfrost -Dtools=panfrost,imagination
script: script:
- .gitlab-ci/meson/build.sh - .gitlab-ci/meson/build.sh
@@ -1085,7 +1088,9 @@ debian-clang:
DRI_LOADERS: > DRI_LOADERS: >
-D glvnd=true -D glvnd=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 VULKAN_DRIVERS: intel,amd,freedreno,broadcom,virtio-experimental,swrast,panfrost,imagination-experimental
EXTRA_OPTIONS:
-D imagination-srv=true
CC: clang CC: clang
CXX: clang++ CXX: clang++
@@ -1149,11 +1154,12 @@ 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 VULKAN_DRIVERS: intel,amd,freedreno,broadcom,virtio-experimental,imagination-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
-D intel-clc=enabled -D intel-clc=enabled
-D imagination-srv=true
debian-i386: debian-i386:
extends: extends: