diff options
| author | Emma Anholt <emma@anholt.net> | 2023-04-05 12:49:50 -0700 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2023-04-24 19:21:50 +0000 |
| commit | c0f5f852ab1daa551dcd879110047dffdea79ea4 (patch) | |
| tree | d60279abeed36f5feccf012e66bea6eded7a3ccf /.gitlab-ci | |
| parent | e38ca400821dce676e97fbfdcb0c6571d7372b99 (diff) | |
| download | mesa-c0f5f852ab1daa551dcd879110047dffdea79ea4.tar.gz | |
ci: Add the Vulkan validation layer to amd64 rootfs builds.
We're going to want this for zink testing on actual HW drivers. I haven't
sorted out the arm64 build yet, so no tu coverage.
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22459>
Diffstat (limited to '.gitlab-ci')
| -rwxr-xr-x | .gitlab-ci/container/lava_build.sh | 7 | ||||
| -rw-r--r-- | .gitlab-ci/image-tags.yml | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/.gitlab-ci/container/lava_build.sh b/.gitlab-ci/container/lava_build.sh index f50badb976a..68c7acf7b37 100755 --- a/.gitlab-ci/container/lava_build.sh +++ b/.gitlab-ci/container/lava_build.sh @@ -163,6 +163,13 @@ rm -rf /apitrace-msvc-win64 STRIP_CMD="${GCC_ARCH}-strip" mkdir -p $ROOTFS/usr/lib/$GCC_ARCH +############### Build Vulkan validation layer (for zink) +if [ "$DEBIAN_ARCH" = "amd64" ]; then + . .gitlab-ci/container/build-vulkan-validation.sh + mv /usr/lib/x86_64-linux-gnu/libVkLayer_khronos_validation.so $ROOTFS/usr/lib/x86_64-linux-gnu/ + mkdir -p $ROOTFS/usr/share/vulkan/explicit_layer.d + mv /usr/share/vulkan/explicit_layer.d/* $ROOTFS/usr/share/vulkan/explicit_layer.d/ +fi ############### Build apitrace . .gitlab-ci/container/build-apitrace.sh diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index 9a49e9f2bb3..186487d4cc5 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -21,7 +21,7 @@ variables: ALPINE_X86_BUILD_TAG: "2023-03-20-3.17-bump" FEDORA_X86_BUILD_TAG: "2023-03-13-procps-ng" - KERNEL_ROOTFS_TAG: "2023-04-21-deqp-vkcts" + KERNEL_ROOTFS_TAG: "2023-04-24-vulkan-validation" WINDOWS_X64_VS_PATH: "windows/x64_vs" WINDOWS_X64_VS_TAG: "2022-10-20-upgrade-zlib" |