From 652fc3ab00aabbd9f8ad8deaef75bfaf93b19a24 Mon Sep 17 00:00:00 2001
From: Sascha Willems <webmaster@saschawillems.de>
Date: Fri, 24 Jan 2020 09:16:52 +0100
Subject: [PATCH] Code cleanup

Fixes #657
---
 data/shaders/shadowmapping/offscreen.frag     |   2 --
 data/shaders/shadowmapping/offscreen.frag.spv | Bin 348 -> 348 bytes
 data/shaders/shadowmapping/offscreen.vert.spv | Bin 900 -> 900 bytes
 data/shaders/shadowmapping/quad.frag.spv      | Bin 1420 -> 1420 bytes
 data/shaders/shadowmapping/quad.vert.spv      | Bin 880 -> 880 bytes
 data/shaders/shadowmapping/scene.frag         |   1 -
 data/shaders/shadowmapping/scene.frag.spv     | Bin 5028 -> 5028 bytes
 data/shaders/shadowmapping/scene.vert.spv     | Bin 3032 -> 3032 bytes
 examples/shadowmapping/shadowmapping.cpp      |   7 +------
 9 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/data/shaders/shadowmapping/offscreen.frag b/data/shaders/shadowmapping/offscreen.frag
index 5673c538..38d211d7 100644
--- a/data/shaders/shadowmapping/offscreen.frag
+++ b/data/shaders/shadowmapping/offscreen.frag
@@ -1,10 +1,8 @@
 #version 450
 
 layout(location = 0) out vec4 color;
-//layout(location = 0) out float fragmentdepth;
 
 void main() 
 {	
-//	fragmentdepth = gl_FragCoord.z;
 	color = vec4(1.0, 0.0, 0.0, 1.0);
 }
\ No newline at end of file
diff --git a/data/shaders/shadowmapping/offscreen.frag.spv b/data/shaders/shadowmapping/offscreen.frag.spv
index 482931cfa5128b999a6c3784e9dcde0b36a14907..4d3440f86e1825933e1ea26445c40f8c186990c1 100644
GIT binary patch
delta 18
Zcmcb^bcczPnMs+Qfq{{MV<TrUBLE}A0}KEF

delta 18
Zcmcb^bcczPnMs+Qfq{{MeIsWuBLE}50}B8E

diff --git a/data/shaders/shadowmapping/offscreen.vert.spv b/data/shaders/shadowmapping/offscreen.vert.spv
index 3002a9a18fa0ead1e1b8a8ca2151dd9fb4acca26..e5c7931d4c640eb30a3813e857256e40ae870bd1 100644
GIT binary patch
delta 18
ZcmZo+Z(-+TW>RKnU|?k6*vMJU3;-Dg0+0Xz

delta 18
ZcmZo+Z(-+TW>RKnU|?im-^f|b3;-Db0*?Ry

diff --git a/data/shaders/shadowmapping/quad.frag.spv b/data/shaders/shadowmapping/quad.frag.spv
index bbf17a307fb02fbdca17933440a37709998d2348..13c24deef5178a8c4a459614e83ed1c1941e83d6 100644
GIT binary patch
delta 18
ZcmeC-?&0QSW>RKnU|?k6*vQ$;3IH0X0<r)A

delta 18
ZcmeC-?&0QSW>RKnU|?im-^kg_3IH0S0<i!9

diff --git a/data/shaders/shadowmapping/quad.vert.spv b/data/shaders/shadowmapping/quad.vert.spv
index 8a9063169dcdfc7e594d682cc2e7d75863bd6934..ffb2cb3627476abdeb2a873b78759fa25843dd48 100644
GIT binary patch
delta 18
Zcmeys_JNI)nMs+Qfq{{MV<TreGXN(Q15yA0

delta 18
Zcmeys_JNI)nMs+Qfq{{MeIsW&GXN(L15p3~

diff --git a/data/shaders/shadowmapping/scene.frag b/data/shaders/shadowmapping/scene.frag
index 476c53ed..a8e67f56 100644
--- a/data/shaders/shadowmapping/scene.frag
+++ b/data/shaders/shadowmapping/scene.frag
@@ -60,7 +60,6 @@ void main()
 	vec3 V = normalize(inViewVec);
 	vec3 R = normalize(-reflect(L, N));
 	vec3 diffuse = max(dot(N, L), ambient) * inColor;
-//	vec3 specular = pow(max(dot(R, V), 0.0), 50.0) * vec3(0.75);
 
 	outFragColor = vec4(diffuse * shadow, 1.0);
 
diff --git a/data/shaders/shadowmapping/scene.frag.spv b/data/shaders/shadowmapping/scene.frag.spv
index e6e047d39a2e219e37ffbb6f4829aa9d4e2233c1..3f308890d0cc84689dd11c67e8d8e1fdb158b32e 100644
GIT binary patch
delta 18
ZcmZ3YzC@jqnMs+Qfq{{MV<YEmVE`eO13&-(

delta 18
ZcmZ3YzC@jqnMs+Qfq{{MeIw^=VE`eJ13v%&

diff --git a/data/shaders/shadowmapping/scene.vert.spv b/data/shaders/shadowmapping/scene.vert.spv
index 4d449cb00a16fc0897d97166673f67c92e31eb9d..b9b214072da85980d6a74fa888b41f9f7f7cd7f6 100644
GIT binary patch
delta 18
Zcmca1enXs-nMs+Qfq{{MV<YEzZU83T1GE4D

delta 18
Zcmca1enXs-nMs+Qfq{{MeIw_2ZU83O1G4}C

diff --git a/examples/shadowmapping/shadowmapping.cpp b/examples/shadowmapping/shadowmapping.cpp
index 3b8d46e1..c0566d31 100644
--- a/examples/shadowmapping/shadowmapping.cpp
+++ b/examples/shadowmapping/shadowmapping.cpp
@@ -35,9 +35,6 @@
 #endif
 #define SHADOWMAP_FILTER VK_FILTER_LINEAR
 
-// Offscreen frame buffer properties
-#define FB_COLOR_FORMAT VK_FORMAT_R8G8B8A8_UNORM
-
 class VulkanExample : public VulkanExampleBase
 {
 public:
@@ -240,8 +237,6 @@ public:
 		offscreenPass.width = SHADOWMAP_DIM;
 		offscreenPass.height = SHADOWMAP_DIM;
 
-		VkFormat fbColorFormat = FB_COLOR_FORMAT;
-
 		// For shadow mapping we only need a depth attachment
 		VkImageCreateInfo image = vks::initializers::imageCreateInfo();
 		image.imageType = VK_IMAGE_TYPE_2D;
@@ -656,7 +651,7 @@ public:
 			VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT,
 			VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT,
 			&uniformBuffers.debug,
-			sizeof(uboVSscene)));
+			sizeof(uboVSquad)));
 
 		// Offscreen vertex shader uniform buffer block
 		VK_CHECK_RESULT(vulkanDevice->createBuffer(