AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci: Update virglrenderer and crosvm

Browse Source 
Update virglrenderer to test EXT_attachment_feedback_loop_layout

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28014>
This commit is contained in:
Corentin Noël
2024-03-04 13:09:17 +01:00
committed by Marge Bot
parent fe2ec50844
commit 57d914b757
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.gitlab-ci/container/build-crosvm.sh
View File

@@ -6,13 +6,13 @@ set -ex
git config --global user.email "mesa@example.com"
git config --global user.name "Mesa CI"
CROSVM_VERSION=e3815e62d675ef436956a992e0ed58b7309c759d
CROSVM_VERSION=1641c55bcc922588e24de73e9cca7b5e4005bd6d
git clone --single-branch -b main --no-checkout https://chromium.googlesource.com/crosvm/crosvm /platform/crosvm
pushd /platform/crosvm
git checkout "$CROSVM_VERSION"
git submodule update --init
VIRGLRENDERER_VERSION=66049f6b101438fa9984269893e8def26a3b9b60
VIRGLRENDERER_VERSION=d9c002fac153b834a2c17731f2b85c36e333e102
rm -rf third_party/virglrenderer
git clone --single-branch -b main --no-checkout https://gitlab.freedesktop.org/virgl/virglrenderer.git third_party/virglrenderer
pushd third_party/virglrenderer
@@ -31,10 +31,10 @@ RUSTFLAGS='-L native=/usr/local/lib' cargo install \
--version 0.65.1 \
$EXTRA_CARGO_ARGS
CROSVM_USE_SYSTEM_VIRGLRENDERER=1 RUSTFLAGS='-L native=/usr/local/lib' cargo install \
CROSVM_USE_SYSTEM_MINIGBM=1 CROSVM_USE_SYSTEM_VIRGLRENDERER=1 RUSTFLAGS='-L native=/usr/local/lib' cargo install \
-j ${FDO_CI_CONCURRENT:-4} \
--locked \
--features 'default-no-sandbox gpu x virgl_renderer virgl_renderer_next' \
--features 'default-no-sandbox gpu x virgl_renderer' \
--path . \
--root /usr/local \
$EXTRA_CARGO_ARGS

8
.gitlab-ci/image-tags.yml
View File

@@ -13,7 +13,7 @@
variables:
DEBIAN_X86_64_BUILD_BASE_IMAGE: "debian/x86_64_build-base"
DEBIAN_BASE_TAG: "20240301-mold"
DEBIAN_BASE_TAG: "20240307-virglcrosvm"
DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build"
DEBIAN_BUILD_TAG: "20240301-mold"
@@ -25,9 +25,9 @@ variables:
DEBIAN_X86_64_TEST_ANDROID_IMAGE_PATH: "debian/x86_64_test-android"
DEBIAN_X86_64_TEST_ANDROID_TAG: "20240302-gl-gles"
DEBIAN_X86_64_TEST_GL_TAG: "20240302-gl-gles"
DEBIAN_X86_64_TEST_VK_TAG: "20240301-patches"
KERNEL_ROOTFS_TAG: "20240302-gl-gles"
DEBIAN_X86_64_TEST_GL_TAG: "20240307-virglcrosvm"
DEBIAN_X86_64_TEST_VK_TAG: "20240307-virglcrosvm"
KERNEL_ROOTFS_TAG: "20240307-virglcrosvm"
ALPINE_X86_64_BUILD_TAG: "20240208-libclc-5"
ALPINE_X86_64_LAVA_SSH_TAG: "20230626-v1"

2
src/virtio/ci/gitlab-ci.yml
View File

@@ -17,7 +17,7 @@
VK_DRIVER: virtio
CROSVM_GALLIUM_DRIVER: "llvmpipe"
CROSVM_VK_DRIVER: "lvp"
CROSVM_GPU_ARGS: "vulkan=true,gles=false,backend=virglrenderer,egl=true,surfaceless=true"
CROSVM_GPU_ARGS: "vulkan=true,gles=false,backend=virglrenderer,egl=true,surfaceless=true,fixed-blob-mapping=false"
venus-lavapipe:
extends: