From 2fdb2230dffb94ec8a9a00232ac95605909eca40 Mon Sep 17 00:00:00 2001 From: Georg Hagen Date: Sun, 28 Jul 2024 17:40:56 +0200 Subject: [PATCH] Generate spv files in $GENERATED_DATA_PATH --- Scripts/CompileShaders.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Scripts/CompileShaders.sh b/Scripts/CompileShaders.sh index 110b161..e613447 100755 --- a/Scripts/CompileShaders.sh +++ b/Scripts/CompileShaders.sh @@ -27,8 +27,8 @@ check_return_code() { fi } -rm -f *.spv mkdir -p "$GENERATED_DATA_PATH" +rm -f "$GENERATED_DATA_PATH/*.spv" touch "$GENERATED_DATA_PATH"/GeneratedShaderData.h touch "$GENERATED_DATA_PATH"/GeneratedShaderData.c @@ -48,13 +48,13 @@ 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 filename_with_ext_no_path=$(basename -- "$same_file") - glslangValidator -V $same_file -o $filename_with_ext_no_path.spv + glslangValidator -V $same_file -o "$GENERATED_DATA_PATH/$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 + (cd "$GENERATED_DATA_PATH" && bin2c -t -d $unique_name.h -o $unique_name.c *.spv) check_return_code - rm *.spv + rm "$GENERATED_DATA_PATH"/*.spv echo -e "#include \"${unique_name}.h\"" >> "$GENERATED_DATA_PATH"/GeneratedShaderData.c filename_no_ext_first_upper=$(echo $unique_name | awk '{print toupper(substr($0,1,1))substr($0,2)}')