From 10a1ecaf7bbcbc316c83f7c52742baaba0ae2f45 Mon Sep 17 00:00:00 2001
From: Sascha Willems <webmaster@saschawillems.de>
Date: Wed, 29 Apr 2020 18:39:15 +0200
Subject: [PATCH] Re-Added missing shaders

Fixes #703
---
 android/examples/multisampling/build.gradle |   2 +-
 data/shaders/multisampling/mesh.frag        |  24 +++++++++++++
 data/shaders/multisampling/mesh.frag.spv    | Bin 0 -> 2008 bytes
 data/shaders/multisampling/mesh.vert        |  38 ++++++++++++++++++++
 data/shaders/multisampling/mesh.vert.spv    | Bin 0 -> 2748 bytes
 examples/multisampling/multisampling.cpp    |   4 +--
 6 files changed, 65 insertions(+), 3 deletions(-)
 create mode 100644 data/shaders/multisampling/mesh.frag
 create mode 100644 data/shaders/multisampling/mesh.frag.spv
 create mode 100644 data/shaders/multisampling/mesh.vert
 create mode 100644 data/shaders/multisampling/mesh.vert.spv

diff --git a/android/examples/multisampling/build.gradle b/android/examples/multisampling/build.gradle
index e3369442..a398cc85 100644
--- a/android/examples/multisampling/build.gradle
+++ b/android/examples/multisampling/build.gradle
@@ -49,7 +49,7 @@ task copyTask {
     }
 
     copy {
-       from '../../../data/shaders/mesh'
+       from '../../../data/shaders/multisampling'
        into 'assets/shaders/mesh'
        include '*.*'
     }
diff --git a/data/shaders/multisampling/mesh.frag b/data/shaders/multisampling/mesh.frag
new file mode 100644
index 00000000..2dcdae5f
--- /dev/null
+++ b/data/shaders/multisampling/mesh.frag
@@ -0,0 +1,24 @@
+#version 450
+
+layout (set = 0, binding = 1) uniform sampler2D samplerColorMap;
+
+layout (location = 0) in vec3 inNormal;
+layout (location = 1) in vec3 inColor;
+layout (location = 2) in vec2 inUV;
+layout (location = 3) in vec3 inViewVec;
+layout (location = 4) in vec3 inLightVec;
+
+layout (location = 0) out vec4 outFragColor;
+
+void main() 
+{
+	vec4 color = texture(samplerColorMap, inUV) * vec4(inColor, 1.0);
+
+	vec3 N = normalize(inNormal);
+	vec3 L = normalize(inLightVec);
+	vec3 V = normalize(inViewVec);
+	vec3 R = reflect(-L, N);
+	vec3 diffuse = max(dot(N, L), 0.0) * inColor;
+	vec3 specular = pow(max(dot(R, V), 0.0), 16.0) * vec3(0.75);
+	outFragColor = vec4(diffuse * color.rgb + specular, 1.0);		
+}
\ No newline at end of file
diff --git a/data/shaders/multisampling/mesh.frag.spv b/data/shaders/multisampling/mesh.frag.spv
new file mode 100644
index 0000000000000000000000000000000000000000..86e30e4e91a2b9b158e0418c1ade41309ad70de9
GIT binary patch
literal 2008
zcmZ9NOH)%p5QRrVB1+^T3MwiWqDBSd3lK#Jh=PxRuQIMvA>geFNh%5DQe3!o<uCGA
zxv|RgO{T3|Osbjg)2F*<y5|<DzT8RYPPhU6c3f|bx;`P!4Z4iqw@M#Ng-&<3Fu!mQ
z#*j;SBAj8d`n4kmmAHXpR5C7!B-bQ2B^#0v#lcfSX(?54?zfVpg(l;%Psvwp)|+kZ
zX`SPY_D<!XRj;)-fVV3xA4jdY@u{rM+tiI4o+3Ntret%kw0@EI?KIm5mAX{#&uK4t
zJ?+mLH%jsTmu|UM?fLWak(_w$5jV<l?W=eD_*r2eyuaVkoZWbD@32$z{3Y3)R;_wi
zuW$`v8Q+KIVRy4#+3y`v_?GU={bnF(nLRCC?eRAEyegq*__-&x`J-TK^M3k{pT5H9
z?AS~Wn|WZf#*~%3(|#(w8spM4!Xn9p_{<EOe3AYRXa_?sYFekY<L5ldW%i`<4axzJ
z_-r77EeD$(u&6hzoqU`N{)l#Rfy2k9Ct&c;X@}4K;Gfry4;(%=Jp-GS4fle?xuYU{
zdcj?i{75!@i>Ieao1P}~&C6z4{uOT>t(#r+_F8dH)v2>40W;wo&t!84&O%*mW(BsW
z7eqgp0SoMpkhFHV%!Kd8V!0FVKWXQV+4*BO?>WimO($*MH1>+>F}ooNbHipfXC=(#
zvrYwXOaccS4)>mrFpKy8i{SnAFm3;_O97+5#+wWnJ$R?=<i9K-9zK3%`Xki7BAxnh
zR@E(f17_!#mL5s6VIDKmsrN#Hj~My~ZZX%T^A0TLhIEU;M+`j%x0qYfc`FukTe`*I
zBPOpM++yaWljmFL*&XR%<}XO+Y*}@Ip5B#^b4vmjKY5uaK8w3Aoj9`}NT<%PFpG!M
z;eeBy?_@zjZtj4ecW&{E(wXH?#dD5F5-?(@&-(#0{$uH!$?PZ6xx3Y0mJSEp>OYlk
z_3=~Re5=97{NeG<*;&@5uSwu=7TzwH)qXCW^I`Lrm^*Let-d7gvKcUN7H8n?@xJiW
zYjVJ|oG+zQ=X>D1k`52t-tlYc;4H)5NC%^aVf<eLqo%$0ZRy0r$IpA`ZX4S1{Z)n~
F$v+!)Y})_;

literal 0
HcmV?d00001

diff --git a/data/shaders/multisampling/mesh.vert b/data/shaders/multisampling/mesh.vert
new file mode 100644
index 00000000..22b6aeb9
--- /dev/null
+++ b/data/shaders/multisampling/mesh.vert
@@ -0,0 +1,38 @@
+#version 450
+
+layout (location = 0) in vec3 inPos;
+layout (location = 1) in vec3 inNormal;
+layout (location = 2) in vec2 inUV;
+layout (location = 3) in vec3 inColor;
+
+layout (set = 0, binding = 0) uniform UBO 
+{
+	mat4 projection;
+	mat4 model;
+	vec4 lightPos;
+} ubo;
+
+layout (location = 0) out vec3 outNormal;
+layout (location = 1) out vec3 outColor;
+layout (location = 2) out vec2 outUV;
+layout (location = 3) out vec3 outViewVec;
+layout (location = 4) out vec3 outLightVec;
+
+out gl_PerVertex
+{
+	vec4 gl_Position;
+};
+
+void main() 
+{
+	outNormal = inNormal;
+	outColor = inColor;
+	outUV = inUV;
+	gl_Position = ubo.projection * ubo.model * vec4(inPos.xyz, 1.0);
+	
+	vec4 pos = ubo.model * vec4(inPos, 1.0);
+	outNormal = mat3(ubo.model) * inNormal;
+	vec3 lPos = mat3(ubo.model) * ubo.lightPos.xyz;
+	outLightVec = lPos - pos.xyz;
+	outViewVec = -pos.xyz;		
+}
\ No newline at end of file
diff --git a/data/shaders/multisampling/mesh.vert.spv b/data/shaders/multisampling/mesh.vert.spv
new file mode 100644
index 0000000000000000000000000000000000000000..2d0a79fc927d5ef5a3553d76fa5e729080693ada
GIT binary patch
literal 2748
zcmZXU*KQP142Fj!8+z}3L+B;+-a<`)KtjpVOMn#&+U%fZ5!`{q6Tl<!RNNr(eKTVi
z1+Sdr|39{mk9{(|J%h88WL7eV-&9h_(xe9_N#-a0`8qOocWmfG_w~?`qX+a@l=S9~
z`Yh(B^r6#JX<K_PIv-t#E<%@~E6}y*4)g)~6z%2L!}^m%H8NCl)L_h$eeB-KI@41v
zY&r9$?Y~scc@BP;vR2l?gzL-CP1^+}wg!AA8|A+Br0pEy-=C}oziB<6Xm%RSPPh3P
z2wU*l?qwg+Zko06@6GQbuf36V^5S^zudTfAWbc}<a(DPz?qk2Ev)4`UVs3rCe=B|S
zwo7)*Jl|&4k1sRqzPw*)yV&%sL+riB)xA;d*59~V-dFB8X1Yf66+X4R&v1>j`AI4n
zA<n*TLKU$+6<eR!epazF6gzeI?WNe-#r87rC}-MB#k|T0k#hQv;vYS#<+$h#W-{m>
z#2n$n<4l(1ToGrD)i|+n!)V0G{fjGddA5FEQR|7`TfhC@f+~Rr3YcTxtoKvg_x*}}
zui~dAwm-|crDqLrhFE(QRzGVUU5&rBiQTV*=ajbm=@L7m*q?_TcXD5BZ{@<@ndu+<
z&dhz!vwxmvEuOcORbP4i#m+R&TaImP?2Dao<XeSpKJUMYC}%5Y?lr9Dku$g0|9iQW
z;B~BZ)LeT?ydGOw1Kz-Dt|E6aJGtOJBi@=b^bD~xjQiC~+n6|G5Zg1OKh892@GiU1
zB>8&Y{QI%2H|}&0+u4Y%@ob6p(SM}G`owv6u%n*4rER?DJ8$2R@qv9q;$ysS<GjBj
z_Y1~1udlWE4e%_nXZsxxp9Q-vKz$$Qi1r<cW6!U(Z^J#`jMzPAy%KfK?)e_X7dW}j
zI)K_^XQjWr-Ga)8&sJ=G2GQ`@hAsbtJjQHCjgya>c4F^9Z{y=EcB67iaC@-jW>vVo
zC1<}TxVin^hZ?WH`_A<{dEFaAJzpPdcFqS-->3KT-eUdYPKU8)-suROeAIswyITJ-
zu$&V0AIFxf)_<bps`a0QGhTo9tM#7(d$vB->N}8&T2Euoto00>ymi=vbEup$&P(*Y
zoJZwV#Tu<CVurDek&l=Q*u$l={1<Z(&KUDV%q47jRf%&Zn7aQ{mr-jmx4zNeE7-ng
z=V-lGQGMm@gKu0e`fv?<W*@G@$;X{;V9O~{-x#*MsziMea}&-O`G~oNEw3swW5(f(
zsrF$4EUzjN6MeW1XD#N|*L(R5xrcf$zb*F0c}}A8QBR}f<dw)By}J)*e*Ns7-wwIx
z^+RmA$o~l2cNX~{W6P;Z<o{OA<_VlR^fSNTIl0L947-}|Iap3rBHx$tTlNA@A9MMQ
K6#vHS1o{V&JDPm}

literal 0
HcmV?d00001

diff --git a/examples/multisampling/multisampling.cpp b/examples/multisampling/multisampling.cpp
index a7655f2f..9c568f32 100644
--- a/examples/multisampling/multisampling.cpp
+++ b/examples/multisampling/multisampling.cpp
@@ -570,8 +570,8 @@ public:
 		pipelineCI.pVertexInputState = &vertexInputState;
 
 		// MSAA rendering pipeline
-		shaderStages[0] = loadShader(getAssetPath() + "shaders/mesh/mesh.vert.spv", VK_SHADER_STAGE_VERTEX_BIT);
-		shaderStages[1] = loadShader(getAssetPath() + "shaders/mesh/mesh.frag.spv", VK_SHADER_STAGE_FRAGMENT_BIT);
+		shaderStages[0] = loadShader(getAssetPath() + "shaders/multisampling/mesh.vert.spv", VK_SHADER_STAGE_VERTEX_BIT);
+		shaderStages[1] = loadShader(getAssetPath() + "shaders/multisampling/mesh.frag.spv", VK_SHADER_STAGE_FRAGMENT_BIT);
 		// Setup multi sampling
 		multisampleState.rasterizationSamples = sampleCount;		// Number of samples to use for rasterization