diff options
| author | Kae <80987908+Novaenia@users.noreply.github.com> | 2025-05-10 07:50:52 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-05-10 07:50:52 +1000 |
| commit | 93a8e3213287a1aab47a0a1e36925fc679f12f1d (patch) | |
| tree | d2cfd7f5206f42ac5c187594614f0d9fedad3f40 | |
| parent | 3a54621bd8a55b672ba986f02ab094bfb4ba6faf (diff) | |
| parent | bbc6ae61ac412874acd099717189dec43520a9ba (diff) | |
Merge pull request #235 from grbr404/main
rewrote zink support check and added vulkan support check
| -rwxr-xr-x | scripts/ci/linux/run-client.sh | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/scripts/ci/linux/run-client.sh b/scripts/ci/linux/run-client.sh index 6faf5e7..29ed124 100755 --- a/scripts/ci/linux/run-client.sh +++ b/scripts/ci/linux/run-client.sh @@ -1,11 +1,16 @@ #!/bin/sh -# Check for Zink support -if MESA_LOADER_DRIVER_OVERRIDE=zink glxinfo | grep -q 'renderer string.*zink'; then - # Set environment variables for Zink - export __GLX_VENDOR_LIBRARY_NAME=mesa - export MESA_LOADER_DRIVER_OVERRIDE=zink - export GALLIUM_DRIVER=zink +# Check if environment variables are already set +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 cd "`dirname \"$0\"`" |