diff options
Diffstat (limited to 'scripts/ci')
| -rwxr-xr-x | scripts/ci/linux/run-client.sh | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/scripts/ci/linux/run-client.sh b/scripts/ci/linux/run-client.sh index ad031f5..8bf54a5 100755 --- a/scripts/ci/linux/run-client.sh +++ b/scripts/ci/linux/run-client.sh @@ -1,11 +1,15 @@ #!/bin/sh -# Check for Vulkan support -if command -v vulkaninfo &> /dev/null; then - # Check for Zink support - if __GLX_VENDOR_LIBRARY_NAME=mesa MESA_LOADER_DRIVER_OVERRIDE=zink GALLIUM_DRIVER=zink glxinfo | grep -q 'renderer string: zink'; then - # Set environment variables for Zink - export __GLX_VENDOR_LIBRARY_NAME=mesa MESA_LOADER_DRIVER_OVERRIDE=zink GALLIUM_DRIVER=zink +# Check if environment variables are already used by user +if [ -n "${__GLX_VENDOR_LIBRARY_NAME}" ] || [ -n "${MESA_LOADER_DRIVER_OVERRIDE}" ] || [ -n "${GALLIUM_DRIVER}" ]; then : +else + # Check for Vulkan support + if command -v vulkaninfo &> /dev/null; then + # Check for Zink support + if __GLX_VENDOR_LIBRARY_NAME=mesa MESA_LOADER_DRIVER_OVERRIDE=zink GALLIUM_DRIVER=zink glxinfo | grep -q 'renderer string: zink'; then + # Set environment variables for Zink + export __GLX_VENDOR_LIBRARY_NAME=mesa MESA_LOADER_DRIVER_OVERRIDE=zink GALLIUM_DRIVER=zink + fi fi fi |