From 6b3dbb81a2109e758fb1670b2fa00bad12ecce03 Mon Sep 17 00:00:00 2001
From: saschawillems <webmaster@saschawillems.de>
Date: Fri, 27 Apr 2018 19:10:47 +0200
Subject: [PATCH] Remove useless uniform in subpasses

Fixes #390
---
 data/shaders/subpasses/gbuffer.frag     |   3 ---
 data/shaders/subpasses/gbuffer.frag.spv | Bin 2252 -> 2080 bytes
 examples/subpasses/subpasses.cpp        |   4 ++--
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/data/shaders/subpasses/gbuffer.frag b/data/shaders/subpasses/gbuffer.frag
index bf516ae2..ad42f030 100644
--- a/data/shaders/subpasses/gbuffer.frag
+++ b/data/shaders/subpasses/gbuffer.frag
@@ -3,9 +3,6 @@
 #extension GL_ARB_separate_shader_objects : enable
 #extension GL_ARB_shading_language_420pack : enable
 
-layout (binding = 1) uniform sampler2D samplerColor;
-layout (binding = 2) uniform sampler2D samplerNormalMap;
-
 layout (location = 0) in vec3 inNormal;
 layout (location = 1) in vec3 inColor;
 layout (location = 2) in vec3 inWorldPos;
diff --git a/data/shaders/subpasses/gbuffer.frag.spv b/data/shaders/subpasses/gbuffer.frag.spv
index bc6f35ee01b5fa61f9f580680ab7aa6f15034859..0a72ba9df391cd0717d67a587fade0d415d53327 100644
GIT binary patch
delta 74
zcmX>jxIloHnMs+Qfq{{Mje&!~cOx%9qoNQ41B0KdV^Dm6kE5R}0|P4%iU7sjU_z5c
V8TU`-U|O*G1=AbG%_gifm;ueB510S|

delta 245
zcmZ1=a7K`qnMs+Qfq@YSIT(UA^71oIc46FMz{<eJ5Wv8|P@I@skds>EoS&0l1mrTX
zGO#lQBE<dji*gfld=m>M|6p8V>(0Oe)}#bd2?Q{{B9P4p<%2XM%Y*nJd8W-Xncg$T
zN-}UV_yW0XKn&7?3}Ad|24)67pae*r0?<l-s3MS<HIxr>I|#t|AZr*lx3bJ;1^_3b
B9$^3g

diff --git a/examples/subpasses/subpasses.cpp b/examples/subpasses/subpasses.cpp
index 80d24d3e..10ebcb53 100644
--- a/examples/subpasses/subpasses.cpp
+++ b/examples/subpasses/subpasses.cpp
@@ -602,8 +602,8 @@ public:
 	{
 		std::vector<VkDescriptorPoolSize> poolSizes =
 		{
-			vks::initializers::descriptorPoolSize(VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 9),
-			vks::initializers::descriptorPoolSize(VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, 9),
+			vks::initializers::descriptorPoolSize(VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 4),
+			vks::initializers::descriptorPoolSize(VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, 4),
 			vks::initializers::descriptorPoolSize(VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT, 4),
 		};