From 852f4ad31447ea3ed043c5903a0ac153cf6195e7 Mon Sep 17 00:00:00 2001
From: saschawillems <webmaster@saschawillems.de>
Date: Wed, 2 Mar 2016 19:58:06 +0100
Subject: [PATCH] Fixes for examples using push constants (now working fine on
 AMD too)

---
 data/shaders/pushconstants/lights.frag.spv | Bin 2232 -> 2264 bytes
 data/shaders/pushconstants/lights.vert.spv | Bin 2952 -> 2884 bytes
 pushconstants/pushconstants.cpp            |  10 +++++-----
 shadowmappingomni/shadowmappingomni.cpp    |  10 +++++-----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/data/shaders/pushconstants/lights.frag.spv b/data/shaders/pushconstants/lights.frag.spv
index 8a5f695a76f9760b7a2f3c84560de87c0c31337b..1b4485dea34e800eb53550896149b7b21160d464 100644
GIT binary patch
literal 2264
zcmY+EYjYG;5QY!g>;iI^n-|axQM`aLK!_-ENst6^1r3UKw}xa{7Q!yIyZMe~QROE;
z`3v|5`~`lLB~)4E^UO?F4U>9v`t5$Z&pACkTbr2PoYE%#wxr)u@$5+x@RYWtM!qh$
zZnkDd<F%Q&)3Yjerdlpkvny>)ldR%F*6SOX2j7EVz^`C8dgEI_jlT)jXCzOOyWDCo
ztSq)iorl>l8+Y2HyV+W2*dE-z*I6BpUe*xm^}Fr$tl!<px}Emi$=Qe5>itxwQg#12
zp6%?h-s|2SUmC0rhAG!f<6G<9xwA3qz-#F!ya&ubp?-x8Hb(GzeurMaWrbUv)k1SF
z&mWCha?Q1pFJ-IaVvk0C@4?1+X_$4(oeQnK==HA;h7Yp!B7ZXPO|M_bmN|ocdkffI
zxjmHo$gNT3_Ev5`_wwI$D(`UNJAmE5*8~U2=SAn-`upL&k0$UrR`RXb<{W~*!fKAb
zCVX4T^_#yV_d7jBzI-R}v7U8y<?PXg;Jb64(s82J-cxGy3-@`I)tE5Py8D3pMBaXE
z_11R{-9c>o5W3gOcxXfS27dbxx;L?-mTTw^V>?@+v)@sxs%zq}S9DX@#-nEBzk|>G
zfcJeD?p?iS?E4Y6{oBWFW?0qDvZ~Xs&h;cn>B*w+_Y{^s&+Ge}W7QY$?=-eO)PI(^
z+?ms7J?G&JurKcSDXTGS$}g1Mn(|w$YUS3GJF}7hGq(Aj*|^*p))(9vme12Y-<xOm
zvBtl6?5SF3&u=<vIU~~*ZV!)ExV`e54!zv(x61u~<qPa$y}iIaoZ<7FK<<1-`~bFb
zXVJLaIgI%0*v6ef<8tRO;)k$}JA20E&RxXc#y0NE8J9b65kG=$ya|lUr%KyiI9vMd
zgLimN|K4M@kFNjF#}8OP1U|-(u^M+hN8A}a4y^H%zBqdymp*6m1seJLz*^>NNA4%s
z<}NTb&d+CH9_V+r)HPVo0%MQaL;g8%mi2oF-<`gwdmg)}ThHh4BHX(A)i{F-;9|+W
z$0DfaT!NdUKXSgn*8g{Tj?38A(I01B!uCAdnHJBw3^oC0PQCHaUcpxTXIbwmwtD^E
z%Nf)c`Y&@kr9Vo23+``*e)Z0%KK0(|D-d^bX0HQhLcf~LtT%xE*yC$#>-@zY#=ik-
z^heGLwlnm5skw=*Pp#)Lrq7viethq)ajtK%J=Y`hJ?D2oUwkXZ^i^ll`HB61z;+M0
i@A60BZ^;dQz2rZYK6R6z4jP~aJfB)M|M6zdfd2tRPM7)s

literal 2232
zcmZ9MZEsX%5QZPR-38>OlvhR6E!8SeOT~h`h}Z%x;0jm-d`mXRc3D=-F4^6F#~2bm
z@rhr+KkzU3ql}V}cwOh5NmfrY%-r|fGtYD8%u*Sf-kQ=D{<fu`Qt?ctF>p#dQZ4r@
zjXRCG!Ek+U;q<(U-Kmlb)l8)AX&kRT$~s*WKVUy%3)o$34|?<4unK=;_&+Hgr*@^$
zTwGmh4qA`1el~112M@FLR=?T%`Ipw(aPVIZsZO`u+{n7^&8*#OE}WWwoUQ$us&pDX
zzY4RHGd4Qyhr`Rgjb1<HnrXQ8&VvV=gBG}wX22cH`jhHcIbd@DuI6{|bQ^ZK*IFwy
z7xMbS5SMGNm3TQ@8y08O^7rj+4ww5`yF9tjI+ITKX0QJ!+bHVC^BHxzg=~d8IInjx
zrz>`LVjr<RMzJ#%JI{UmtDnjzTyO`8YjAb!5cPcM9NYf@*zZxtd`^^jJFzuKz;EEK
zk*kAulvv*ST{-Xe6!qfWn2-JJGm)bwmjds}aZ0mf?LAp)<TcOPi#MlPXW#vp=S1BB
zV)gddhwc!ua|qp=Wj?f_I}Gm}LiaXt^wNj!9b$JYbj~|^jq2*~)e+qkvH9p3_3y)3
zALjdh0QOyd&p7u4vGd!{+sxwC&EeI_tJBY8DZO0s`+h<s=Y9Qtr|@#|{XQjjhVmE4
zi`_Xn`?(KiFz4cVpW)5fQ+%<+_7s1MS1Y!k*qx2~?}@GV&gRALuv}nwSbT=*`Q5y`
zk3If|ai(hBJ%7{D%N>~>!On1I1Usvf|HJ-%qu#u~U-2TR*l!=^8Sd~G+(0~uMgAbM
zd3Vvg*gcH=Tg2wwLGxnwFY-r-&AWT%#qM3?-y=5f&Y2gxZ;?MrY`%_}7f+S3vv9ZM
zorCZ25A*vF?;Q0PnWH;)98>cL?>&qExa8cqztDVySMT!*Z2lM~Z!hEMb(+{-i)@Me
zau#!^<lQB8HT*fu+*8gJpU2!?dGGAEl8e5d6Bm7}aB7Oa@@m|<OC=vQUxG(#7Qx;{
zK5CYT<zJNdxJ+yxc{Sec3g&%wvK`{9*cQwkQ*S=B%fxD*mHk$T)yw-{?wnlcuM^At
zUg~cUPhj%u-AOt1eygvr87y|7LF^95tJ#YG8k3JRZW7z)IcJ!^g{hH`n%l(g%x|UU
z8)7-N-ou<+++&s4dptq!z3yOg@mnw_H@b7~OPqI)*q&m)-F?jeD{k?>llZ%mQ#X!P
Su^LvvypLKnulW*Zv3~(8$dX(D

diff --git a/data/shaders/pushconstants/lights.vert.spv b/data/shaders/pushconstants/lights.vert.spv
index 044688c7480ea7a335f0d3c7475b4c9151fc5f60..c1886cd0abe90cde1cb806617696bbd62a92dc47 100644
GIT binary patch
delta 1098
zcmYk4+fGwa5QcY4Y4HHD(NGTr5fh>zF;P4qP^6-TD%t{yXN^%JBtn(8@v<h~cq!?%
zmp(w#2QV={lc&VQ@7wHc*gJn_=AT)!W@gRD-1q)Z1HIWG84LwMpgggC<n-u%j37vX
zjpyr|>U+RG&<pxNKNtbUcH?UzKZW+Ly7l^HrCLJ`y7`O9YNNie{%Wnhvic(AN^q4%
zZEd!?S*sJ7<}bD0CUbo^@x1x(>3mCWB}!%(1YKZ`YUYt?Z~)Ac&uo4tcLXtAA(zB9
z-kihwI-gTN6U}inj~}AT%g7-@CXpFnO6}`NuR8`NBil0M2Cyx`*rQ-Dx=zlsH;|6W
zvOKG833B)+f?JVcf>8pp$os(LCU}4}*dnzbBlV?Q8=0|gOP%U`$t)*Uf8acic>(zS
zrlX6<Uy;n?&tYEzXF;1`+3`fgIf*~SXpaGNc~-qZ>~UnimF+p$oK_2w3g>hMeFQ8L
zWtlTT&M)Q)=yHi&+|`KlX)0uL1hZfU7_a{n*e0*OYk<3(VbC;FaKj|y*5=S{Ew&dT
zyFgja`8II)hk-uhOk4)~%0W-qP$lBz{Vdudjn4$jcD2*-2P$(@mVk%koz)p6Vd1)4
zRD98$h%fV`UVInGEw$Qvb4^dk#O1G`?{4Q_WEZ&8wRi~PcJ#S6p7jkL0sXe_$~*x@
xU{2#4pPX@S3R|-nKDX-=7w{C_0^ZY-tMd%V4FePClQY3Nr0e3^{AFU};2+p&V5k59

delta 1172
zcmYk4TT7Ht6o&Wc9I_|^ON+wF3kizA%rZ^$%gIA!Gm~jqnMj!mHijB?6BBgPWit2u
z2bmwxP5+~R(FuZ{r`ccl4e#u|-gRDkeeL+z`RU}&`JTQ*!7mG5F0EC)_kaUHO&d4}
zil75L1&h1yzGRLLa(lC}x&FMovBfpy_!aAwmi8CpNafdCt79A0t!;F9esX^6Yb&eU
zdpsuLUhT0piaA!+7w48Yx0l~e6=CvWvB^ylajE)j8Mg7cWixZey1GCsn4pUjoOy5<
zOyW6S@6ERNo4o~SVa9IYr))O6%|+Qv%K658_D806*(*3gfGeD*ak<J_047l$<Fo*i
z4@KF+<huAby*h0tI322-w#t?yr~X#F8~a?y*1zR*v$NcdrG75ztx0)4>QZ?DIRiR@
z@s({+E|qODQ*SHu<?LjzkrZY!wPB2P>Ic1Gmx<W$K;#_6cWnANF9N^c$m%Zv`JW8Q
zdxGyN&LQCIIB(-0=e!2wl^x<R=n0_~DmdB2NF+J_bJrth7pdK7<b2pNp`2I(^w)kA
zoCQ0?Rd)lJylK-KTwu9o<FycOBG`F4iK!?jl;yMB20qm>piVmj-vR1MVc)-wrXwfs
zXVDg!c6^sR9fuDT<^)P$+R9Wox(l3T;0{?-ny3=_65C?pdqA#KU)bMS(?cdLe}?<s
zcJ4<xA*oyR0Hp1xbIbJg4ITpZw(f>K0#;*8?MB!~IqhP;Bs@ki;d@$elb!&%ZlHrY
SxnE4f4RTxDnm<fv0Q?1FgJ+}w

diff --git a/pushconstants/pushconstants.cpp b/pushconstants/pushconstants.cpp
index cd795dbb..5e01c6a6 100644
--- a/pushconstants/pushconstants.cpp
+++ b/pushconstants/pushconstants.cpp
@@ -172,18 +172,18 @@ public:
 #undef sin_t
 #undef cos_t
 
-			vkCmdBindDescriptorSets(drawCmdBuffers[i], VK_PIPELINE_BIND_POINT_GRAPHICS, pipelineLayout, 0, 1, &descriptorSet, 0, NULL);
-			vkCmdBindPipeline(drawCmdBuffers[i], VK_PIPELINE_BIND_POINT_GRAPHICS, pipelines.solid);
-
 			// Submit via push constant (rather than a UBO)
 			vkCmdPushConstants(
 				drawCmdBuffers[i],
 				pipelineLayout,
 				VK_SHADER_STAGE_VERTEX_BIT,
-				VK_FLAGS_NONE,
+				0,
 				sizeof(pushConstants),
 				pushConstants.data());
 
+			vkCmdBindPipeline(drawCmdBuffers[i], VK_PIPELINE_BIND_POINT_GRAPHICS, pipelines.solid);
+			vkCmdBindDescriptorSets(drawCmdBuffers[i], VK_PIPELINE_BIND_POINT_GRAPHICS, pipelineLayout, 0, 1, &descriptorSet, 0, NULL);
+
 			VkDeviceSize offsets[1] = { 0 };
 			vkCmdBindVertexBuffers(drawCmdBuffers[i], VERTEX_BUFFER_BIND_ID, 1, &meshes.scene.vertices.buf, offsets);
 			vkCmdBindIndexBuffer(drawCmdBuffers[i], meshes.scene.indices.buf, 0, VK_INDEX_TYPE_UINT32);
@@ -355,7 +355,7 @@ public:
 		// inside push constants
 		VkPushConstantRange pushConstantRange =
 			vkTools::initializers::pushConstantRange(
-				VK_PIPELINE_STAGE_VERTEX_SHADER_BIT,
+				VK_SHADER_STAGE_VERTEX_BIT,
 				sizeof(pushConstants),
 				0);
 
diff --git a/shadowmappingomni/shadowmappingomni.cpp b/shadowmappingomni/shadowmappingomni.cpp
index 5cbccbf9..7758b281 100644
--- a/shadowmappingomni/shadowmappingomni.cpp
+++ b/shadowmappingomni/shadowmappingomni.cpp
@@ -459,6 +459,9 @@ public:
 			break;
 		}
 
+		// Render scene from cube face's point of view
+		vkCmdBeginRenderPass(offScreenCmdBuffer, &renderPassBeginInfo, VK_SUBPASS_CONTENTS_INLINE);
+
 		// Update shader push constant block
 		// Contains current face view matrix
 		vkCmdPushConstants(
@@ -469,11 +472,8 @@ public:
 			sizeof(glm::mat4),
 			&viewMatrix);
 
-		// Render scene from cube face's point of view
-		vkCmdBeginRenderPass(offScreenCmdBuffer, &renderPassBeginInfo, VK_SUBPASS_CONTENTS_INLINE);
-
-		vkCmdBindDescriptorSets(offScreenCmdBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, pipelineLayouts.offscreen, 0, 1, &descriptorSets.offscreen, 0, NULL);
 		vkCmdBindPipeline(offScreenCmdBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, pipelines.offscreen);
+		vkCmdBindDescriptorSets(offScreenCmdBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, pipelineLayouts.offscreen, 0, 1, &descriptorSets.offscreen, 0, NULL);
 
 		VkDeviceSize offsets[1] = { 0 };
 		vkCmdBindVertexBuffers(offScreenCmdBuffer, VERTEX_BUFFER_BIND_ID, 1, &meshes.scene.vertices.buf, offsets);
@@ -820,7 +820,7 @@ public:
 		// Push constants for cube map face view matrices
 		VkPushConstantRange pushConstantRange =
 			vkTools::initializers::pushConstantRange(
-				VK_PIPELINE_STAGE_VERTEX_SHADER_BIT,
+				VK_SHADER_STAGE_VERTEX_BIT,
 				sizeof(glm::mat4),
 				0);