Merge branch 'develop' of gitlab.uni-koblenz.de:vulkan2021/vkcv-framework into...

Merge branch 'develop' of gitlab.uni-koblenz.de:vulkan2021/vkcv-framework into 76-descriptor-in-multiple-shader-stages

Merge branch 'develop' of gitlab.uni-koblenz.de:vulkan2021/vkcv-framework into...
f32c2548 · Artur Wasmut · 9bd9cf11 · eab9f823 · 9bd9cf11 · 9bd9cf11
Commit f32c2548 authored 3 years ago by Artur Wasmut
--- a/projects/voxelization/resources/Sponza/sponza_details_diff.png
+++ b/projects/voxelization/resources/Sponza/sponza_details_diff.png
--- a/projects/voxelization/resources/Sponza/sponza_fabric_blue_diff.png
+++ b/projects/voxelization/resources/Sponza/sponza_fabric_blue_diff.png
--- a/projects/voxelization/resources/Sponza/sponza_fabric_diff.png
+++ b/projects/voxelization/resources/Sponza/sponza_fabric_diff.png
--- a/projects/voxelization/resources/Sponza/sponza_fabric_green_diff.png
+++ b/projects/voxelization/resources/Sponza/sponza_fabric_green_diff.png
--- a/projects/voxelization/resources/Sponza/sponza_flagpole_diff.png
+++ b/projects/voxelization/resources/Sponza/sponza_flagpole_diff.png
--- a/projects/voxelization/resources/Sponza/sponza_floor_a_diff.png
+++ b/projects/voxelization/resources/Sponza/sponza_floor_a_diff.png
--- a/projects/voxelization/resources/Sponza/sponza_roof_diff.png
+++ b/projects/voxelization/resources/Sponza/sponza_roof_diff.png
--- a/projects/voxelization/resources/Sponza/vase_dif.png
+++ b/projects/voxelization/resources/Sponza/vase_dif.png
--- a/projects/voxelization/resources/Sponza/vase_hanging.png
+++ b/projects/voxelization/resources/Sponza/vase_hanging.png
--- a/projects/voxelization/resources/Sponza/vase_round.png
+++ b/projects/voxelization/resources/Sponza/vase_round.png
--- a/projects/voxelization/resources/lensDirt.jpg
+++ b/projects/voxelization/resources/lensDirt.jpg
--- a/projects/voxelization/resources/shaders/bloomDownsample.comp
+++ b/projects/voxelization/resources/shaders/bloomDownsample.comp
--- a/projects/voxelization/resources/shaders/bloomFlaresComposite.comp
+++ b/projects/voxelization/resources/shaders/bloomFlaresComposite.comp
--- a/projects/voxelization/resources/shaders/bloomUpsample.comp
+++ b/projects/voxelization/resources/shaders/bloomUpsample.comp
--- a/projects/voxelization/resources/shaders/brdf.inc
+++ b/projects/voxelization/resources/shaders/brdf.inc
--- a/projects/voxelization/resources/shaders/depthPrepass.frag
+++ b/projects/voxelization/resources/shaders/depthPrepass.frag
--- a/projects/voxelization/resources/shaders/depthPrepass.vert
+++ b/projects/voxelization/resources/shaders/depthPrepass.vert
--- a/projects/voxelization/resources/shaders/depthToMoments.comp
+++ b/projects/voxelization/resources/shaders/depthToMoments.comp
--- a/projects/voxelization/resources/shaders/lensFlares.comp
+++ b/projects/voxelization/resources/shaders/lensFlares.comp
--- a/projects/voxelization/resources/shaders/lightInfo.inc
+++ b/projects/voxelization/resources/shaders/lightInfo.inc