Merge pull request #1242 from UniStuttgart-VISUS/glslang

Fix glslang binary name deprecation
UniStuttgart-VISUS · Jan 11, 2024 · fe3c0b0 · fe3c0b0
2 parents 754d62d + 2939514
commit fe3c0b0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.ci/check_shaders.sh b/.ci/check_shaders.sh
@@ -60,10 +60,10 @@ for sdir in "${SHADER_DIRS[@]}"; do
     LOCAL_INCLUDE_PATHS=("-I$(pwd)/$(dirname "$sfile")")
 
     glslang_exit_code=0
-    output="$(glslangValidator -l "${INCLUDE_PATHS[@]}" --p "#extension GL_GOOGLE_include_directive : require" "${LOCAL_INCLUDE_PATHS[@]}" $sfile)" || glslang_exit_code=$?
+    output="$(glslang -l "${INCLUDE_PATHS[@]}" --p "#extension GL_GOOGLE_include_directive : require" "${LOCAL_INCLUDE_PATHS[@]}" $sfile)" || glslang_exit_code=$?
     if [[ $glslang_exit_code -ne 0 ]]; then
       echo ""
-      echo "::error::########## glslangValidator found issues in $sfile ##########"
+      echo "::error::########## glslang found issues in $sfile ##########"
       echo "$output"
       EXIT_CODE=1
     fi

diff --git a/.github/workflows/shader_check.yml b/.github/workflows/shader_check.yml
@@ -16,7 +16,7 @@ jobs:
         run: |
           mkdir bin
           wget "https://github.com/KhronosGroup/glslang/releases/download/main-tot/glslang-main-linux-Release.zip"
-          unzip -j "glslang-main-linux-Release.zip" "bin/glslangValidator" -d ./bin
+          unzip -j "glslang-main-linux-Release.zip" "bin/glslang" -d ./bin
           rm "glslang-main-linux-Release.zip"
           echo "./bin" >> $GITHUB_PATH
       - name: Run shader check