From 69f07f09f9aad8fff535f3cdf9da8fb173dff775 Mon Sep 17 00:00:00 2001 From: ohyzha Date: Mon, 23 Sep 2024 15:59:23 +0300 Subject: [PATCH] fix issues when openvulkano is linked as library --- CMakeLists.txt | 2 +- Scripts/CompileShaders.sh | 33 ++++++++++++++--------- cmake/TryCompileShaders.cmake.in | 4 +-- cmake/functions/SetShaderDependency.cmake | 11 ++++---- openVulkanoCpp/CMakeLists.txt | 12 ++++++--- openVulkanoCpp/Shader/ShaderRegistry.cpp | 8 +++--- 6 files changed, 41 insertions(+), 29 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 61ae9c3..ea20eff 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,7 +15,7 @@ if(LINUX) find_package(ECM REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) endif() -set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules" "${CMAKE_SOURCE_DIR}/cmake/functions") +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" "${CMAKE_CURRENT_SOURCE_DIR}/cmake/functions") include(VarsFromFile) include(SetCompilerSettings) diff --git a/Scripts/CompileShaders.sh b/Scripts/CompileShaders.sh index e613447..575913c 100755 --- a/Scripts/CompileShaders.sh +++ b/Scripts/CompileShaders.sh @@ -11,12 +11,19 @@ fi SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) GENERATED_DATA_PATH="$1" -SHADER_PATH="$(dirname "$SCRIPT_DIR")/openVulkanoCpp/Shader" +SHADER_PATH="$2" +UNIQUE_ENTRY_NAME="$3" + +HEADER_PATH="$1"/"GeneratedShaderData_${3}.h" +C_PATH="$1"/"GeneratedShaderData_${3}.c" +HEADER_GUARD="GeneratedShaderData_${UNIQUE_ENTRY_NAME}_H_INCLUDED" if [[ "$OSTYPE" == "msys" || "$OSTYPE" == "cygwin" ]]; then SCRIPT_DIR=$(cygpath -w "$SCRIPT_DIR") GENERATED_DATA_PATH=$(cygpath -w "$GENERATED_DATA_PATH") SHADER_PATH=$(cygpath -w "$SHADER_PATH") + HEADER_PATH=$(cygpath -w "$HEADER_PATH") + C_PATH=$(cygpath -w "$C_PATH") fi check_return_code() { @@ -29,21 +36,21 @@ check_return_code() { mkdir -p "$GENERATED_DATA_PATH" rm -f "$GENERATED_DATA_PATH/*.spv" -touch "$GENERATED_DATA_PATH"/GeneratedShaderData.h -touch "$GENERATED_DATA_PATH"/GeneratedShaderData.c +touch "$HEADER_PATH" +touch "$C_PATH" -echo "// Auto generated file" > "$GENERATED_DATA_PATH"/GeneratedShaderData.h -echo -e "#ifndef GeneratedShaderData_H_INCLUDED\n#define GeneratedShaderData_H_INCLUDED" >> "$GENERATED_DATA_PATH"/GeneratedShaderData.h -echo -e "#include \"GeneratedShaderData.h\"" > "$GENERATED_DATA_PATH"/GeneratedShaderData.c +echo "// Auto generated file" > "$HEADER_PATH" +echo -e "#ifndef ${HEADER_GUARD}\n#define ${HEADER_GUARD}" >> "$HEADER_PATH" +echo -e "#include \"GeneratedShaderData_${UNIQUE_ENTRY_NAME}.h\"" > "$C_PATH" # 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)) 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}];" +entriesCountDef="\nconst unsigned int* entriesCount${UNIQUE_ENTRY_NAME}[${len}] = {" +entriesDef="const void* entries${UNIQUE_ENTRY_NAME}[${len}] = {" +entriesCountDecl="extern const unsigned int* entriesCount${UNIQUE_ENTRY_NAME}[${len}];" +entriesDecl="extern const void* entries${UNIQUE_ENTRY_NAME}[${len}];" 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 @@ -56,7 +63,7 @@ for unique_name in ${unique_file_names[@]} ; do check_return_code rm "$GENERATED_DATA_PATH"/*.spv - echo -e "#include \"${unique_name}.h\"" >> "$GENERATED_DATA_PATH"/GeneratedShaderData.c + echo -e "#include \"${unique_name}.h\"" >> "$C_PATH" filename_no_ext_first_upper=$(echo $unique_name | awk '{print toupper(substr($0,1,1))substr($0,2)}') entriesCountDef+="&fileTable${filename_no_ext_first_upper}Size" entriesDef+="fileTable${filename_no_ext_first_upper}" @@ -78,5 +85,5 @@ done entriesCountDef+=" };" entriesDef+=" };" -echo -e "${entriesCountDecl}\n${entriesDecl}\\n#endif /*GeneratedShaderData_H_INCLUDED*/" >> "$GENERATED_DATA_PATH"/GeneratedShaderData.h -echo -e "\n${entriesCountDef}\n${entriesDef}" >> "$GENERATED_DATA_PATH"/GeneratedShaderData.c +echo -e "${entriesCountDecl}\n${entriesDecl}\\n#endif /*${HEADER_GUARD}*/" >> "$HEADER_PATH" +echo -e "\n${entriesCountDef}\n${entriesDef}" >> "$C_PATH" diff --git a/cmake/TryCompileShaders.cmake.in b/cmake/TryCompileShaders.cmake.in index e294456..efa5711 100644 --- a/cmake/TryCompileShaders.cmake.in +++ b/cmake/TryCompileShaders.cmake.in @@ -1,5 +1,5 @@ -execute_process(COMMAND "@BASH_EXECUTABLE@" CompileShaders.sh "@SHADER_OUTPUT_DEST@" - WORKING_DIRECTORY "@ROOT_FOLDER@/Scripts" +execute_process(COMMAND "@BASH_EXECUTABLE@" CompileShaders.sh "@SHADER_OUTPUT_DEST@" "@SHADER_FILES_LOCATION@" "@UNIQUE_ENTRY_NAME@" + WORKING_DIRECTORY "@SCRIPT_FOLDER@" RESULT_VARIABLE res_var) if(NOT "${res_var}" STREQUAL "0") message(FATAL_ERROR "Failed to recompile shaders") diff --git a/cmake/functions/SetShaderDependency.cmake b/cmake/functions/SetShaderDependency.cmake index f5b3c22..50c5ecd 100644 --- a/cmake/functions/SetShaderDependency.cmake +++ b/cmake/functions/SetShaderDependency.cmake @@ -14,12 +14,13 @@ function(SetShaderDependency TARGET SHADER_SRC_FOLDER SHADER_OUTPUT_FOLDER) endif() endforeach() set(SHADER_EXPECTED_OUTPUT ${OUTPUT_HEADERS} ${OUTPUT_SOURCES}) - + add_custom_command(OUTPUT ${SHADER_EXPECTED_OUTPUT} - COMMAND ${CMAKE_COMMAND} -P ${CMAKE_BINARY_DIR}/TryCompileShaders.cmake + COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/TryCompileShaders.cmake DEPENDS ${SHADER_SRC_FILES} - COMMENT "Recompiling shaders") - add_custom_target(RecompileShaders ALL + COMMENT "Recompiling shaders" + VERBATIM) + add_custom_target("RecompileShaders_${TARGET}" ALL DEPENDS ${SHADER_EXPECTED_OUTPUT}) - add_dependencies(${TARGET} RecompileShaders) + add_dependencies(${TARGET} "RecompileShaders_${TARGET}") endfunction(SetShaderDependency) \ No newline at end of file diff --git a/openVulkanoCpp/CMakeLists.txt b/openVulkanoCpp/CMakeLists.txt index 95896f7..d019594 100644 --- a/openVulkanoCpp/CMakeLists.txt +++ b/openVulkanoCpp/CMakeLists.txt @@ -6,10 +6,14 @@ 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_SOURCE_DIR}) -set(SHADER_OUTPUT_DEST ${CMAKE_BINARY_DIR}/GeneratedShaderData) -configure_file(${CMAKE_SOURCE_DIR}/cmake/TryCompileShaders.cmake.in ${CMAKE_BINARY_DIR}/TryCompileShaders.cmake @ONLY) -execute_process(COMMAND ${BASH_EXECUTABLE} CompileShaders.sh "${SHADER_OUTPUT_DEST}" WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/Scripts) +# go from openVulkano/OpenVulkanoCpp to openVulkano +cmake_path(GET CMAKE_CURRENT_SOURCE_DIR PARENT_PATH ROOT_FOLDER) +set(SCRIPT_FOLDER "${ROOT_FOLDER}/Scripts") +set(SHADER_OUTPUT_DEST "${CMAKE_CURRENT_BINARY_DIR}/GeneratedShaderData") +set(SHADER_FILES_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}/Shader") +set(UNIQUE_ENTRY_NAME "OpenVulkano") +configure_file(${ROOT_FOLDER}/cmake/TryCompileShaders.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/TryCompileShaders.cmake @ONLY) +execute_process(COMMAND ${BASH_EXECUTABLE} CompileShaders.sh ${SHADER_OUTPUT_DEST} "${CMAKE_CURRENT_SOURCE_DIR}/Shader" ${UNIQUE_ENTRY_NAME} WORKING_DIRECTORY ${SCRIPT_FOLDER}) file(GLOB GENERATED_SHADER_SOURCES "${SHADER_OUTPUT_DEST}/*") file(GLOB_RECURSE sources CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/*.h" "${CMAKE_CURRENT_SOURCE_DIR}/*.c" "${CMAKE_CURRENT_SOURCE_DIR}/*.hpp" "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp") diff --git a/openVulkanoCpp/Shader/ShaderRegistry.cpp b/openVulkanoCpp/Shader/ShaderRegistry.cpp index 7dadd33..72dab50 100644 --- a/openVulkanoCpp/Shader/ShaderRegistry.cpp +++ b/openVulkanoCpp/Shader/ShaderRegistry.cpp @@ -9,7 +9,7 @@ extern "C" { -#include "GeneratedShaderData.h" +#include "GeneratedShaderData_OpenVulkano.h" } namespace OpenVulkano @@ -22,11 +22,11 @@ namespace OpenVulkano ShaderRegistry::ShaderRegistry() { - assert(std::size(entriesCount) == std::size(entries)); - const unsigned int sz = std::size(entriesCount); + assert(std::size(entriesOpenVulkano) == std::size(entriesCountOpenVulkano)); + const unsigned int sz = std::size(entriesOpenVulkano); for (unsigned int i = 0; i < sz; i++) { - RegisterShaderTable(reinterpret_cast(entries[i]), *entriesCount[i]); + RegisterShaderTable(reinterpret_cast(entriesOpenVulkano[i]), *entriesCountOpenVulkano[i]); } }