From 45577e84906c736d11b37b4f8db737f642de83e4 Mon Sep 17 00:00:00 2001 From: Michalis Kamburelis Date: Tue, 8 Mar 2022 11:46:13 +0100 Subject: [PATCH 1/5] Ignore Unix binary of projectmanager --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 7af8d6fca..8c15f4827 100644 --- a/.gitignore +++ b/.gitignore @@ -63,3 +63,6 @@ __history/ # Castalia statistics file (since XE7 Castalia is distributed with Delphi) *.stat + +# Unix binaries +projectmanager From adfdb49225b875845507d2651a921124e09140b1 Mon Sep 17 00:00:00 2001 From: Michalis Kamburelis Date: Tue, 8 Mar 2022 11:47:36 +0100 Subject: [PATCH 2/5] "-R" option needed for "rm", as fpctemp is a directory --- src/tools/projectmanager/makefpc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tools/projectmanager/makefpc b/src/tools/projectmanager/makefpc index e8420e082..4de238b24 100755 --- a/src/tools/projectmanager/makefpc +++ b/src/tools/projectmanager/makefpc @@ -1,5 +1,5 @@ #!/bin/sh mkdir -p fpctemp fpc -Sd -B -FEfpctemp -FUfpctemp -o../../../projectmanager projectmanager.dpr -rm -f fpctemp +rm -Rf fpctemp From 54ff3c801acdfdc2cf4e99c8981f8ca1e96abb47 Mon Sep 17 00:00:00 2001 From: Michalis Kamburelis Date: Tue, 8 Mar 2022 11:48:11 +0100 Subject: [PATCH 3/5] compileshaders script using bash, to compile examples for Unix --- .../src/assets/shaders/compileshaders | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100755 projects/examples/src/assets/shaders/compileshaders diff --git a/projects/examples/src/assets/shaders/compileshaders b/projects/examples/src/assets/shaders/compileshaders new file mode 100755 index 000000000..c7950d9fd --- /dev/null +++ b/projects/examples/src/assets/shaders/compileshaders @@ -0,0 +1,35 @@ +#!/bin/bash +set -euo pipefail +IFS=$'\n\t' + +# ------------------------------------------------------------------------------ +# Compile shaders with Spir-V for Vulkan. +# Make sure you have glslangValidator and spirv-opt +# (on Debian-based systems, just "apt install glslang-tools"). +# +# bash script using http://redsymbol.net/articles/unofficial-bash-strict-mode/ +# ------------------------------------------------------------------------------ + +compile_dir () +{ + SUBDIR_NAME="$1" + cd "${SUBDIR_NAME}" + + for VERT_SHADER in *.vert; do + glslangValidator -V ${VERT_SHADER} -o `basename ${VERT_SHADER} .vert`.spv + done + for FRAG_SHADER in *.frag; do + glslangValidator -V ${FRAG_SHADER} -o `basename ${FRAG_SHADER} .frag`.spv + done + for f in *.spv; do + spirv-opt --strip-debug --unify-const --flatten-decorations --eliminate-dead-const --strength-reduction --simplify-instructions --remove-duplicates -O $f -o $f + done + mv -f *.spv ../../../../assets/shaders/"${SUBDIR_NAME}" + + cd ../ +} + +compile_dir textoverlay +compile_dir triangle +compile_dir cube +compile_dir dragon From 9724d7d9fc4c844994c711037ddded20d7576858 Mon Sep 17 00:00:00 2001 From: Michalis Kamburelis Date: Mon, 17 Jul 2023 23:27:40 +0200 Subject: [PATCH 4/5] Add more files to .gitignore --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index 8c15f4827..664421ebc 100644 --- a/.gitignore +++ b/.gitignore @@ -66,3 +66,7 @@ __history/ # Unix binaries projectmanager +examples_x86_64-linux + +FPCOutput +*.spv \ No newline at end of file From 0347b801dda49d85a8c95cbf4e7a885b3615e2e9 Mon Sep 17 00:00:00 2001 From: Michalis Kamburelis Date: Mon, 17 Jul 2023 23:33:35 +0200 Subject: [PATCH 5/5] Add src/assets/shaders/compileshaders script version for Unix --- src/assets/shaders/compileshaders | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100755 src/assets/shaders/compileshaders diff --git a/src/assets/shaders/compileshaders b/src/assets/shaders/compileshaders new file mode 100755 index 000000000..483282a64 --- /dev/null +++ b/src/assets/shaders/compileshaders @@ -0,0 +1,19 @@ +#!/bin/bash +set -euo pipefail +IFS=$'\n\t' + +# ------------------------------------------------------------------------------ +# Compile shaders with Spir-V for Vulkan. +# Make sure you have glslc and glslangValidator +# (on Debian-based systems, just "apt install glslc glslang-tools"). +# +# bash script using http://redsymbol.net/articles/unofficial-bash-strict-mode/ +# ------------------------------------------------------------------------------ + +cd canvas +./compileshaders.sh +cd .. + +cd scene3d +./compileshaders.sh +cd ..