From cb331b1761dc24ef2bcc873b423524cd032f03e9 Mon Sep 17 00:00:00 2001 From: Georg Hagen Date: Wed, 17 Jul 2024 00:04:51 +0200 Subject: [PATCH] Fix shader compile script on apple --- Scripts/CompileShaders.sh | 39 ++++++++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/Scripts/CompileShaders.sh b/Scripts/CompileShaders.sh index bedd0c3..89a2b2b 100755 --- a/Scripts/CompileShaders.sh +++ b/Scripts/CompileShaders.sh @@ -1,5 +1,14 @@ #!/bin/bash +# Fixes apple bash not loading it's profile when run from xcode +source ~/.bash_profile + +# Fixes apple bash not using the sed alias when run from cmake +SED_CMD=sed +if [[ "$(uname)" == "Darwin" ]]; then + SED_CMD=gsed +fi + SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) GENERATED_DATA_PATH="$(dirname "$SCRIPT_DIR")/openVulkanoCpp/GeneratedShaderData" SHADER_PATH="$(dirname "$SCRIPT_DIR")/openVulkanoCpp/Shader" @@ -19,15 +28,15 @@ check_return_code() { } rm -f *.spv -rm -f "$GENERATED_DATA_PATH"/* -mkdir "$GENERATED_DATA_PATH" +#rm -f "$GENERATED_DATA_PATH"/* +mkdir -p "$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 "// 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 "extern \"C\" {" >> "$GENERATED_DATA_PATH"/GeneratedShaderData.h -echo -e "#include \"GeneratedShaderData.h\"" >> "$GENERATED_DATA_PATH"/GeneratedShaderData.c +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)) @@ -44,28 +53,28 @@ for unique_name in ${unique_file_names[@]} ; do glslangValidator -V $same_file -o $filename_with_ext_no_path.spv check_return_code done - + bin2c -t -d "$GENERATED_DATA_PATH"/$unique_name.h -o "$GENERATED_DATA_PATH"/$unique_name.c *.spv check_return_code rm *.spv - + echo -e "#include \"${unique_name}.h\"" >> "$GENERATED_DATA_PATH"/GeneratedShaderData.c - filename_no_ext_first_upper="${unique_name^}" + 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}" - + if [ $i -ne $((len-1)) ]; then entriesCountDef+=",\n\t\t" entriesDef+=",\n\t\t" fi - - sed -i "3s/.*/#include \"${unique_name}.h\"/" "$GENERATED_DATA_PATH"/$unique_name.c - 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 + + $SED_CMD -i "3s/.*/#include \"${unique_name}.h\"/" "$GENERATED_DATA_PATH/$unique_name.c" + $SED_CMD -i 's/char \*entryName/const char *entryName/' "$GENERATED_DATA_PATH/$unique_name.h" + $SED_CMD -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 + $SED_CMD -i "s/fileTable/fileTable${filename_no_ext_first_upper}/" "$GENERATED_DATA_PATH"/$unique_name.h $GENERATED_DATA_PATH/$unique_name.c + $SED_CMD -i "s/typedef struct {/#ifndef TFileTableEntry_H_INCLUDED\n#define TFileTableEntry_H_INCLUDED\ntypedef struct {/" "$GENERATED_DATA_PATH/$unique_name.h" + $SED_CMD -i "s/} TFileTableEntry;/} TFileTableEntry;\n#endif \/*TFileTableEntry_H_INCLUDED*\//" "$GENERATED_DATA_PATH/$unique_name.h" ((i++)) done