change glslangValidator to glslang (became a symlink at some point an…

…d now seems to get dropped)
crocdialer · Apr 6, 2024 · 6894d93 · 6894d93
1 parent 171aff5
commit 6894d93
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/cmake_modules/build_shaders.cmake b/cmake_modules/build_shaders.cmake
@@ -18,6 +18,6 @@ if (NOT DEFINED SOURCE_OUTPUT_DIR)
 endif ()
 
 # set glsl-compiler
-find_program(GLSLANG_VALIDATOR "glslangValidator" REQUIRED)
+find_program(SHADER_COMPILER "glslang" REQUIRED)
 
-stringify_shaders(${SHADER_SOURCE_ROOT} ${TARGET_NAME} ${GLSLANG_VALIDATOR} ${SPIRV_OUTPUT_DIR} ${SOURCE_OUTPUT_DIR})
+stringify_shaders(${SHADER_SOURCE_ROOT} ${TARGET_NAME} ${SHADER_COMPILER} ${SPIRV_OUTPUT_DIR} ${SOURCE_OUTPUT_DIR})
diff --git a/cmake_modules/vierkant_utils.cmake b/cmake_modules/vierkant_utils.cmake
@@ -50,7 +50,7 @@ function(GET_SHADER_SOURCES RESULT GLSL_FOLDER)
     set(${RESULT} ${GLSL_SOURCE_FILES} PARENT_SCOPE)
 endfunction(GET_SHADER_SOURCES)
 
-function(STRINGIFY_SHADERS GLSL_FOLDER TARGET_NAME GLSL_VALIDATOR SPIRV_OUT_DIR SOURCE_OUT_DIR)
+function(STRINGIFY_SHADERS GLSL_FOLDER TARGET_NAME SHADER_COMPILER SPIRV_OUT_DIR SOURCE_OUT_DIR)
 
     # NOTE: seeing some issues with spirv-reflect/local-sizes between 1.2<->1.3
     set(SPIRV_TARGET_ENV vulkan1.2)
@@ -112,15 +112,15 @@ function(STRINGIFY_SHADERS GLSL_FOLDER TARGET_NAME GLSL_VALIDATOR SPIRV_OUT_DIR
 
             execute_process(
                     COMMAND ${CMAKE_COMMAND} -E make_directory "${SPIRV_OUT_DIR}/shaders/"
-                    COMMAND ${GLSL_VALIDATOR} --target-env ${SPIRV_TARGET_ENV} ${GLSL} -o ${SPIRV}
-                    OUTPUT_VARIABLE glslangvalidator_std_out
-                    ERROR_VARIABLE glslangvalidator_std_err
+                    COMMAND ${SHADER_COMPILER} --target-env ${SPIRV_TARGET_ENV} ${GLSL} -o ${SPIRV}
+                    OUTPUT_VARIABLE glslang_std_out
+                    ERROR_VARIABLE glslang_std_err
                     RESULT_VARIABLE ret
                     #                OUTPUT_QUIET
             )
 
             if (NOT "${ret}" STREQUAL "0")
-                message(WARNING "Failed to compile shader: ${glslangvalidator_std_out}")
+                message(WARNING "Failed to compile shader: ${glslang_std_out}")
             endif ()
 
             # read spirv binary