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 · f32c2548 · f32c2548
Commit f32c2548 authored 3 years ago by Artur Wasmut
--- a/projects/voxelization/resources/Sponza/Textures/Cloth2_Spec.jpg
+++ b/projects/voxelization/resources/Sponza/Textures/Cloth2_Spec.jpg
--- a/projects/voxelization/resources/Sponza/Textures/ClothBlue1_Diff.jpg
+++ b/projects/voxelization/resources/Sponza/Textures/ClothBlue1_Diff.jpg
--- a/projects/voxelization/resources/Sponza/Textures/ClothBlue2_Diff.jpg
+++ b/projects/voxelization/resources/Sponza/Textures/ClothBlue2_Diff.jpg
--- a/projects/voxelization/resources/Sponza/Textures/ClothBlue2_Diff_jpg.jpg
+++ b/projects/voxelization/resources/Sponza/Textures/ClothBlue2_Diff_jpg.jpg
--- a/projects/voxelization/resources/Sponza/Textures/ClothGreen1_Diff.jpg
+++ b/projects/voxelization/resources/Sponza/Textures/ClothGreen1_Diff.jpg
--- a/projects/voxelization/resources/Sponza/Textures/ClothGreen2_Diff.jpg
+++ b/projects/voxelization/resources/Sponza/Textures/ClothGreen2_Diff.jpg
--- a/projects/voxelization/resources/Sponza/Textures/ClothRed1_Diff.jpg
+++ b/projects/voxelization/resources/Sponza/Textures/ClothRed1_Diff.jpg
--- a/projects/voxelization/resources/Sponza/Textures/ClothRed2_Diff.jpg
+++ b/projects/voxelization/resources/Sponza/Textures/ClothRed2_Diff.jpg
--- a/projects/voxelization/resources/Sponza/Textures/Column_B_Diff.jpg
+++ b/projects/voxelization/resources/Sponza/Textures/Column_B_Diff.jpg
--- a/projects/voxelization/resources/Sponza/Textures/Column_B_Norm.jpg
+++ b/projects/voxelization/resources/Sponza/Textures/Column_B_Norm.jpg
--- a/projects/voxelization/resources/Sponza/Textures/Column_B_Spec.jpg
+++ b/projects/voxelization/resources/Sponza/Textures/Column_B_Spec.jpg
--- a/projects/voxelization/resources/Sponza/Textures/Column_C_Diff.jpg
+++ b/projects/voxelization/resources/Sponza/Textures/Column_C_Diff.jpg
--- a/projects/voxelization/resources/Sponza/Textures/Column_C_Norm.jpg
+++ b/projects/voxelization/resources/Sponza/Textures/Column_C_Norm.jpg
--- a/projects/voxelization/resources/Sponza/Textures/Column_C_Spec.jpg
+++ b/projects/voxelization/resources/Sponza/Textures/Column_C_Spec.jpg
--- a/projects/voxelization/resources/Sponza/Textures/Column_Diff.jpg
+++ b/projects/voxelization/resources/Sponza/Textures/Column_Diff.jpg
--- a/projects/voxelization/resources/Sponza/Textures/Column_Norm.jpg
+++ b/projects/voxelization/resources/Sponza/Textures/Column_Norm.jpg
--- a/projects/voxelization/resources/Sponza/Textures/Column_Spec.jpg
+++ b/projects/voxelization/resources/Sponza/Textures/Column_Spec.jpg
--- a/projects/voxelization/resources/Sponza/Textures/Detail_Diff.jpg
+++ b/projects/voxelization/resources/Sponza/Textures/Detail_Diff.jpg
--- a/projects/voxelization/resources/Sponza/Textures/Detail_norm.jpg
+++ b/projects/voxelization/resources/Sponza/Textures/Detail_norm.jpg
--- a/projects/voxelization/resources/Sponza/Textures/Detail_spec.jpg
+++ b/projects/voxelization/resources/Sponza/Textures/Detail_spec.jpg