make all shader files as a dependency to rebuild

CMakeLists.txt

@@ -7,6 +7,7 @@ include(cmake/SetCompilerSettings.cmake)
 include(cmake/SetupVulkan.cmake)
 include(cmake/Filter.cmake)
 include(cmake/AppleHelper.cmake)
+include(cmake/SetShaderDependency.cmake)
 
 set(DEPENDENCY_MIRROR_FILE "DependencyMirrors.txt" CACHE STRING "Dependency mirror")
 VarsFromFile("${DEPENDENCY_MIRROR_FILE}") # Load mirror list (for CICD)
@@ -79,33 +80,9 @@ if (WIN32)
 endif ()
 
 SetupVulkan(openVulkanoCpp)
-
+SetShaderDependency(openVulkanoCpp 
-set(SHADER_SRC_FOLDER ${CMAKE_CURRENT_SOURCE_DIR}/openVulkanoCpp/Shader)
+                    ${CMAKE_CURRENT_SOURCE_DIR}/openVulkanoCpp/Shader 
-set(SHADER_OUTPUT_FOLDER ${CMAKE_SOURCE_DIR}/openVulkanoCpp/GeneratedShaderData)
+                    ${CMAKE_SOURCE_DIR}/openVulkanoCpp/GeneratedShaderData)
-
-if (NOT EXISTS ${SHADER_OUTPUT_FOLDER})
-    file(MAKE_DIRECTORY ${SHADER_OUTPUT_FOLDER})
-endif ()
-
-file(GLOB SHADER_VERT_FILES ${SHADER_SRC_FOLDER}/*.vert)
-foreach(VERT_FILE ${SHADER_VERT_FILES})
-    get_filename_component(FILENAME ${VERT_FILE} NAME)
-    string(REGEX REPLACE "[.]vert" ".c" OUTPUT_C ${FILENAME})
-    string(REGEX REPLACE "[.]vert" ".h" OUTPUT_H ${FILENAME})
-    list(APPEND OUTPUT_HEADERS ${SHADER_OUTPUT_FOLDER}/${OUTPUT_H})
-    list(APPEND OUTPUT_SOURCES ${SHADER_OUTPUT_FOLDER}/${OUTPUT_C})
-endforeach()
-file(GLOB SHADER_FRAG_FILES ${SHADER_SRC_FOLDER}/*.frag)
-set(SHADER_SRC_FILES ${SHADER_VERT_FILES} ${SHADER_FRAG_FILES})
-set(SHADER_EXPECTED_OUTPUT ${OUTPUT_HEADERS} ${OUTPUT_SOURCES})
-
-add_custom_command(OUTPUT ${SHADER_EXPECTED_OUTPUT}
-                    COMMAND ${CMAKE_COMMAND} -DROOT_FOLDER=${CMAKE_SOURCE_DIR} -P ${CMAKE_SOURCE_DIR}/cmake/TryCompileShaders.cmake
-                    DEPENDS ${SHADER_SRC_FILES}
-                    COMMENT "Recompiling shaders")
-add_custom_target(RecompileShaders ALL
-                    DEPENDS ${SHADER_EXPECTED_OUTPUT})
-add_dependencies(openVulkanoCpp RecompileShaders)
 
 if (NOT ANDROID AND NOT IOS)
     target_link_libraries(openVulkanoCpp PRIVATE glfw pugixml)

Scripts/CompileShaders.sh

@@ -11,25 +11,41 @@ check_return_code() {
   fi
 }
 
-rm -f *.spv
+generate_general_shader_header() {
+  rm -f $GENERATED_DATA_PATH/GeneratedShaderData.h
+  touch $GENERATED_DATA_PATH/GeneratedShaderData.h
+}
 
-for f in $SHADER_PATH/*.vert ; do
+rm -f *.spv
-  filename=$(basename -- "$f")
+rm -f $GENERATED_DATA_PATH/*.h $GENERATED_DATA_PATH/*.c
-  filename_no_ext="${filename%.*}"
+
-  filename_no_ext_first_upper="${filename_no_ext^}"
+generate_general_shader_header
-  
+echo "// Auto generated file" >> $GENERATED_DATA_PATH/GeneratedShaderData.h
-  glslang -V $f -o $filename_no_ext.vert.spv
+sed -i "$ a #ifndef GeneratedShaderData_H_INCLUDED\n#define GeneratedShaderData_H_INCLUDED\n" $GENERATED_DATA_PATH/GeneratedShaderData.h
-  check_return_code
+sed -i "$ a extern \"C\" {" $GENERATED_DATA_PATH/GeneratedShaderData.h
-  glslang -V $SHADER_PATH/$filename_no_ext.frag -o $filename_no_ext.frag.spv
+
-  check_return_code
+# put data from all files with same name into single file
-  rm $GENERATED_DATA_PATH/$filename_no_ext.h $GENERATED_DATA_PATH/$filename_no_ext.c
+unique_file_names=($(find $SHADER_PATH/ -type f ! -name '*.hpp' ! -name '*.cpp' | awk -F/ '{print $NF}' | awk -F. '{print $1}' | sort | uniq -d))
-  bin2c -t -d $GENERATED_DATA_PATH/$filename_no_ext.h -o $GENERATED_DATA_PATH/$filename_no_ext.c $filename_no_ext.vert.spv $filename_no_ext.frag.spv
+for unique_name in ${unique_file_names[@]} ; do
-  check_return_code
+    same_files=$(find $SHADER_PATH/ -type f -name "${unique_name}.*")
-  sed -i 's/char \*entryName/const char *entryName/' $GENERATED_DATA_PATH/$filename_no_ext.h
+    for same_file in ${same_files[@]} ; do
-  sed -i 's/const char \*data/const unsigned char *data/' $GENERATED_DATA_PATH/$filename_no_ext.h
+        filename_with_ext_no_path=$(basename -- "$same_file")
-  # avoid ODR violation
+        glslang -V $same_file -o $filename_with_ext_no_path.spv
-  sed -i "s/fileTable/fileTable${filename_no_ext_first_upper}/" $GENERATED_DATA_PATH/$filename_no_ext.h $GENERATED_DATA_PATH/$filename_no_ext.c
+        check_return_code
-  sed -i "s/typedef struct {/#ifndef TFileTableEntry_H_INCLUDED\n#define TFileTableEntry_H_INCLUDED\ntypedef struct {/" $GENERATED_DATA_PATH/$filename_no_ext.h
+    done
-  sed -i "s/} TFileTableEntry;/} TFileTableEntry;\n#endif \/*TFileTableEntry_H_INCLUDED*\//" $GENERATED_DATA_PATH/$filename_no_ext.h
+    
-  rm *.spv
+    bin2c -t -d $GENERATED_DATA_PATH/$unique_name.h -o $GENERATED_DATA_PATH/$unique_name.c *.spv
+    check_return_code
+    sed -i "$ a #include \"${unique_name}.h\"" $GENERATED_DATA_PATH/GeneratedShaderData.h
+    rm *.spv
+    
+    filename_no_ext_first_upper="${unique_name^}"
+    sed -i 's/char \*entryName/const char *entryName/' $GENERATED_DATA_PATH/$unique_name.h
+    sed -i 's/const char \*data/const unsigned char *data/' $GENERATED_DATA_PATH/$unique_name.h
+    # avoid ODR violation
+    sed -i "s/fileTable/fileTable${filename_no_ext_first_upper}/" $GENERATED_DATA_PATH/$unique_name.h $GENERATED_DATA_PATH/$unique_name.c
+    sed -i "s/typedef struct {/#ifndef TFileTableEntry_H_INCLUDED\n#define TFileTableEntry_H_INCLUDED\ntypedef struct {/" $GENERATED_DATA_PATH/$unique_name.h
+    sed -i "s/} TFileTableEntry;/} TFileTableEntry;\n#endif \/*TFileTableEntry_H_INCLUDED*\//" $GENERATED_DATA_PATH/$unique_name.h
 done
+
+sed -i "$ a }\n#endif \/*GeneratedShaderData_H_INCLUDED*\/" $GENERATED_DATA_PATH/GeneratedShaderData.h

cmake/SetShaderDependency.cmake

@@ -0,0 +1,24 @@
+function(SetShaderDependency TARGET SHADER_SRC_FOLDER SHADER_OUTPUT_FOLDER)
+    if (NOT EXISTS ${SHADER_OUTPUT_FOLDER})
+        file(MAKE_DIRECTORY ${SHADER_OUTPUT_FOLDER})
+    endif ()
+
+    file(GLOB SHADER_SRC_FILES ${SHADER_SRC_FOLDER}/*)
+    list(FILTER SHADER_SRC_FILES EXCLUDE REGEX ".*\\.(hpp|cpp)$")
+    foreach(SHADER_FILE ${SHADER_SRC_FILES})
+        get_filename_component(FILENAME ${SHADER_FILE} NAME_WLE)
+        if (NOT ${FILENAME} IN_LIST OUTPUT_HEADERS)
+            list(APPEND OUTPUT_HEADERS ${SHADER_OUTPUT_FOLDER}/${FILENAME}.h)
+            list(APPEND OUTPUT_SOURCES ${SHADER_OUTPUT_FOLDER}/${FILENAME}.c)
+        endif()
+    endforeach()
+    set(SHADER_EXPECTED_OUTPUT ${OUTPUT_HEADERS} ${OUTPUT_SOURCES})
+
+    add_custom_command(OUTPUT ${SHADER_EXPECTED_OUTPUT}
+                        COMMAND ${CMAKE_COMMAND} -DROOT_FOLDER=${CMAKE_SOURCE_DIR} -P ${CMAKE_SOURCE_DIR}/cmake/TryCompileShaders.cmake
+                        DEPENDS ${SHADER_SRC_FILES}
+                        COMMENT "Recompiling shaders")
+    add_custom_target(RecompileShaders ALL
+                        DEPENDS ${SHADER_EXPECTED_OUTPUT})
+    add_dependencies(${TARGET} RecompileShaders)
+endfunction(SetShaderDependency)

openVulkanoCpp/Shader/ShaderRegistry.cpp

@@ -8,9 +8,7 @@
 
 extern "C"
 {
-#include "GeneratedShaderData/background.h"
+#include "GeneratedShaderData/GeneratedShaderData.h"
-#include "GeneratedShaderData/basic.h"
-#include "GeneratedShaderData/grid.h"
 }
 
 namespace OpenVulkano