From 3f92d4c0dfcf21737ac6a3f7b05d95e2c54044c1 Mon Sep 17 00:00:00 2001
From: saschawillems <webmaster@saschawillems.de>
Date: Sat, 24 Feb 2018 10:39:02 +0100
Subject: [PATCH] Removed unused uv vertex attribute

Fixes #412
---
 data/shaders/pbrbasic/pbr.frag     |   1 -
 data/shaders/pbrbasic/pbr.frag.spv | Bin 7684 -> 7600 bytes
 data/shaders/pbrbasic/pbr.vert     |   6 ------
 data/shaders/pbrbasic/pbr.vert.spv | Bin 2596 -> 2344 bytes
 examples/pbrbasic/pbrbasic.cpp     |   1 -
 5 files changed, 8 deletions(-)

diff --git a/data/shaders/pbrbasic/pbr.frag b/data/shaders/pbrbasic/pbr.frag
index a17d95bb..d7c72121 100644
--- a/data/shaders/pbrbasic/pbr.frag
+++ b/data/shaders/pbrbasic/pbr.frag
@@ -2,7 +2,6 @@
 
 layout (location = 0) in vec3 inWorldPos;
 layout (location = 1) in vec3 inNormal;
-layout (location = 2) in vec2 inUV;
 
 layout (binding = 0) uniform UBO 
 {
diff --git a/data/shaders/pbrbasic/pbr.frag.spv b/data/shaders/pbrbasic/pbr.frag.spv
index f51899ca550a5cdfde315e3f022c47e8b82d03cb..8236e4e6c4c6b5ea672259b4bd6464d788950e2f 100644
GIT binary patch
delta 91
zcmZp%*<j7f%%sfDz`)4B%)r5*Ig!^?nuCFbfdPzj6EpLGOop34{1k|lCnio1D$dO;
j$#8d%&`2}1hM>*Nj0;&dZ(+T`xOooy66VbX+*5=A_eB*@

delta 167
zcmdmB-D1Pb%%sfDz`zKE91J=Wc}?Xx8CVz?z&JNCGY`mQxCz8hfmoT5fkAs>>;$3Q
z%#sXu_Xv$NLu&|P*!X`T3lA$$mo`vMW?pF6<~gi)7<t{HB62|8Oq)yDmow{%1BEn!
eir7FxK&$}dYXSK{1Qxf3@<9eMZkFVpE(8Em-x+EE

diff --git a/data/shaders/pbrbasic/pbr.vert b/data/shaders/pbrbasic/pbr.vert
index bc741abd..709f12bf 100644
--- a/data/shaders/pbrbasic/pbr.vert
+++ b/data/shaders/pbrbasic/pbr.vert
@@ -1,11 +1,7 @@
 #version 450
 
-#extension GL_ARB_separate_shader_objects : enable
-#extension GL_ARB_shading_language_420pack : enable
-
 layout (location = 0) in vec3 inPos;
 layout (location = 1) in vec3 inNormal;
-layout (location = 2) in vec2 inUV;
 
 layout (binding = 0) uniform UBO 
 {
@@ -17,7 +13,6 @@ layout (binding = 0) uniform UBO
 
 layout (location = 0) out vec3 outWorldPos;
 layout (location = 1) out vec3 outNormal;
-layout (location = 2) out vec2 outUV;
 
 layout(push_constant) uniform PushConsts {
 	vec3 objPos;
@@ -33,6 +28,5 @@ void main()
 	vec3 locPos = vec3(ubo.model * vec4(inPos, 1.0));
 	outWorldPos = locPos + pushConsts.objPos;
 	outNormal = mat3(ubo.model) * inNormal;
-	outUV = inUV;
 	gl_Position =  ubo.projection * ubo.view * vec4(outWorldPos, 1.0);
 }
diff --git a/data/shaders/pbrbasic/pbr.vert.spv b/data/shaders/pbrbasic/pbr.vert.spv
index a9abfe393c951c34bb6018d9fe4de06bce79c9f6..09e98b1e07f00cc261b7311a610bd38ea4999c58 100644
GIT binary patch
delta 398
zcmX|-OG*Pl5QeL#ov0I{_+oG)Vh|VNQpiT386WYPi5GAw0W}NV=M3YVKyV?rlEDk;
zi9A5S?}r&1KC0`lzl!R9TYX>d_^3N;=FHoi-4vaDmlWA{+mlCT_U-KRCw0DMp`5yO
zJ)r5_-QVWpr_u9h{Ae-WtlEnPF7A_r^3|`nP<{CiH@`tmJxTcxch`1p#umv=K+`wL
z^XfNF{Up%2gmeT8umcB_+r(p#-gr*A%cC)kr_Wvb3v<+S2I`Y84{x+{*n%OR7V)Ci
z2$O&DvKAe&F<#Z0cFq}<5U)W4<X1g~g2Ac{KnuvDrE}sCGSI^g`4#2zP5JwtMb7>J
DsjMeU

delta 635
zcmY*W%}N4M82zrJW<M5YFtm|Kh8Arq3W6vwtI@LjDJ^I*Og2oGs5s-gCum{5LW`hP
zxNg&1^e{o^*c3Ix;k)PDbI*L=o#)x7xwsZekBKO}F}di+H`G)=Yh3P&NFLDehEU&?
zNLa?jELfS!uH`u$yKDQ7<=xoVPS<K*-8yyO`|rV4qvcvnyXE$5*Rj^uRyub5?$y&(
zIxJbFwtIfHh8jUOzu0JvD0o!N!GqH0O{jd_rd4Wt4ZqQDVONv<@J$t!Vd5ZzQUKc|
zXV4GN!E6o^T2h%qLwiwi9fk}HQ63n4gwyr{lszyEINI3?IAf@#@HKWZ0nnR6)c|Vr
zl7HWn$TIj0cmZHL^w)-oh^`siSY{v{0F2&22s<awpvwg6;b1kEyg%aVk9v&tG{8`%
zOro9u)E{w@ya@0db$aker35SjWq3GlInYpkwMw9I(7@-&X&`cf5~4Wy*~lQm1Kihv
eK7zSd1=s*R9EE@M9N?`i0UVW_zE9lgCh!HIJxSpJ

diff --git a/examples/pbrbasic/pbrbasic.cpp b/examples/pbrbasic/pbrbasic.cpp
index 3833d639..09fea60f 100644
--- a/examples/pbrbasic/pbrbasic.cpp
+++ b/examples/pbrbasic/pbrbasic.cpp
@@ -332,7 +332,6 @@ public:
 		std::vector<VkVertexInputAttributeDescription> vertexInputAttributes = {
 			vks::initializers::vertexInputAttributeDescription(0, 0, VK_FORMAT_R32G32B32_SFLOAT, 0),					// Position
 			vks::initializers::vertexInputAttributeDescription(0, 1, VK_FORMAT_R32G32B32_SFLOAT, sizeof(float) * 3),	// Normal
-			vks::initializers::vertexInputAttributeDescription(0, 2, VK_FORMAT_R32G32_SFLOAT, sizeof(float) * 5),		// UV
 		};
 
 		VkPipelineVertexInputStateCreateInfo vertexInputState = vks::initializers::pipelineVertexInputStateCreateInfo();