diff --git a/CMakeLists.txt b/CMakeLists.txt index 4e5e9a8..6de6b78 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,6 +30,15 @@ if(NOT IOS) endif() SetOptimisationSettings() +set(BASH_EXECUTABLE "" CACHE FILEPATH "Path to bash executable") +if ("${BASH_EXECUTABLE}" STREQUAL "") + find_program(BASH_PROGRAM bash NO_CACHE REQUIRED) + set(BASH_EXECUTABLE ${BASH_PROGRAM} CACHE FILEPATH "Path to bash executable" FORCE) +endif() +set(ROOT_FOLDER ${CMAKE_CURRENT_SOURCE_DIR}) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/TryCompileShaders.cmake.in ${CMAKE_BINARY_DIR}/TryCompileShaders.cmake @ONLY) +execute_process(COMMAND ${BASH_EXECUTABLE} CompileShaders.sh WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Scripts) + if(IOS) set(CMAKE_Swift_LANGUAGE_VERSION 5.0) enable_language(Swift) @@ -80,15 +89,6 @@ if (WIN32) endif () SetupVulkan(openVulkanoCpp) - -set(BASH_EXECUTABLE "" CACHE FILEPATH "Path to bash executable") -if ("${BASH_EXECUTABLE}" STREQUAL "") - find_program(BASH_PROGRAM bash NO_CACHE REQUIRED) - set(BASH_EXECUTABLE ${BASH_PROGRAM} CACHE FILEPATH "Path to bash executable" FORCE) -endif() -set(ROOT_FOLDER ${CMAKE_CURRENT_SOURCE_DIR}) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/TryCompileShaders.cmake.in ${CMAKE_BINARY_DIR}/TryCompileShaders.cmake @ONLY) -execute_process(COMMAND ${BASH_EXECUTABLE} CompileShaders.sh WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Scripts) SetShaderDependency(openVulkanoCpp ${CMAKE_CURRENT_SOURCE_DIR}/openVulkanoCpp/Shader ${CMAKE_CURRENT_SOURCE_DIR}/openVulkanoCpp/GeneratedShaderData) diff --git a/Scripts/CompileShaders.sh b/Scripts/CompileShaders.sh index db33bbb..47f4cd7 100755 --- a/Scripts/CompileShaders.sh +++ b/Scripts/CompileShaders.sh @@ -19,19 +19,24 @@ check_return_code() { } rm -f *.spv -rm "$GENERATED_DATA_PATH"/* +rm -f "$GENERATED_DATA_PATH"/* touch "$GENERATED_DATA_PATH"/GeneratedShaderData.h +touch "$GENERATED_DATA_PATH"/GeneratedShaderData.c echo "// Auto generated file" >> "$GENERATED_DATA_PATH"/GeneratedShaderData.h -echo -e "#ifndef GeneratedShaderData_H_INCLUDED\n#define GeneratedShaderData_H_INCLUDED\n" >> "$GENERATED_DATA_PATH"/GeneratedShaderData.h -echo -e "extern \"C\" {\n" >> "$GENERATED_DATA_PATH"/GeneratedShaderData.h +echo -e "#ifndef GeneratedShaderData_H_INCLUDED\n#define GeneratedShaderData_H_INCLUDED" >> "$GENERATED_DATA_PATH"/GeneratedShaderData.h +#echo -e "extern \"C\" {" >> "$GENERATED_DATA_PATH"/GeneratedShaderData.h +echo -e "#include \"GeneratedShaderData.h\"" >> "$GENERATED_DATA_PATH"/GeneratedShaderData.c # put data from all files with same name into single file unique_file_names=($(find $SHADER_PATH/ -type f ! -name '*.hpp' ! -name '*.cpp' | awk -F/ '{print $NF}' | awk -F. '{print $1}' | sort | uniq)) -entriesCount="\nconst unsigned int entriesCount[] = {" -entries="const TFileTableEntry* entries[] = {" len=${#unique_file_names[@]} i=0 +entriesCountDef="\nconst unsigned int* entriesCount[${len}] = {" +entriesDef="const void* entries[${len}] = {" +entriesCountDecl="extern const unsigned int* entriesCount[${len}];" +entriesDecl="extern const void* entries[${len}];" +globalDefinitions="" for unique_name in ${unique_file_names[@]} ; do same_files=$(find $SHADER_PATH/ -type f -name "${unique_name}.*") for same_file in ${same_files[@]} ; do @@ -42,16 +47,18 @@ for unique_name in ${unique_file_names[@]} ; do 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 + echo -e "#include \"${unique_name}.h\"" >> "$GENERATED_DATA_PATH"/GeneratedShaderData.c filename_no_ext_first_upper="${unique_name^}" - entriesCount+="fileTable${filename_no_ext_first_upper}Size" - entries+="fileTable${filename_no_ext_first_upper}" + entriesCountDef+="&fileTable${filename_no_ext_first_upper}Size" + entriesDef+="fileTable${filename_no_ext_first_upper}" + globalDefinitions+="const unsigned int fileTable${filename_no_ext_first_upper}Size;\n" + globalDefinitions+="const TFileTableEntry fileTable${filename_no_ext_first_upper}[];\n" if [ $i -ne $((len-1)) ]; then - entriesCount+=",\n\t\t" - entries+=",\n\t\t" + entriesCountDef+=",\n\t\t" + entriesDef+=",\n\t\t" fi sed -i "3s/.*/#include \"${unique_name}.h\"/" "$GENERATED_DATA_PATH"/$unique_name.c @@ -64,8 +71,7 @@ for unique_name in ${unique_file_names[@]} ; do ((i++)) done -entriesCount+=" };" -entries+=" };" -echo -e $entriesCount >> "$GENERATED_DATA_PATH"/GeneratedShaderData.h -echo -e $entries >> "$GENERATED_DATA_PATH"/GeneratedShaderData.h -echo -e "}\n#endif /*GeneratedShaderData_H_INCLUDED*/" >> "$GENERATED_DATA_PATH"/GeneratedShaderData.h +entriesCountDef+=" };" +entriesDef+=" };" +echo -e "${entriesCountDecl}\n${entriesDecl}\\n#endif /*GeneratedShaderData_H_INCLUDED*/" >> "$GENERATED_DATA_PATH"/GeneratedShaderData.h +echo -e "\n${globalDefinitions}${entriesCountDef}\n${entriesDef}" >> "$GENERATED_DATA_PATH"/GeneratedShaderData.c diff --git a/openVulkanoCpp/Shader/ShaderRegistry.cpp b/openVulkanoCpp/Shader/ShaderRegistry.cpp index 479c1ea..0438f30 100644 --- a/openVulkanoCpp/Shader/ShaderRegistry.cpp +++ b/openVulkanoCpp/Shader/ShaderRegistry.cpp @@ -26,7 +26,7 @@ namespace OpenVulkano const unsigned int sz = std::size(entriesCount); for (unsigned int i = 0; i < sz; i++) { - RegisterShaderTable(reinterpret_cast(entries[i]), entriesCount[i]); + RegisterShaderTable(reinterpret_cast(entries[i]), *entriesCount[i]); } }