Merge branch 'develop' into 43-multi-threading

Signed-off-by: Tobias Frisch <tfrisch@uni-koblenz.de>

Merge branch 'develop' into 43-multi-threading
867b73ca · Tobias Frisch · 60755124 · a9250ba2 · 867b73ca · 867b73ca
Verified Commit 867b73ca authored 2 years ago by Tobias Frisch
--- a/modules/testing/CMakeLists.txt
+++ b/modules/testing/CMakeLists.txt
--- a/modules/upscaling/CMakeLists.txt
+++ b/modules/upscaling/CMakeLists.txt
--- a/modules/upscaling/README.md
+++ b/modules/upscaling/README.md
--- a/modules/upscaling/config/FidelityFX_FSR.cmake
+++ b/modules/upscaling/config/FidelityFX_FSR.cmake
--- a/modules/upscaling/config/NVIDIAImageScaling.cmake
+++ b/modules/upscaling/config/NVIDIAImageScaling.cmake
--- a/modules/upscaling/include/vkcv/upscaling/BilinearUpscaling.hpp
+++ b/modules/upscaling/include/vkcv/upscaling/BilinearUpscaling.hpp
--- a/modules/upscaling/include/vkcv/upscaling/FSRUpscaling.hpp
+++ b/modules/upscaling/include/vkcv/upscaling/FSRUpscaling.hpp
--- a/modules/upscaling/include/vkcv/upscaling/NISUpscaling.hpp
+++ b/modules/upscaling/include/vkcv/upscaling/NISUpscaling.hpp
--- a/modules/upscaling/include/vkcv/upscaling/Upscaling.hpp
+++ b/modules/upscaling/include/vkcv/upscaling/Upscaling.hpp
--- a/FidelityFX-FSR @ a21ffb8f
+++ b/FidelityFX-FSR @ a21ffb8f
--- a/NVIDIAImageScaling @ 7a468267
+++ b/NVIDIAImageScaling @ 7a468267
--- a/modules/upscaling/src/vkcv/upscaling/BilinearUpscaling.cpp
+++ b/modules/upscaling/src/vkcv/upscaling/BilinearUpscaling.cpp
--- a/modules/upscaling/src/vkcv/upscaling/FSRUpscaling.cpp
+++ b/modules/upscaling/src/vkcv/upscaling/FSRUpscaling.cpp
--- a/modules/upscaling/src/vkcv/upscaling/NISUpscaling.cpp
+++ b/modules/upscaling/src/vkcv/upscaling/NISUpscaling.cpp
--- a/modules/upscaling/src/vkcv/upscaling/Upscaling.cpp
+++ b/modules/upscaling/src/vkcv/upscaling/Upscaling.cpp
--- a/projects/CMakeLists.txt
+++ b/projects/CMakeLists.txt
--- a/projects/bindless_textures/.gitignore
+++ b/projects/bindless_textures/.gitignore
--- a/projects/bindless_textures/CMakeLists.txt
+++ b/projects/bindless_textures/CMakeLists.txt
--- a/projects/first_mesh/resources/triangle/Triangle.blend
+++ b/projects/first_mesh/resources/triangle/Triangle.blend
--- a/projects/first_mesh/resources/Szene/boards2_vcyc.jpg
+++ b/projects/first_mesh/resources/Szene/boards2_vcyc.jpg