Module: Mesa Branch: main Commit: 515ea48523776554a9c66f817be47fd4d76745b5 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=515ea48523776554a9c66f817be47fd4d76745b5
Author: Eric Engestrom <[email protected]> Date: Mon Feb 6 18:42:27 2023 +0000 ci/android: move virgl-specific gpu_mode to virgl-defined variables Signed-off-by: Eric Engestrom <[email protected]> Reviewed-by: Helen Koike <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21157> --- .gitlab-ci/cuttlefish-runner.sh | 2 +- src/gallium/drivers/virgl/ci/gitlab-ci.yml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci/cuttlefish-runner.sh b/.gitlab-ci/cuttlefish-runner.sh index d74579c1a5a..457bd586f25 100755 --- a/.gitlab-ci/cuttlefish-runner.sh +++ b/.gitlab-ci/cuttlefish-runner.sh @@ -15,7 +15,7 @@ chown root.kvm /dev/kvm cd /cuttlefish -launch_cvd --verbosity=DEBUG --report_anonymous_usage_stats=n --cpus=8 --memory_mb=8192 --gpu_mode=drm_virgl --daemon --enable_minimal_mode=true --guest_enforce_security=false --use_overlay=false +launch_cvd --verbosity=DEBUG --report_anonymous_usage_stats=n --cpus=8 --memory_mb=8192 --gpu_mode="$ANDROID_GPU_MODE" --daemon --enable_minimal_mode=true --guest_enforce_security=false --use_overlay=false sleep 1 cd - diff --git a/src/gallium/drivers/virgl/ci/gitlab-ci.yml b/src/gallium/drivers/virgl/ci/gitlab-ci.yml index dd032f03dac..4c095105258 100644 --- a/src/gallium/drivers/virgl/ci/gitlab-ci.yml +++ b/src/gallium/drivers/virgl/ci/gitlab-ci.yml @@ -109,3 +109,5 @@ android-virgl-llvmpipe: extends: - .test-android - .virgl-rules + variables: + ANDROID_GPU_MODE: drm_virgl
