diff options
author | Hans-Kristian Arntzen <post@arntzen-software.no> | 2019-04-12 15:44:24 +0300 |
---|---|---|
committer | Hans-Kristian Arntzen <post@arntzen-software.no> | 2019-04-12 15:56:10 +0300 |
commit | 3a7cb0c2a939613e56c327de29b3029e6da29265 (patch) | |
tree | 37d692d3044cd0e871f0bf832b621fc5d1f49bf6 /update_test_shaders.sh | |
parent | 7a87701ebe1cac594e9aea1397e479778af9ab02 (diff) |
Support running {,update_}test_shader.sh with CMake builds.
Make path to spirv-cross configurable so we can be a bit more flexible
with build systems used to update tests.
Diffstat (limited to 'update_test_shaders.sh')
-rwxr-xr-x | update_test_shaders.sh | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/update_test_shaders.sh b/update_test_shaders.sh index 2fb5ffa4..c33afc5c 100755 --- a/update_test_shaders.sh +++ b/update_test_shaders.sh @@ -1,21 +1,25 @@ #!/bin/bash -echo "Building spirv-cross" -make -j$(nproc) +if [ -z "$SPIRV_CROSS_PATH" ]; then + echo "Building spirv-cross" + make -j$(nproc) + SPIRV_CROSS_PATH="./spirv-cross" +fi export PATH="./external/glslang-build/output/bin:./external/spirv-tools-build/output/bin:.:$PATH" echo "Using glslangValidation in: $(which glslangValidator)." echo "Using spirv-opt in: $(which spirv-opt)." +echo "Using SPIRV-Cross in: \"$SPIRV_CROSS_PATH\"." -./test_shaders.py shaders --update || exit 1 -./test_shaders.py shaders --update --opt || exit 1 -./test_shaders.py shaders-no-opt --update || exit 1 -./test_shaders.py shaders-msl --update --msl || exit 1 -./test_shaders.py shaders-msl --update --msl --opt || exit 1 -./test_shaders.py shaders-msl-no-opt --update --msl || exit 1 -./test_shaders.py shaders-hlsl --update --hlsl || exit 1 -./test_shaders.py shaders-hlsl --update --hlsl --opt || exit 1 -./test_shaders.py shaders-hlsl-no-opt --update --hlsl || exit 1 -./test_shaders.py shaders-reflection --reflect --update || exit 1 +./test_shaders.py shaders --update --spirv-cross "$SPIRV_CROSS_PATH" || exit 1 +./test_shaders.py shaders --update --opt --spirv-cross "$SPIRV_CROSS_PATH" || exit 1 +./test_shaders.py shaders-no-opt --update --spirv-cross "$SPIRV_CROSS_PATH" || exit 1 +./test_shaders.py shaders-msl --update --msl --spirv-cross "$SPIRV_CROSS_PATH" || exit 1 +./test_shaders.py shaders-msl --update --msl --opt --spirv-cross "$SPIRV_CROSS_PATH" || exit 1 +./test_shaders.py shaders-msl-no-opt --update --msl --spirv-cross "$SPIRV_CROSS_PATH" || exit 1 +./test_shaders.py shaders-hlsl --update --hlsl --spirv-cross "$SPIRV_CROSS_PATH" || exit 1 +./test_shaders.py shaders-hlsl --update --hlsl --opt --spirv-cross "$SPIRV_CROSS_PATH" || exit 1 +./test_shaders.py shaders-hlsl-no-opt --update --hlsl --spirv-cross "$SPIRV_CROSS_PATH" || exit 1 +./test_shaders.py shaders-reflection --reflect --update --spirv-cross "$SPIRV_CROSS_PATH" || exit 1 |