From b5ac92e5fa2623d8a751fe72a632b615bb359ee6 Mon Sep 17 00:00:00 2001 From: attilaz Date: Sat, 19 Jan 2019 09:13:46 +0100 Subject: [PATCH] spirv-cross: removed rename hack recompiled metal shaders --- .../runtime/shaders/metal/cs_assao_apply.bin | Bin 3453 -> 3140 bytes .../cs_assao_generate_importance_map.bin | Bin 1996 -> 1692 bytes .../shaders/metal/cs_assao_generate_q0.bin | Bin 9574 -> 8935 bytes .../shaders/metal/cs_assao_generate_q1.bin | Bin 12144 -> 11499 bytes .../shaders/metal/cs_assao_generate_q2.bin | Bin 13901 -> 13244 bytes .../shaders/metal/cs_assao_generate_q3.bin | Bin 15318 -> 14405 bytes .../metal/cs_assao_generate_q3base.bin | Bin 9674 -> 9035 bytes .../metal/cs_assao_load_counter_clear.bin | Bin 287 -> 289 bytes .../metal/cs_assao_non_smart_apply.bin | Bin 1592 -> 1276 bytes .../shaders/metal/cs_assao_non_smart_blur.bin | Bin 2449 -> 2100 bytes .../metal/cs_assao_non_smart_half_apply.bin | Bin 1339 -> 1035 bytes .../cs_assao_postprocess_importance_map_a.bin | Bin 1945 -> 1632 bytes .../cs_assao_postprocess_importance_map_b.bin | Bin 2425 -> 2114 bytes .../metal/cs_assao_prepare_depth_mip.bin | Bin 4134 -> 3326 bytes .../shaders/metal/cs_assao_prepare_depths.bin | Bin 2171 -> 1658 bytes .../cs_assao_prepare_depths_and_normals.bin | Bin 9888 -> 9215 bytes ..._assao_prepare_depths_and_normals_half.bin | Bin 6298 -> 5765 bytes .../metal/cs_assao_prepare_depths_half.bin | Bin 1571 -> 1174 bytes .../shaders/metal/cs_assao_smart_blur.bin | Bin 2624 -> 2290 bytes .../metal/cs_assao_smart_blur_wide.bin | Bin 3592 -> 3243 bytes .../runtime/shaders/metal/cs_indirect.bin | Bin 581 -> 585 bytes .../shaders/metal/cs_init_instances.bin | Bin 8334 -> 8334 bytes .../shaders/metal/cs_update_instances.bin | Bin 2358 -> 2358 bytes tools/shaderc/shaderc_spirv.cpp | 3 --- 24 files changed, 3 deletions(-) diff --git a/examples/runtime/shaders/metal/cs_assao_apply.bin b/examples/runtime/shaders/metal/cs_assao_apply.bin index 14bca91a18e659089e9deab760343b3874981e28..735af55a60ee5229119a6b5508e96d4bb0153be6 100644 GIT binary patch delta 154 zcmew>bwpx<0TU0;M5DmTa*P>_mXq5V!})a-5|fiti;JzS%8N2fQYYVIjG4TTNs3D$ zI=VP9w;(6AXtFVr+hj-P*Nh>P4Op%+T5e`zJ;p2&l3GzxT9m2>)}@h_lb={(GWiaN oGEh|vmn38GW(7_QMi^(Z0;l@s1zdv20=k?3b4N2yj^tGV03d)b#sB~S delta 455 zcmX>i@mFes0h255M5DlZr}VUn;Kba5oYW#C7ssNa#7eGeE(IVch6pO;#zR@wVBwO~ zijvZzRHKymM37>ew4D6J5<8$OsDw3Ftu+@{aY<2Wa)|=S@St$d+{E-$BbWFh3#id> zGi=g?FttytEMhd9_$GXE5MvBmX=YxDvBG2nCeg`X7*$-*4OA$OFG(y)Pc2cf#jvaz zE*S!GvjWg%K#xsc%P8#&@eHQtfqK$1^AdA{gB|^$W}=1;$W*ursMO>FE)iy+>63+- zKCtKkgJLoZ^HoN(&9|73F$;kB5c~DYi!w`6CvRa_hA67zk_0h|C(q#0-7L?+&4?ka UzBz|e5KVaV46Y8w$%;J6030ZoJpcdz diff --git a/examples/runtime/shaders/metal/cs_assao_generate_importance_map.bin b/examples/runtime/shaders/metal/cs_assao_generate_importance_map.bin index a9b12854f43d434b08f69d03439e45c89460eb7d..98022b6911e88915c54601aa8f06685bffe0d9bf 100644 GIT binary patch delta 114 zcmX@ZKZkdMGE*VjMAg8_f{YXSbrcellT(X}t*pw6GD}h?FJg?D+{7fsr4SumoS0jX zlUg+SJEPlVR_0*FkjXL3GK?XcYnTfdft(L4l8nKdd08EpL_$(4N=l1T^}t4Gq~+u% PmY7VAW%rr9f?WjwJ9;G4 delta 411 zcmbQkdxn34GSfo#iK>D1PU&eC!HKyAIjKcPE{;V-iIrT{Tna!?3=vewjfb+V!NMh} z6(yxbsYWUBi6F%`X*v0cC3ZknPzh_UT5B$@;*z4$7{!}!Fgq{_fK)*osaIZUwi9Ugws~EHRnJi5}qg%C;ckiz=cldKHzGlb@x~v7i!LX=YxDvBG3|A<@Z?1XU(? z3(84By$JCLik~MZ3Wy6T*n*u64~S}zCI|#%nS?_)o>*tkmv;(xS3Jt93zV!FnT9n5Y_@QiZ}ljo(>V(JXutL z6(YG&Mg<~yQtCNWJzVITj5!M^Quq~Z86`kQK}^>xFUl-Q)rdDXGB?qyn4G562mpR~ B)d>Iq diff --git a/examples/runtime/shaders/metal/cs_assao_generate_q1.bin b/examples/runtime/shaders/metal/cs_assao_generate_q1.bin index 589df255e9f9a883539794192b884f1b22176738..7dc0dcacdae99a41734cdd9ffb85e669564b13b7 100644 GIT binary patch delta 208 zcmewm_d0Td7t>6gi9Ugws~Fq)87($52}(2a>nJ29C#Mz{TUnJCWtOB)mK9Q(TqmR| zpb#BhoS0jXlUk%I&6WiIiplaYDGzD ZQK}x;SsL-iM&_n^6_r3#Ir+U_BLE?@M9}~M delta 661 zcmaDI`5|tC7n7X+M4!NVr}VUn;Kba5oYW#C7p`h91t2Jf@D+07p)6~#a7k)KNoi54 zQHo7kPJUvE9Z()BWX)A;&Baw*QdF8;q5v{6$lo(JF+J7DCB7&o=c#>xJIN|PT8+D|SNR27DJ1I5Ra9aO~y z6>Pzdh6h76NOW?)AUmTDkR`{i0Q4O&SSA+;%1@pz!Z!JW2s*EfkZISVVh-zo-nfL0V8T~5xvRLB3`JXn=gteGl7LRe-)d_ o4Uz0uQUPn(yhUj-L~=4*s8)40D==;(wauaC2kMAU&emxF0D{ffx&QzG diff --git a/examples/runtime/shaders/metal/cs_assao_generate_q2.bin b/examples/runtime/shaders/metal/cs_assao_generate_q2.bin index 5e198bc74f6d9cc74bd9707ef9aed1b6d60b6aad..fd0ddd17dbba884b5610c5f85f6509544b4a222c 100644 GIT binary patch delta 253 zcmX?`vnPFm7gLt;M4!OTRgCTYjFy|31f?1IbrcellT(X}t*pw6GD}h?%L*w?t`kxf zP>7B$PRuRHNiEVa(2R}MnOrL*KY4>7n{Y5h6iME2vXzj_=01@xjEo_Z4aBu3uMy^) zoF=X|`H`3xLS%EAcp1~=4}$EQpGop?ff$pQsVGdAQE7m(=flPFRbgTZnWJ_jQ}#< BR>S}R delta 732 zcmdm!el}-<7t?Rki9Uh#PU&eC!HKyAIjKcPE?m`I3P4Z{;Vb0ELs`~f;gZyflG377 zqZFI8oczQRJD@yN$eOFxnv1Krq^LBxL;+-CkiTbcVtT5POMFp!QlbUaTr38J;4~o| zYJy`?QDP;~7z{(=6G1ZA+_G`&Mz%WPK7!YEp)3VGYU!tLtF_l2P5o&MwKKMrKgs_ zOu$f44ObEZiDsa~Hp>eAWMt6;M)Ty|B3d9u@#JSBdXo!8yii3qKNG2A0t;2qV9a zLSk}qYH_iZRe4cnN$O+=VWr6ng;fO01 zKv74vWnfZmvY>iBl(kE}0m9mxqG7`#ACg*8Qd*R%2XUE3aeQWOL4Hw5VqS8pZ(>34 zhN`9&p(dC951i3J$mRG4g_DKS|{Q>-4V zo8WN*G$<*tI5jxf(I4GCa5dFPib5cX5yeo9hz6=JNi0fFEdd&-1x}Y3Np&Dz#wF=KU&3EUF-TAfC~KWH$}8FooE!SqC*h^DlZrJgvpW43V5^paNnP tZ~m=27wRy$&_07rte~X4x!BB{Q3A=<@}kU=RE>CJBXd)|ipfXJ8v(z+W=a46 diff --git a/examples/runtime/shaders/metal/cs_assao_generate_q3base.bin b/examples/runtime/shaders/metal/cs_assao_generate_q3base.bin index 62cc72c83c4bb016e43b64ad230935276d863721..acf666066c8610dbb7e5f38f342a212593d677ed 100644 GIT binary patch delta 214 zcmX@*ecEk;7t>Fri9Ugws~EHS8BI4o6Od-)*HK7JPEIW@wz4WO$}CBp%qXNZIY~%W zKp{H1I5D>%C$&h!Kr=R0XL6#D{N(k*Y?CJlv-2QH8cvoIa@kxYa*vTQWO9g@7EqpZ zbC*~@kh@t{qKTC+B(!_R69vQt6>Pyyh6h45NEE1pb8?b^92?MMzz~_-C8&eTfXVlS*>D&F zl$p#g0y0PpsEW5<0b&}qAW|rf&&w~$P0YznEC|joElN&>x(h8Rt1%UZK;i|(aE#Cc zYAZ2HEJ{x;ftib;1Y~pxSP8yjehGIz(vm3ehH3h@`f( g3PdtMdMOi{khGj23!}kgU8QD-#6~62$)}YX0CB_7$^ZZW diff --git a/examples/runtime/shaders/metal/cs_assao_load_counter_clear.bin b/examples/runtime/shaders/metal/cs_assao_load_counter_clear.bin index 5099c3c6a350f52e09f3f03cb942c03e17ec1b29..37b0746914ea76f2f8013b2a788f05e1d910a967 100644 GIT binary patch delta 87 zcmbQww2*0n9^>nY`pdnG<8$&8Q=Icl^GZ^S;tds|qmxS0(o%~w3^ik8HMy#}6o3Ft ckzRaCVo74OL9BwUfoM57?TTmuM@3<#Ob g&mzefJXwb&ni0lc!4d;!tFj{4i&%>%i?FEx0Bnpm)0~vNU7NO;BvqpzzgznJ29C#Mz{TUnJCWtOB)zRDOg`5==NmqK)Oabj*k zPHNF)Ehe|kF3d`dj3JW+SS1;QC%3b-!rAZH)h1786`!2NIsr*cd9oeb3M9VlCgKspmid@hhZfuos6ucETDQb(aQGq1#Gav-PPWDibH01reoh5!Hn delta 470 zcmdlYFj07d0aGOBM591`r}VUn;Kba5oYW#C7ssNa#7eGeE(IVch6pO;#zR@wAmPbz zj1oq<@g=DhC8b5F)?BsLTwKK^MWx9l3Luk$!aZ{n(^H`)#TTVpKuiN^<3ZLov2yEV zTgI5lM;Ptvv1?Q)jxR|pN>43Ou*G3?HC#yu#5oE;*C0E+I6f(-w8%5BptJ<)MTk7A zpRGWi1{wud3$+k6R6v%&RY0Y5CNE?WW(L~2`5&V?Ba0r;gOk^>NP-x}lO32_(L^3F vpT!VSo~*|zIr$`;7LZQGkd>Xx!zK%qRRPkOXtER7=0ZgD*qbMBW3K}M^H-m; diff --git a/examples/runtime/shaders/metal/cs_assao_non_smart_half_apply.bin b/examples/runtime/shaders/metal/cs_assao_non_smart_half_apply.bin index 1259defd74659b67aaba1de06d6c97eeba775175..e14f549ac2e2c12e196049287d0bd1b3c213411b 100644 GIT binary patch delta 146 zcmdnZ)y*-%fax;xM5DmTa*Un)Itq!&$*IM~R#xRjnI)-{movtw6es2u)~=D3lb={(qEV1vuAzaXJ!CR3 WizH+4WG$9xMi_e;OVMO;Ruur>Z!xL> delta 428 zcmeC?*v&P;fQgxPqEVo}Q+irOaAIyjPHK^ni(^qyVkK8KmjVzJLj)Ca$C$lG377Ypz;rF0SH|qSE9N1&~QW;hwpP>8VC8@kJI;bD&C%Qf$(4@)Jw! zfCeITPpq6gS(-6s@*+n2dUX8?#qlMHMd_&}3bq(#SHmSkATCh=It1C(#qnvGd5Jl} z!H)h=-$CRty$du6tkeah7HSo0fPgGRH%$jw4B>{!cNib5>cM@eS6-A^lB!XVU#_8n hWClpVaF8brcellT(X}t*pw6GD}h?Z(@v^Jb_7$OCdVCI5D>% zC$(rYE0fz~N#Va+4NXyAjEHRlJ$1X9slwAb?DqJsl delta 467 zcmaFBGn0RUGE*M=MAg80r}VUn;Kba5oYW#C7p`h91t2Jf@D+07p)6~#a7k)KNoi54 zQHo7kPJUvE9Z()BWX)A;&Baw*QdF8;q5v{6DBLqQF+J7DCBDc4YAANy>>v|?+9&30 zn{3D!#a5b`S7NL%S&&I|@>NC^7j&}}isMTXi_%j|6l^i1SEs8gs9LprnucMHdoSa%*Y-Lqm zlv$EGxrQlfaul;1mqK)Oabj*kPHNHQ^Gt4&A2SCthD^3%kzowk9L18xIC&ov`{Z0U z@yUCbIVZnmEkof?U@J!98?YCl@F%cIOn%OO7sEZ5IP#@JQY%VIi&FK#uF*&XI=I9{ OBi_WsQgd<`r!oK*ok|7( delta 477 zcmX>k@Kb1lEt3i7MEm*mPU&eC!HKyAIjKcPE?m`I3P4Z{;Vb0ELs`~f;gZyflG377 zqZFI8oczQRJD@yN$eOFxnv1Krq^LBxL;+-CP`GDqVtT5POMH<9)KKiY*+C`(wNJeA znlHXM9%ycgbAD-FNovvLbBywn|1d^PZe_CfMK@ESIKCvYC_S}A!4|{5YPe(w#K8(c z$02)b@hY_2m6b5iEMZ z5ST2%ECXh2Hf2s@gb2-Hkp(e|Cx2uWpL~%e9Ya)hatUi3hG-Rri0tI$Y!A=_W*U3G ZD9C1r@AS%xGD}i5;!R8}C(Cmv0|1A|qtyTa diff --git a/examples/runtime/shaders/metal/cs_assao_prepare_depth_mip.bin b/examples/runtime/shaders/metal/cs_assao_prepare_depth_mip.bin index abb2f70a51e88cdc23f845bd778960dc1d5679e7..e068dd0bf70070937133a7cd36d39b013552f26d 100644 GIT binary patch delta 416 zcmZ3c@K17r0n;&_iAI5&nHf77`E?W$lao`6i><86i!w`6C-*QJVTkR+BK84`m=bf+ zWFNLCj3JYwxOFBcu*(5ij-2w7k8{gR-V5bfPnP0{#X;)jIU%Yd zp=N;8UIUAP)T(g7%mArvgz~H>--C#n;^wbgqm=P$_)d=|zNJJ4~lp(rN_239cm}N-3S@3|t;VdI!j536H z5gtl7%rZupHQAc^C5s*~DNeq~rZYK^MGnF#V2Ok<6xggMv$8@(FR)uoj)8GN>X*Yf z1uWK+8QGx96xg7eLFzZbL@%;=!OXUv9L^3`Ydv`*jB|lK4B?hw4!B#aC$EKZK<;7Z zguBOhb0p_XCJB%SAhD)bUX)pqsu6E$WE5=>JDHzH9fzbLNK#GG2)kAzh^#SoS!0l_ P6lX10Ef*I9LjwZ<17k;Y diff --git a/examples/runtime/shaders/metal/cs_assao_prepare_depths.bin b/examples/runtime/shaders/metal/cs_assao_prepare_depths.bin index 025dd9954131060e3705935a0ed8691267482c42..2a66b83706e2aad74e4e974ef4ea04a2d7e4b147 100644 GIT binary patch delta 272 zcmew@@QY`HGLt{sMAg8_9E`{LbrcellT(X}t*pw6GD}h?pJz0}5MyM*6f?#mmdcbg zxr8NzF=X-?7Fi(qmgSj9NNPn%X;G>k*mRAwoczQRlgX`Ywm@kWHm%9NY#R8K9Ah&F qDp40T!eh)aHs#4P*hRqVjPa^dne4$K08}Tq3w;n-RDMTRknE&XB@{IavF0FQ0r3*KEqZD`AyQ8Ft|@>0BeT%9cOo###RZ@Dc%8! zI72y1CbN98AgR@`r_(x|2+dGHR(v^5@^nsqsxk6%KP9p9H4iiIV+Z=LPF?W{Mps?5#$t}A|-RiUjwLH}-BN7H@Elnb+v#!W!b-G1tr(MQ&oy|UWql|O`7G}&U zE)>r~V$U}8K`+a_3y+|)%>+nGSe01iK>BnJ29C#Mz{TUnJCWtOB))@3rn5R1nmHW7>1VJ0I1 zH1q5xA5<2e9LvhVA01tiT2WG3l&WE>85^rJIi6XTM%C$&h!V6qIe%j6u^ zF!>OOGQITFlKAq>l#&b$O&x{e_>#mTpol@p=I5;I7#Tw*>v9-PKFuBnW=)3jzi}jj zS;mw5IAx?^27x`Mk(QI6SYo0PZ)jp^raAclrv@&0QzKK5yt<4L4g*Y0O&|)4aVfAc z1}TuAyoZ-#@LWbnkIso~&76_K92nl~Cr zO%cEJWFJ0ckxP7~2>H!L{8I&i5y8G$P%)Gd#F#9on6UYR5(|tIzu8uW70#KwTJ zEDg5-2>lat-c8PAG@85$h+hM-4wDh1-Qd6b3L>YA^7jTHyD*(L-3LrEu0v!l6qa?8?J+;IDsvju? zfYQ|n`4C7b5@D1fx>5D;yO84+WYC&Y`!1k5tVZx$#)0HZ}%9Mc$( zR5d8dn1R7Fi8-1@517Oz$1ux+8Jnw^*D*qb{Md{q$FRo2I7XA-uqMJdlVJ>_$s+8s zVjv?RL9SO`lv$Fh5pQT>X*Ri^U0vJ|i=3&EDNs%Wn>JHZ6RxZ8WLIte n%2O){G5EZE+T@#ZU%{Ns=jF4Yp?qFGb@O~hRs?S{m-1Ht4X%C$&h!VDb(om&rvep^PDuPqWA}hHQSrvYc^p9y9yoW9&MUPqM{A+1it% z*%P7c9=KRL2T;poM{yChctay&GtJ4nIMm?+#zw{<0lCR{*f=K3ayo%@iRnRX)+mlo zNi8VJ2+l7pN=^-)e2`0i@o4k!;5vgWF_=He_lxP7p7mER2M3`V` zmWJB^g#L*+?7^H1)w)U0fgp7paX$Mlq43VrPO*P!NkM5zsACwqsgNkD289?i&{dP` zn4(zpfKfa7CX+0fvH3gGaz=>Ie3pI)L!WgLOvGsN7uE!rsL|whHW@LHc8E9i%8N2f zQZ?cYjf~AEvCB=q!^VkC*4W5+5_<;3kU1REAV%?Ic@Fu>OW5NuL~Afay{F(Wg2uuywG>x>J{KOKI$&9QbljpN) cGKNe(!zw-5m6d<;e;}R5%1cD1PU&eC!HKyAIjKcPE?m`I3P4Z{;Vb0ELs`~f;gZyflG377 zqZFI8oczQRJD@yN$eOFxnv1Krq^LBxL;+-CP`GDqVtT5POMH=`SsK(>Z2CDNW&#bE zm~(Nm52MlKUdE±;LAQ&I~`GJ^9J)6jPJk*ma;Zj@hKlP< z)@Ko|R{**j-3q%-Yh;Eb=ICv0d86wP@{E9JB zRSzD*dO(-NmuIGwWN2vWAnXPyn4HA)OaMt`c~NFb>LeCh7O0v&GOOcL KWHPy!MHv8u?YNQv diff --git a/examples/runtime/shaders/metal/cs_assao_smart_blur.bin b/examples/runtime/shaders/metal/cs_assao_smart_blur.bin index 8517651046147530f6f66e495d89c9bc64d6f978..fc99d0b3b78cd3c56f0189c2730997d8e92f1546 100644 GIT binary patch delta 132 zcmX>g@=0)l0n;vyiAI5wwHSSvjEyE&FvjxhC?qB)rxq7mS(O)MmZVO;$`~{GAd?iA zLUeR-Vs1fBYSCmZCb!8h%=z%PV~V delta 416 zcmew)ctB)=0TTz;M591`r}VUn;Kba5oYW#C7ssNa#7eGeE(IVch6pO;#zR@wAmPbz zj1oq<@g=DhC8b5F)?BsLTwKK^MWx9l3Luk$!aZ{n(^H`)#TTVpKuiN^<3ZLou`-Ow z$a3Pv*vYnxF_Vul+Sg;(u239bl30|UTB2Z!!-8tKk`Rca6o76*_CRrbQch`+XI?>R z3Dlzyc~qaPgS-wj3a%DvA!^uED@SuHuifT@^gqEX;vEk<7^W5danjIsPW3W>?dsl~-sR^>&RC8?9IF~&?j#3aR~ z5FK5dm|KvOS~OXk$!)SL^B=~L$ro598G|PmvRO=?#iD`4H=iuUs*A+8n!Jcr3yE(& zS%pmpiN647`(|NwP9~5mM~ts0yklFJu%J*Fjc?Fn;rYMn*;!J)nOkGcrqp7{!yNnG-NX%qO2^ z*2NIDnC#1~q|p%*bdqS%ooKq@XCZEFix)vm`S=#mEww1#aPllhZIuvizQNlyvdyMi?D0mCtn58x~q|p%*bdmS%ooKIKH4LwJadNII|=(KhLQ&EiJWZ@@z(J#`w+07_-glWi58CV!T9V~n3{sSpYPo7o#? diff --git a/examples/runtime/shaders/metal/cs_update_instances.bin b/examples/runtime/shaders/metal/cs_update_instances.bin index f9450f7df804dde7e7fa8f4f99e2b533f2f6fbf2..3829ebb846e043fb9c0245c25a8d5e09010aa672 100644 GIT binary patch delta 164 zcmdlcv`uKk8%B|WqSUg0{Nl`#%=|p3(zLYHqIko}{}~M@8!|aezRxbo1mw0e>9OaR zmN=Id6;1xgC^7je)9%d^nYkG!Ph^%{yp4qkyCJ?Ds*~TbeSjI_%b`D6nL}h^o!I0J UENqi6u*pp>;*i6w^#n&A0H@D8&;S4c delta 135 zcmdlcv`uKk8%Eanf}+&2$$Ob3CUY^VGsaIgWO4wKg-oK8Pcv~%p2VaAo!I1cENozbLJm1J IO(!_=0L4=*Z2$lO diff --git a/tools/shaderc/shaderc_spirv.cpp b/tools/shaderc/shaderc_spirv.cpp index 0463cbbb2..e704568b0 100644 --- a/tools/shaderc/shaderc_spirv.cpp +++ b/tools/shaderc/shaderc_spirv.cpp @@ -844,9 +844,6 @@ namespace bgfx { namespace spirv { unsigned binding = msl.get_decoration(resource.id, spv::DecorationBinding); msl.set_decoration(resource.id, spv::DecorationBinding, binding + 1); - - // workaround spirv -> msl codegen problem: same name was used as struct type and function parameter name - msl.set_name(resource.id, "_" + msl.get_name(resource.id)); } std::string source = msl.compile();