From fb053a50111a3d5ed25342d9a57a559b69a261ba Mon Sep 17 00:00:00 2001 From: saschawillems Date: Sat, 14 May 2016 21:23:09 +0200 Subject: [PATCH] Added gl_PerVertex outputs --- data/shaders/shadowmapping/offscreen.frag.spv | Bin 420 -> 420 bytes data/shaders/shadowmapping/offscreen.vert | 6 ++++++ data/shaders/shadowmapping/offscreen.vert.spv | Bin 1192 -> 972 bytes data/shaders/shadowmapping/quad.frag.spv | Bin 1492 -> 1492 bytes data/shaders/shadowmapping/quad.vert | 6 ++++++ data/shaders/shadowmapping/quad.vert.spv | Bin 1524 -> 1304 bytes data/shaders/shadowmapping/scene.frag.spv | Bin 4800 -> 4808 bytes data/shaders/shadowmapping/scene.vert | 4 ++++ data/shaders/shadowmapping/scene.vert.spv | Bin 3456 -> 3236 bytes data/shaders/skeletalanimation/mesh.vert | 5 +++++ data/shaders/skeletalanimation/mesh.vert.spv | Bin 4956 -> 4768 bytes data/shaders/skeletalanimation/texture.vert | 5 +++++ .../skeletalanimation/texture.vert.spv | Bin 2980 -> 2760 bytes 13 files changed, 26 insertions(+) diff --git a/data/shaders/shadowmapping/offscreen.frag.spv b/data/shaders/shadowmapping/offscreen.frag.spv index 6386608c5198baa4e80dbfef70a7af4111db049c..b479d59d8593d4fe6fe3eb6b55b3eef7da1efbc4 100644 GIT binary patch delta 12 TcmZ3&yo7l|0wepzL}x|-8W#hd delta 12 TcmZ3&yo7l|0wc%9L}x|-8XNwCPs~JaDfpuvTX|7U=<6YHF4=*@GtqR+?aU2 z(h|L7n3;3W%$&JRr*_7S8PRXtl+EB2O-i{jlO`MaO7)?-7lf_7!=rr|d6SNaa0*7{ zI-{~z*Yk-dWDByieku7c5l2nVRI1M9{go5gp4)dr>jY13%l4gah!4iz*HW7F%tU!+nD4}V zdL$fPl3DZsqen$Oz_w+aB;OjOQI4jKIGv4(v3}`JP}UkFJbJ+BP0ns$+!x~*K04>+ z(aCJ?OY+PGr=FbM!O#MCNoLH)1$^FwTJ#+2otc9!4*0hazRRWlnLR5*5Br>niH
    `Om2v+#2C5~-fE1Yp(aIWT9Z)^pL?`_sxNozGG@a;AG>VI_!j6p N*9PS9e)Iw-vR?pOLT>;7 literal 1192 zcmY+BUr!TJ5XCPoEg%X4@<+w8rH>?p7&InE4QNsxYOE4@-7M`*xw34V?lv(#@fG+= zekxx~Jipt$jojvRX3or=IdivKX)PEtr{AJ!ndwV_}r>dJDqvqCUF`5BjKq~)vqG^Tg~Uql4*D1lW(VSZb!*DDQuiyC4D=N zhnGKWugLG$DCM$2oF>^|k_>Eo{PJj&^sY@!o&KLylg4Gu7^HF6jxX%Eus;=wo$~nP zhPf-;FcZ7r>)F@yE-TL6FH2p>p;@_)sT+NAd68s2JIk>-xk;MNay9MA&K&$T+3%-c zbf@lp_`V$#SD!Ds_|$C3PA-RjAKuDkk|=v7hJ84}1`f?|*ubF`4qbu6hvS{v%HUIX zCI)Ssnm~PsTb{ko@ns(i^q`I&ZS_F=zQ74_a~k@XeHvxFp;gw`V%`Og{FBnBo*lPk(adb}JF;^EJokxtH#oFV`&=;Q z_5<}zdE7fDFS$ryHZ|yDmwkb6fxh?JfH)HV>IL2i{{UDqR<{5E diff --git a/data/shaders/shadowmapping/quad.frag.spv b/data/shaders/shadowmapping/quad.frag.spv index 96d0d517706802b317a870be46578ca195e98b2a..b10648d35af65d4e63a34f5ffe8fd879db3a14da 100644 GIT binary patch delta 12 Tcmcb@eT92M3M2c*)O=O|A6o=P delta 12 Tcmcb@eT92M3M0qH)O=O|A7BJV diff --git a/data/shaders/shadowmapping/quad.vert b/data/shaders/shadowmapping/quad.vert index fe704c9c..3f7fe733 100644 --- a/data/shaders/shadowmapping/quad.vert +++ b/data/shaders/shadowmapping/quad.vert @@ -14,6 +14,12 @@ layout (binding = 0) uniform UBO layout (location = 0) out vec2 outUV; +out gl_PerVertex +{ + vec4 gl_Position; +}; + + void main() { outUV = inUV; diff --git a/data/shaders/shadowmapping/quad.vert.spv b/data/shaders/shadowmapping/quad.vert.spv index b06856d6bc0a858646f6717b366b51686ba464f4..dbaf4b667cef2cf68c1e0119e144d7a8251fc931 100644 GIT binary patch literal 1304 zcmY+C+fEZv6oz+?BA|$zQE^J~gb5)Ajfp{pn{v@a)WGdzpgU!>%rrC8#7kd6AIYck z#)SXdGdrofSzYV@_d4%s)VsHgsp&Ukc1?K}Ok z#Am_Wc6L+$*HN4RVCE$EB!Q%%UtRi-0-Cz*^~0kt$6;>AQ5F?8%&($>&BFBJo4qXZ z|9x~7C&O?QCBsQHwBf<4{c&{p-L#Zxx+a*q>7+P2mj=^AoH!`lR^P@9N8zc>&TUrM zAA({_9-F%~kBc}>s9@3$>xCR7fg;5MbIw?p3_r4ICgm=f8R&T;j+F=)8$Wx9NtHd?B?-t)R>L~ z6ZcW#nO4lU*9?YKL$ahDYe0(EYiehhY#4bpa2aeoezE!vt;YH~{Lavt;zAu}z zF1#d7t}=J|4sZzhSEQMPeUTr`zWi)!m5sm8zbTt~^v>Ss-Ou{Cx`QVlIH)+{@!ggf z^Ya7spUWba9^dGdsY|aM_`hO!`$MtpZ(hRg-s_efgOB7vpX(BOXMX(Yc|!v4eICfh zhZ(%jL)q}Zm4}!|65`0{;ASi$qgteQw#tA literal 1524 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 diff --git a/data/shaders/skeletalanimation/mesh.vert b/data/shaders/skeletalanimation/mesh.vert index 554bc03a..073de04d 100644 --- a/data/shaders/skeletalanimation/mesh.vert +++ b/data/shaders/skeletalanimation/mesh.vert @@ -27,6 +27,11 @@ 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() { mat4 boneTransform = ubo.bones[inBoneIDs[0]] * inBoneWeights[0]; diff --git a/data/shaders/skeletalanimation/mesh.vert.spv b/data/shaders/skeletalanimation/mesh.vert.spv index ed7bed7746feea86b89f1e0e34321afbee89436f..d06ec8571e07e0943df96cf37800e14eecaf90b6 100644 GIT binary patch delta 1505 zcmZ9M%WIQC6vgLD`q`isnq(0xq*O&g#6?#MVx_BY6jM+)E+j}z1JVelzBTbtwbobq zsj1Jz_oLR@q_yhKKf%5KgezBq=al{O#jI-$5IyccQ@!EQ}$gMGG}}Gi@&m8bc~WD&h_s z*XmtqA8hQXbJv_pL2_urVoTgLEVwt+hGo!9--6Pxh($kH{at za7wgWp!=QL7SViKKp)i2uGM^2z{820=bY82957B0-4EzKBM`KKrZ&-aqsw6JS*^pA@4f@FS@RKz+|k*eb0)2 z6u57GbtLK3JSU*<)$Nkxlhx*ebS%*`uZUN3tDnWu=7Ul!v1dUHKPvCbuN%$PTNI~W rU2yf5#L->GFXCuRje5&st@XYtMq8#{-#0P*sMONO4&8Jyo0Au#0TZ- z!Jxm0&T{EEx2F{J?hX2?$I4yBMlR!XwNj~(%ejoB2Q25ZQ7=Kcu&L4)5g9k4wO3J2 zADXPxs{4cPp6cOZSH#upqv@$squ<4nVEdG`Ug7B3IC_MmALH=hvOm=4#7sw&YWv`3<*sF1EB;>dwk=}u^6Q#RV}V-5mtv*H%5rv%L6 zGx8Y(eUH{bACuRfp&Jt6+`uk2xF(NcY)*XL`@}01KhVn6*@iUzP{7#WxK<{$JPp0~ zG4*ETb3)XM^~-e*USJ*1P5jPp&9U`JJ=gp<7oL{8OklJfs?w~rUx44OJ6o;wtbm4b zO>@rk0vZP6I)-V5OJ@3=I@w{Z2yOCF`3on%Ar9V8;BLxK4sc5` z9A?dq$%ji0Fb>C2Bqx|qOaUH1keuMQVm3!Zv%HCL*6bbm3!A+w4*rn8+I#Zhmguax zw(!2b=xUunvQr7J;gLYj%=pJ5jE|>@^^*ynflU9z^Jp>Sr{t?n7;T;`G#w`*K3V9g z=ix9b^h`bt!6)lHPw?al8jIKKg}`tOGRgg0;-v_>rL$?l_*e4ToQ)_7&%63spcv1g zvERcR`GLR>j}6}nXyLiGZqIRTGu;0NfqUa+rbu4vM*;qTZiynFJO__4DN~vLvwVIJ zrk|A$2QbqQ`KG>zqh^SZuJ~txjJneLRiLRk!8V!qylwJLF&w~b6Vrbemu%{XVmN?F Yza^T&y80=Sq6lerlA<4R`Q4@d z0)Gp?$}g_v^PID%J?yN>%)I;Ev*)st+Sv4?S@sB@gV~Q+xsGOI_*r%+n<(^B<7Q)K zINF?M&g6n|~8NtF|YjhpQZ`rg{@Q^^D@Io7$|-^{nr!8QM_Zs+c3 zrB8Bo%i#WKFVa*ZR)e1|_>pbuj_y6mZfSDv%S)pPoun@1v+*#5aPzIV&J zj|8ulus9z@)*N+vNA%wMUB(lOc=lbs`5MojSAF}f zZ=UYkYkkij<6Aw&uKU_2uqM!TR?%R|Jo#{oRhJ<>lL(d#5}8iHesGMw^tFD z{MXRtX5F#>2DbOR|1R2i5&ym9M{fGQ4LSDp3fevW$n`3=D{ArW7+>G>O(gi{w}P0H z_pc_~`-5Np-|px8HG7`F$UF9&eRqld3o?%OtbO-?$vIrXS3iOHZvKF!e>h>jodqyw zcM@^l&NR-QO89T-+_U(e6~D^OzEv^#_Txpw8Lq;2)>8>X?O|sUW^aNwoiOWKAw&D{ z65@IJ?$;6Tv^Mw5+qu4un78vbk8;K(9-KE5$C(Fb23!1Z;&|pQJ?|vUdgAO{!kkyscmdm(#_)`szsSeCFCyk7$2xqYmk{5%wb~1Pc~R$O zY%Qn@0< zJ(chTJWHM`H&pR|yVLTLakZxV@1E|zr$=&OXkyg4E&AK)nl4+Pxgpukv6uWlu6>6q zrg*usT$$`AYm?I#rUbiPuE3W1cDqkfeORCCLDa$6CfOkwlbn)Vl~g55lE;#Q{)V*w ztD?h-E>{|}OLL8W*bRC?5;pqJg0-;Mh*zJ7&7}Wvj9gKt)o2Hu)<)0@8`I~ex+xFH)^4%z zZ%3_XNi7z`%~)>cWfcAnY_ag#cv*e=v>ztKQhN{BYMkmvq<0k$NA4`@WJyPq;e_l~ zyHN{!^{|(Of5=Spg0t|&{U{||bfalJd{aE?B+JpCA#vt|w|qC+QFlJ-Cqbtf4t#LO zx6y77d~juktP%Y&OWo<+xVIi~A7IQj>I|S1W7dkRa7Fd7nPSXdSY6ix_c*gWZnH4rU@G~cD&hODD`?$RL(f3O$YA;C+D4zSn##fTPRXefZSG>)45e)x!?Qk(a zw)J>gesX2MDsG1SyJdsX+d+LYV=(M7W#LVL8IF(K)cRaIyoiAdHnRcSCws5M^Q?qr_fVBier(S3?kt{rUzWg$diT6eeT&cjcWm-~A|K~3>ifev zX2t^hPYB0*8$Nh5*KZ~8 zX5R2%#*-3oiEr>==ed=`@zvB7 zZ|}BbPC_4WHoPJouJD3`;di7{n>yqKpV59-LN3k`V{f}Ay((co)LWDg3(hR~eE?$? ze4ke&%wkz$@2T$bs{U(`;!8S^R6y>5(vU5(g)KbHI$# yFVf-kL}E35l@4w-8q&cKmesKM--P8k1+u{qmc<*VRbk{L4o;7?gS}VeWyuG(-Ne8E