fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 20:18:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

ci/android: Refactor replacing Vulkan drivers

Browse source 
Setting the VK_DRIVER variable for lavapipe jobs simplifies the driver
replacement logic while keeping all existing paths working.

Signed-off-by: Valentine Burley <valentine.burley@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/40010>
This commit is contained in:
Valentine Burley 2026-02-20 11:23:45 +01:00 • committed by Marge Bot
parent 9548bf86f4
commit d4cd93854a
2 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
.gitlab-ci/android-runner.sh
View file

@ -71,17 +71,10 @@ $ADB push "$INSTALL/lib/libEGL.so" /vendor/lib64/egl/libEGL_mesa.so
$ADB push "$INSTALL/lib/libGLESv1_CM.so" /vendor/lib64/egl/libGLESv1_CM_mesa.so
$ADB push "$INSTALL/lib/libGLESv2.so" /vendor/lib64/egl/libGLESv2_mesa.so
# Remove and replace Vulkan drivers:
# - For Cuttlefish virtual machines, replace lavapipe or venus
# - For Android hardware, replace the Vulkan driver specified by VK_DRIVER
if [ -n "${CUTTLEFISH_GPU_MODE:-}" ]; then
if [ "$CUTTLEFISH_GPU_MODE" = "mesa_swrast" ] || [ "$CUTTLEFISH_GPU_MODE" = "mesa_swrast_guest_angle" ]; then
$ADB shell rm -f /vendor/lib64/hw/vulkan.lvp.so*
$ADB push "$INSTALL/lib/libvulkan_lvp.so" /vendor/lib64/hw/vulkan.lvp.so
else
$ADB shell rm -f /vendor/lib64/hw/vulkan.virtio.so*
$ADB push "$INSTALL/lib/libvulkan_virtio.so" /vendor/lib64/hw/vulkan.virtio.so
fi
# Remove and replace Vulkan drivers
if [ "${CUTTLEFISH_GPU_MODE:-}" = "venus" ] || [ "${CUTTLEFISH_GPU_MODE:-}" = "venus_guest_angle" ]; then
$ADB shell rm -f /vendor/lib64/hw/vulkan.virtio.so*
$ADB push "$INSTALL/lib/libvulkan_virtio.so" /vendor/lib64/hw/vulkan.virtio.so
else
$ADB shell rm -f /vendor/lib64/hw/vulkan.${VK_DRIVER}.so*
$ADB push "$INSTALL/lib/libvulkan_${VK_DRIVER}.so" /vendor/lib64/hw/vulkan.${VK_DRIVER}.so

2
src/gallium/frontends/lavapipe/ci/gitlab-ci.yml
View file

@ -71,6 +71,7 @@ android-angle-lavapipe:
CUTTLEFISH_GPU_MODE: mesa_swrast_guest_angle
DEQP_SUITE: android-angle-lavapipe
GPU_VERSION: lvp-android-angle
VK_DRIVER: lvp
timeout: 15m
extends:
- .test-android
@ -81,6 +82,7 @@ android-angle-lavapipe-cts-full:
variables:
CUTTLEFISH_GPU_MODE: mesa_swrast_guest_angle
GPU_VERSION: lvp-android-angle
VK_DRIVER: lvp
timeout: 45m
extends:
- .test-android