From c858c2627cd68bf0b15a357a6688347a0c5c93b6 Mon Sep 17 00:00:00 2001
From: Tobias Frisch <tfrisch@uni-koblenz.de>
Date: Thu, 13 Jul 2023 01:58:42 +0200
Subject: [PATCH] Update to latest commits and configure branches for
submodules
Signed-off-by: Tobias Frisch <tfrisch@uni-koblenz.de>
---
.gitmodules | 17 +++++++++++++++++
lib/Vulkan-Headers | 2 +-
lib/Vulkan-Hpp | 2 +-
lib/VulkanMemoryAllocator | 2 +-
lib/VulkanMemoryAllocator-Hpp | 2 +-
lib/glfw | 2 +-
modules/asset_loader/lib/json | 2 +-
modules/geometry/lib/glm | 2 +-
modules/gui/lib/imgui | 2 +-
modules/shader_compiler/lib/glslang | 2 +-
scripts/submodules.sh | 2 +-
11 files changed, 27 insertions(+), 10 deletions(-)
diff --git a/.gitmodules b/.gitmodules
index e1d38a91..fcee88d8 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,51 +1,68 @@
[submodule "lib/glfw"]
path = lib/glfw
url = https://github.com/glfw/glfw.git
+ branch = master
[submodule "lib/SPIRV-Cross"]
path = lib/SPIRV-Cross
url = https://github.com/KhronosGroup/SPIRV-Cross.git
+ branch = main
[submodule "modules/asset_loader/lib/fx-gltf"]
path = modules/asset_loader/lib/fx-gltf
url = https://github.com/jessey-git/fx-gltf.git
+ branch = master
[submodule "modules/asset_loader/lib/json"]
path = modules/asset_loader/lib/json
url = https://github.com/nlohmann/json.git
+ branch = master
[submodule "modules/asset_loader/lib/stb"]
path = modules/asset_loader/lib/stb
url = https://github.com/nothings/stb.git
+ branch = master
[submodule "modules/camera/lib/glm"]
path = modules/geometry/lib/glm
url = https://github.com/g-truc/glm.git
+ branch = master
[submodule "modules/shader_compiler/lib/glslang"]
path = modules/shader_compiler/lib/glslang
url = https://github.com/KhronosGroup/glslang.git
+ branch = main
[submodule "modules/gui/lib/imgui"]
path = modules/gui/lib/imgui
url = https://github.com/ocornut/imgui.git
+ branch = master
[submodule "modules/upscaling/lib/FidelityFX-FSR"]
path = modules/upscaling/lib/FidelityFX-FSR
url = https://github.com/GPUOpen-Effects/FidelityFX-FSR.git
+ branch = master
[submodule "lib/Vulkan-Headers"]
path = lib/Vulkan-Headers
url = https://github.com/KhronosGroup/Vulkan-Headers.git
+ branch = main
[submodule "lib/Vulkan-Hpp"]
path = lib/Vulkan-Hpp
url = https://github.com/KhronosGroup/Vulkan-Hpp
+ branch = main
[submodule "modules/upscaling/lib/NVIDIAImageScaling"]
path = modules/upscaling/lib/NVIDIAImageScaling
url = https://github.com/NVIDIAGameWorks/NVIDIAImageScaling.git
+ branch = main
[submodule "lib/VulkanMemoryAllocator-Hpp"]
path = lib/VulkanMemoryAllocator-Hpp
url = https://github.com/YaaZ/VulkanMemoryAllocator-Hpp.git
+ branch = master
[submodule "modules/algorithm/lib/FidelityFX-SPD"]
path = modules/algorithm/lib/FidelityFX-SPD
url = https://github.com/GPUOpen-Effects/FidelityFX-SPD.git
+ branch = master
[submodule "modules/upscaling/lib/FidelityFX-FSR2"]
path = modules/upscaling/lib/FidelityFX-FSR2
url = https://github.com/TheJackiMonster/FidelityFX-FSR2.git
+ branch = master
[submodule "lib/VulkanMemoryAllocator"]
path = lib/VulkanMemoryAllocator
url = https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git
+ branch = master
[submodule "modules/tone_mapping/lib/glsl-tone-map"]
path = modules/tone_mapping/lib/glsl-tone-map
url = https://github.com/dmnsgn/glsl-tone-map.git
+ branch = main
diff --git a/lib/Vulkan-Headers b/lib/Vulkan-Headers
index fa204df5..2565ffa3 160000
--- a/lib/Vulkan-Headers
+++ b/lib/Vulkan-Headers
@@ -1 +1 @@
-Subproject commit fa204df59c6caea6b9be3cf0754a88cd89056a87
+Subproject commit 2565ffa31ea67650f95f65347ed8f5917c651fac
diff --git a/lib/Vulkan-Hpp b/lib/Vulkan-Hpp
index 086af6f3..069c3b87 160000
--- a/lib/Vulkan-Hpp
+++ b/lib/Vulkan-Hpp
@@ -1 +1 @@
-Subproject commit 086af6f3d7fd638d2820ed4ebdd29b2668b300c5
+Subproject commit 069c3b875e0683944216711bc88ce07444ecc257
diff --git a/lib/VulkanMemoryAllocator b/lib/VulkanMemoryAllocator
index 66afe099..2a28bc4b 160000
--- a/lib/VulkanMemoryAllocator
+++ b/lib/VulkanMemoryAllocator
@@ -1 +1 @@
-Subproject commit 66afe099f1cf1f79c270471e9c0f02139072057d
+Subproject commit 2a28bc4b39b9b80dad909036442f629f570d7ae1
diff --git a/lib/VulkanMemoryAllocator-Hpp b/lib/VulkanMemoryAllocator-Hpp
index 2e9ab714..eca325bc 160000
--- a/lib/VulkanMemoryAllocator-Hpp
+++ b/lib/VulkanMemoryAllocator-Hpp
@@ -1 +1 @@
-Subproject commit 2e9ab714e9f0cdf6d07891fa6f359e91f3096369
+Subproject commit eca325bc5d88eb1be1b70af3726a410d04a92512
diff --git a/lib/glfw b/lib/glfw
index 9a876356..3eaf1255 160000
--- a/lib/glfw
+++ b/lib/glfw
@@ -1 +1 @@
-Subproject commit 9a87635686c7fcb63ca63149c5b179b85a53a725
+Subproject commit 3eaf1255b29fdf5c2895856c7be7d7185ef2b241
diff --git a/modules/asset_loader/lib/json b/modules/asset_loader/lib/json
index 546370c9..bc889afb 160000
--- a/modules/asset_loader/lib/json
+++ b/modules/asset_loader/lib/json
@@ -1 +1 @@
-Subproject commit 546370c9e778d99e7176641123e5cc1d0b62acab
+Subproject commit bc889afb4c5bf1c0d8ee29ef35eaaf4c8bef8a5d
diff --git a/modules/geometry/lib/glm b/modules/geometry/lib/glm
index efec5db0..5c46b9c0 160000
--- a/modules/geometry/lib/glm
+++ b/modules/geometry/lib/glm
@@ -1 +1 @@
-Subproject commit efec5db081e3aad807d0731e172ac597f6a39447
+Subproject commit 5c46b9c07008ae65cb81ab79cd677ecc1934b903
diff --git a/modules/gui/lib/imgui b/modules/gui/lib/imgui
index 5a2b1e84..6888e6cd 160000
--- a/modules/gui/lib/imgui
+++ b/modules/gui/lib/imgui
@@ -1 +1 @@
-Subproject commit 5a2b1e84828f192d30c91cdd210db41de8ad3236
+Subproject commit 6888e6cdffd43ab8d967f25cc64cfe82b1fce2fa
diff --git a/modules/shader_compiler/lib/glslang b/modules/shader_compiler/lib/glslang
index b34f619e..44779f50 160000
--- a/modules/shader_compiler/lib/glslang
+++ b/modules/shader_compiler/lib/glslang
@@ -1 +1 @@
-Subproject commit b34f619e1c85810dcb3c578107d2e48ba4ee2b37
+Subproject commit 44779f508af3a9ae535153a70e4a735ded913857
diff --git a/scripts/submodules.sh b/scripts/submodules.sh
index 75933841..960a4ab3 100755
--- a/scripts/submodules.sh
+++ b/scripts/submodules.sh
@@ -6,5 +6,5 @@ elif [ "$1" = "reset" ]; then
git submodule deinit -f .
git submodule update --init
elif [ "$1" = "update" ]; then
- git submodule foreach git pull
+ git submodule update --remote
fi
\ No newline at end of file
--
GitLab