diff options
| author | Cristian Ciocaltea <cristian.ciocaltea@collabora.com> | 2022-03-03 13:43:54 +0200 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2022-03-22 17:01:09 +0000 |
| commit | 8726ea34d337b5657457df56fa3bf495aed82a4f (patch) | |
| tree | d3f643e37c194d87ac96e43f643c071ca407c7aa /.gitlab-ci | |
| parent | 356c9c25c399f25f1ecd1e531bbb73d87b2e7f09 (diff) | |
ci: Dynamically adjust LIBGL_ALWAYS_SOFTWARE for crosvm
For an increased flexibility in operation, do not set
'CROSVM_LIBGL_ALWAYS_SOFTWARE=true' when *not* using llvmpipe
Gallium driver.
Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
Reviewed-by: Guilherme Gallo <guilherme.gallo@collabora.com>
Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15208>
Diffstat (limited to '.gitlab-ci')
| -rwxr-xr-x | .gitlab-ci/crosvm-runner.sh | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/.gitlab-ci/crosvm-runner.sh b/.gitlab-ci/crosvm-runner.sh index 636ab928559..82cc37fb18e 100755 --- a/.gitlab-ci/crosvm-runner.sh +++ b/.gitlab-ci/crosvm-runner.sh @@ -82,10 +82,15 @@ unset XDG_RUNTIME_DIR CROSVM_KERN_ARGS="quiet console=null root=my_root rw rootfstype=virtiofs ip=192.168.30.2::192.168.30.1:255.255.255.0:crosvm:eth0" CROSVM_KERN_ARGS="${CROSVM_KERN_ARGS} init=${SCRIPT_DIR}/crosvm-init.sh -- ${VSOCK_STDOUT} ${VSOCK_STDERR} ${VSOCK_TEMP_DIR}" +[ "${CROSVM_GALLIUM_DRIVER}" = "llvmpipe" ] && \ + CROSVM_LIBGL_ALWAYS_SOFTWARE=true || CROSVM_LIBGL_ALWAYS_SOFTWARE=false + set +e -x -# We aren't testing LLVMPipe here, so we don't need to validate NIR on the host -NIR_DEBUG="novalidate" LIBGL_ALWAYS_SOFTWARE="true" GALLIUM_DRIVER=${CROSVM_GALLIUM_DRIVER} \ +# We aren't testing the host driver here, so we don't need to validate NIR on the host +NIR_DEBUG="novalidate" \ +LIBGL_ALWAYS_SOFTWARE=${CROSVM_LIBGL_ALWAYS_SOFTWARE} \ +GALLIUM_DRIVER=${CROSVM_GALLIUM_DRIVER} \ crosvm run \ --gpu "${CROSVM_GPU_ARGS}" -m 4096 -c 2 --disable-sandbox \ --shared-dir /:my_root:type=fs:writeback=true:timeout=60:cache=always \ |