From 9cd109e67ca7fe5269ec6966e0da70cd87983c2b Mon Sep 17 00:00:00 2001
From: Dzmitry Malyshau <kvarkus@gmail.com>
Date: Wed, 17 Jun 2020 10:58:30 -0400
Subject: [PATCH] [rs] Remove interface blocks from the water shaders

---
 wgpu/examples/cube/shader.frag.spv          | Bin 1208 -> 1208 bytes
 wgpu/examples/hello-compute/shader.comp.spv | Bin 1576 -> 1576 bytes
 wgpu/examples/water/terrain_shader.frag     |   8 +++-----
 wgpu/examples/water/terrain_shader.frag.spv | Bin 804 -> 668 bytes
 wgpu/examples/water/terrain_shader.vert     |   8 +++-----
 wgpu/examples/water/terrain_shader.vert.spv | Bin 2496 -> 2404 bytes
 wgpu/examples/water/water_shader.frag       |  16 +++++++---------
 wgpu/examples/water/water_shader.frag.spv   | Bin 3520 -> 3464 bytes
 wgpu/examples/water/water_shader.vert       |  14 ++++++--------
 wgpu/examples/water/water_shader.vert.spv   | Bin 17708 -> 17624 bytes
 10 files changed, 19 insertions(+), 27 deletions(-)

diff --git a/wgpu/examples/cube/shader.frag.spv b/wgpu/examples/cube/shader.frag.spv
index 95a79e2e150d21fc6355879051a320e20d17de58..f41e3c9ecc1f4afb329f0ed1d0db1806b3db0900 100644
GIT binary patch
delta 18
ZcmdnNxr39FnMs+Qfq{{MWh3W$762fE11$gm

delta 18
ZcmdnNxr39FnMs+Qfq{{MeIw_3762fT126yp

diff --git a/wgpu/examples/hello-compute/shader.comp.spv b/wgpu/examples/hello-compute/shader.comp.spv
index 972544e0f9087b83fd9fb907d1c896aecf817a1d..417dd3c5ed8594a4f69086fe183b2d86d4f4a937 100644
GIT binary patch
delta 18
ZcmZ3%vx0|{nMs+Qfq{{MWh19N8vq@o0)+qo

delta 18
ZcmZ3%vx0|{nMs+Qfq{{MeIutl8vq@%0*C+r

diff --git a/wgpu/examples/water/terrain_shader.frag b/wgpu/examples/water/terrain_shader.frag
index 0c903b2195..895b179023 100644
--- a/wgpu/examples/water/terrain_shader.frag
+++ b/wgpu/examples/water/terrain_shader.frag
@@ -2,11 +2,9 @@
 
 layout(early_fragment_tests) in;
 
-layout(location = 0) in PerVertex {
-    vec4 v_Colour;
-    // Comment this out if using user-clipping planes:
-    float v_ClipDist;
-};
+layout(location = 0) in vec4 v_Colour;
+// Comment this out if using user-clipping planes:
+layout(location = 1) in float v_ClipDist;
 
 layout(location = 0) out vec4 outColour;
 
diff --git a/wgpu/examples/water/terrain_shader.frag.spv b/wgpu/examples/water/terrain_shader.frag.spv
index 33e27fea0519fc910a15468077c1a083d729f95c..aa54ce6d05ee1d40b2f3b3d4e8600786499d679b 100644
GIT binary patch
literal 668
zcmYk3%}PRH5QZo9lx3ObUq28=%RpLG1W^$NZrpVN5wsC3Beivx)w-K1qM+wFdBTx#
zX5N{3zjrjB+h2-Uh(Z)&C;qG&Igp4_ET*y7zv*|zll#um@u3st$ftwOtg}}j>JN8=
zM;k?a1Fz#1X6^CFf4)qf=aVD8Ly|Btzn_4}@p9W84xX+D<B2m#$~l@&x})J}`b=NU
zH<-(y=)vUfF0MXnwODJ`?qqch73$ba6-Ami$rr)esTWf1a*3U>?=8L|c0et@f@^gc
zO2ig;g=o*)+I&}u{&M2-SgTFUevK$+*0)yc{5wtRh}X*o^DVNrC8iGRO+4e<n&oOZ
z;kWWmwP?<Kf+WOqP-pyKyz33r8&+qSw|%ftCTd^I+groM<T3w7skxY(-qFCl;evf{
VwZ4L1ZQHn*n(bSA-w!;e_%Bh3B}D)L

literal 804
zcmYk3$w~uJ5JjJf88n(fqj8KaE(LL+B8ZA8WRry;xD~-H0?|kYap`Bd_NNq4@SLPO
zSdZ$ex^-U-uhXfWTnJMk&)E)Rse}|r2!)Ux*+%oGxz`^&>>V8L%P5BQh$yENa$y>)
zKHj&VOw6J+v<y$21`~e<Kg~&DKPZra@&9fHBv0<T)w^x=2CY~8EJsXvxx4Iky2GA+
zf;$Izr~Q1@?hmY)9?c-fdd|`v4ki~H<gMon4Z1sT9aW6wC-EXIdE29@$9I<TvtSWg
zgYSOE?osD!?F5U6-Psw%PvY2~VoSsYY!t`4aXc5t-k*<sdzjajQKias6|B5vtbfMd
z_Az!Bv83(_z9N4W>kRUfx*PZ*yq!DOCSGKSm^b!atmpl$*ms^I-r0BZ4HP+FAQ|ih
zUw0^??(J@;Fuhko#oyt$$3l#`-zQb7SmhhOxkXgW+WJ3ipf6@0cUnX3<F58`zjajn
YjGDfQv3z%k(Bz++H})NVseO$80iX6Of&c&j

diff --git a/wgpu/examples/water/terrain_shader.vert b/wgpu/examples/water/terrain_shader.vert
index a87ddf4579..aa3d12a727 100644
--- a/wgpu/examples/water/terrain_shader.vert
+++ b/wgpu/examples/water/terrain_shader.vert
@@ -14,11 +14,9 @@ layout(location = 0) in vec3 position;
 layout(location = 1) in vec3 normal;
 layout(location = 2) in vec4 colour;
 
-layout(location = 0) out PerVertex {
-    vec4 v_Colour;
-    // Comment this out if using user-clipping planes:
-    float v_ClipDist;
-};
+layout(location = 0) out vec4 v_Colour;
+// Comment this out if using user-clipping planes:
+layout(location = 1) out float v_ClipDist;
 
 void main() {
     gl_Position = projection_view * vec4(position, 1.0);
diff --git a/wgpu/examples/water/terrain_shader.vert.spv b/wgpu/examples/water/terrain_shader.vert.spv
index 6504a274d63891d82f9f7bd0b8cd43474219a7b0..587504e4fd5ae09fff201c4bbfce0587f62a3470 100644
GIT binary patch
delta 810
zcmX|<$w~uJ5Jg{S(1^r^B0&UETqwi=)Hr7{(P$i!c36vui$EN3TDWOkxD`VD5y`@>
zzo5UMA0bM>d*W*!Twc|!Tf?jF*PhSrXfQC`Zj56>CSne1(Zoon;e>?Kqskd}ROk~X
zg&AR4C_bNDITN>sx%2Az&7}wvRt}M4%Y?-g<x5koT;wZP*Y%0OS3J}zF+he+!6xAc
ztWOfY)7TDvINp*ZLvraH6yoyRbk7Mt-*;)>pO^ps=BCFKjmcgR`UP~v29>v@+Y$6)
z*?&GW!%-)qJ1@`&{i-pkR*;4e>o$l_0et552kVku7AT0`Z8XC#j+c--F5GJ;q|OR(
zQ^KP-=3Nw+nOIV(%$O9IucXP)q$~%|p$%($ur<=Mse`U;_mDBBJ{{>zWW}K$70_h_
zzt4(n_FFO?t-d+gaM^k-67z__WYt9*F>3--u_-F>qJjXAhNWx><e^DvJ@{zQ^O8-0
zf6A4f{4LAr`scR)IIlIfFWj+0o?X_ktf?eWfCS=vb_Q{E?+QHvU&Vj!p5>ox^L_c$
QfM-~~C|pyW=S{#dzbiIF{r~^~

delta 902
zcmX|<PfJu$7{<??>(nGnK@w7d7%mD*f=IK>8FehP(wRw{+)2bN1}tN=h&Druwt<Xa
zL|nM_3$&=OP#+?Spx^J#xt-zRJ@0d#_wSvb=TAn;X<_1Y2uUdM+uSctO$-Om5P1Ev
z^TvA_Tm(14G^iYQc9T}4-EFnId+iS}r}*8*dfso<cD8rkb-m|&GT^s6Z<ji|dm$7<
znq^W`q*ev{DvRn57k*t$vt$LxWgaa#20Z$T^$SOn>5rs024!ugpk4^$_*2*v$j?UK
zG;-JR)!hYuet)dy{yqHf-<s7MypD381($(3-^@FQbrx%x7k@45N76(k>@u*B0gtf0
z<&8awZ~E%bVpoA0_3KApi^oat4(=rQ#CDX<0J&S>3!MGk2lnXO9HI791+J$~BWmV>
zobXu2wSJB{7Py;d9yH?Iiy`#W(uI{8oce1(9Xz%eu3(pd`#cBo+7BXM4`;Go9^%W@
z`m3eUo)I!;a49RmPF<E6oboY{U%+!wPeEQqU4^yEsWZk2*MR@cCV9<Kj~wPd*9f7P
z2^}XFHlxsWG-%lMJp(2n0Nvp8+weN~4KM=yTKUM&BYzN!xA4s&Z=6HC0Mp^pAkYaU
K6#iwqGvFU*07`%W

diff --git a/wgpu/examples/water/water_shader.frag b/wgpu/examples/water/water_shader.frag
index 5ab3787b6b..0d704e33be 100644
--- a/wgpu/examples/water/water_shader.frag
+++ b/wgpu/examples/water/water_shader.frag
@@ -15,11 +15,9 @@ layout(set = 0, binding = 1) uniform texture2D reflection;
 layout(set = 0, binding = 2) uniform texture2D terrain_depth_tex;
 layout(set = 0, binding = 3) uniform sampler colour_sampler;
 
-layout(location = 0) in PerVertex {
-    vec2 f_WaterScreenPos;
-    float f_Fresnel;
-    vec3 f_Light;
-} f_In;
+layout(location = 0) in vec2 f_WaterScreenPos;
+layout(location = 1) in float f_Fresnel;
+layout(location = 2) in vec3 f_Light;
 
 layout(location = 0) out vec4 outColor;
 
@@ -30,17 +28,17 @@ float to_linear_depth(float depth) {
 }
 
 void main() {
-    vec3 reflection_colour = texture(sampler2D(reflection, colour_sampler), f_In.f_WaterScreenPos.xy).xyz;
+    vec3 reflection_colour = texture(sampler2D(reflection, colour_sampler), f_WaterScreenPos.xy).xyz;
 
     float pixel_depth = to_linear_depth(gl_FragCoord.z);
     float terrain_depth = to_linear_depth(texture(sampler2D(terrain_depth_tex, colour_sampler), gl_FragCoord.xy / vec2(time_size_width.w, viewport_height)).r);
 
     float dist = terrain_depth - pixel_depth;
-    float clamped = smoothstep(0.0, 1.0, dist);
+    float clamped = pow(smoothstep(0.0, 1.5, dist), 4.8);
 
-    outColor.a = clamped * (1.0 - f_In.f_Fresnel);
+    outColor.a = clamped * (1.0 - f_Fresnel);
 
-    vec3 final_colour = f_In.f_Light + reflection_colour;
+    vec3 final_colour = f_Light + reflection_colour;
 
     vec3 depth_colour = mix(final_colour, water_colour, smoothstep(1.0, 5.0, dist) * 0.2);
 
diff --git a/wgpu/examples/water/water_shader.frag.spv b/wgpu/examples/water/water_shader.frag.spv
index 7f22caf2344adcb2b2281adc4ed227217d6cda6a..8eb94cfa6e4f400fd4c442269b621bcb15e3915c 100644
GIT binary patch
literal 3464
zcmZ9NTXR%J6os24Ga(lU5C|7boFs@S7(uy;gv1CzjV2Hw-Vc+^ndIPPW;}BO7;m90
zt9<kopZqD7zW5-21mE<<vP#SK_4Fo3I<?Y!t-ZT@_wGJDogJgy&TVmBZmYZJ+HI%n
zkm6jQEBbzVW`1U@l~u-0o;ps%cGu|xi5YOc8tXh(%Sj!_G2ta)QK$$tVTZ;Lr^RG-
zY6a(h)&vEq=r*>Xh+grm5!I4<Tu!4(+{{*vR8O4uu|4v6MSVf@^s8Tw>fYYv?O1lV
zdrEd1S8MT7mNe?oQlr*bOZ}LF8~LA)d5Z3^w02O`Dz7$cv4WY0y;P%xau%oaOKBX}
z=Nc_Z@)g_(_08mNTx;j(=V9N=wditMUY=?+QnoL>%bg^)oR(KTFS_&UHD{`lh0*Qx
zUU^)PviPnaQ*cx2uh)}mBVF}56g4v%ExMh=chnd4hsN1N&9rf=T>z=wUZ?I^vKmLN
zWIc}VB$aICk&jblnr0)-qLnyVUdgmVr@JJb#y+m8-`q!+yCGglTABIZm$6h+1>=h1
z3;qr?*0L$ppYnT+qEuC)xK)q28`S?6T2e39Hjherm%lsJXeQ)RbWO$i^UuXiD~>Y-
zG~>gvsRNwz&HLf_*)x95`Jh09bB=w&K;WE9emtD<9l{mG+c^|G-#nL5aoQE_#$xye
zc6hBljvVvj;EbCPY#iF=xb|GEP27fHah*Z?Uj4Lo$C|{kC(dz1pc!WmH29+Wd<{4!
zIBVnQtl-QysQ>iCT7xyQhh!Dimpr<BzT}KHtnpiejdoNVeVd>*VVt@+w{g+<pyz*I
zGQQjM2UEs}JpW~CujYGFHgl3sNt|3+3w^)q@p<8AKlx^yF~h-8Qhz@1k)R#WE)U5j
z?&+YxiGv>w+7rs)i0qO;UeBp#U24SGqw2Q^=!}JP|ImmZQ%`)CK>Um9@u3qB=YFE?
z5kIBAB+#e}{Ip=}osmr}bK0J`zqEade^otmv)(~Pac9s>XB>IFrk*+RGY_0Qg+?Bi
z)t3a;A`keqfZy`EBHPaA_26TEi=PR8i=P*#!HN68vrYb?=RZBVFOm2U_wP@TZ&@~L
zS>51^K_h?aQW40P_?6&e9r!1~$NeE5&No23<-?=)`@@Ih##`cl{*hihrfeC<!${7=
z;j_3k+0OkqVVpPq!EZB<=K0$DOOxi`@ch@Q(|ReWCuc=te}73Ss3%A6JimS1dpJG6
zQ+dvBQJ(W#l;_tT<Gk^CKX1Ho*5mEYbKYq91+8CFKPrp_en|Z@!eQZtvgSK^Rv-qQ
zF?<)#3w#p`isAfT5Qsyc)k{Kcj|=F4#<@_NaaDyH;GfiZ&iSmsH^X<q8l3St0iAei
z0zapCd@l>V0y=(bh-Q1bAe(Op&Ys4F{GKj)Ut1@JJxmDXFstgY$4Ox#K%LKjQmgY_
zydm&yO$&T8mh+pk@v$%B-V%u8yRn$JgFdGi)|nL;hyGpA=47)zKCAIn+2oDyYN*3I
z-qt@g>cHJVvpQXu-7BEu=PsdHE(@~JjK3?JT7DDee@`|s=#1yCp;`P#veEi==A6sN
z0_V&ed{=z`#PqAC_-_jM4+z9Y0`qcbZwfZ=l58~Nv25M~%d0AThk*WV$aPsZ<M2^`
z-it(76gVT+ffL8P+|gBmH^X>cHh1%$#^Y}Y#Go_&R?sZ|Q*kuQ^S11KJ?@BGJ;;}L
zg&52EGug!473NeS)?63R4b&F>bAh?W1lG+2V#%wi9>3-Fg={o9@m~tmVOGDh@UMbK
z9B)-Y;Cwm-<|CGvf3)IRfp-l*cZs%DIHS03^*sV_T%US-)B0uOGrlWutJ8LI##tQ(
zWN#DD?TmNIMyGD%#GGh0#~#^eHpgDsXhVX{u}}7H0UzHMd)O}w3iz0p+|X>^1G3Tn
J)t<1~|9{qV63+kt

literal 3520
zcmZ9N+j3Mz6oz+5GU0qaTjB&1Q80>}MIbRk0HX;apr~xd$)03zG81=(fbkThtn$)F
z@LBZ63waT|(;LewEx)g4Hw<*@Pp|)9t5^40yZ4^nWqSsaq$gR<-~FUBHYCeXl4Mm<
z3iH_b<?*5U_SDefBd-~;Ht7w4#;jvqAG4UP)SEh90mnfVtS43<n_%^lIZ1wDVLxj3
zntmcy;%m3kM!lI;@^mVjYtQVf9XuIgSKtc@b3b`jGcTsiU~dd|hCPrxhn;7&MpkXt
zTg|lEYP4?WVNHLs`w5?UO37ZdPEa~unVoB71o!i|AAK^*uV#5WyNg|-PBlj@y;f;w
z`Q>V!WzEUfyjqDr{r04mp3AfOX4VLLCzo~C(((HAOq=X|p+~j!Lg<(K9mPLazne8W
zb)%F*52qU>t4xo!TKN<qVeJWHD|ux$@KQ3&%z1L!U#vE6AQ^dDPdl}^-+6pjn)O;M
zpDoVc(U6mLp`P7gwkG4ODV@t(w>nKl9SFKLwd=E4I$vMR(mVC3_RJ%nH^ek^t-PJi
zWJTS*$whRBJ-EvJxQ@Q$I((`=-;Vwp7}W+(C7U9?KisF*?e-|o)JKX^O6+m1-mEkp
zKkA?x5bjHtKE|Hj0pW;z5ZfB%-iL0#T)*{<@!w}`-Nt&)cL9goJHHC7EBFX=cP_cP
zTz{T;d+X>2=lLJ`o}fOd`TndAah-KN*xl>ot{Vn1m)hfXo&4@?+!Ba!)~5Coutv{e
zoHhBpb^}M`*5Hs=nPU$&vC4IW<S?i9R;&_pIiN3`$1|x7vVM7CtL=xYuK|qV$gMj`
zmd-@JDe!;JM!q@l2cwa14gA;9ZRC3v+nk=K4EL<=rM@Fs5zeK*2Xv3fT{BoX%FHJV
z9(%HrDxXI;?u8;wZk&8?p*_P1_F<QS=X#mheeKaMo}~9GYM#w}2bg<+KJ&@Fb81`Q
zL(JuZTf6*K;BdVkYh%spo`;y-vk&M$#;jl6{BrNGn)%;gE(3@8<tKq>cKw^o#+ozs
zWdz%?9sd}!x!rFUQQj-HsJqTQ7nsed-#l{fom#Bxoi6S<#zB0h?-oAu#rVm>AJ2Ua
z?vNXo2G-gCGi-CkKFF(u7V~9rYxTUh3ST_`Y~k~{#r%H6{&@KCbmX_;fBl)CIl%75
zEdbA8oW2<6cQ;9X9*%qw_TcyNM|tiAe|aSOzYqMk(WBfU`(>{k*7G-t-w1o^z4y1#
zyDxY4H>aEXyVA{vpW=S6yZzUn;y1du`}u8-@p8Y(@>A?zX5IsK7u<K|MX(oK<<!0_
zF9BoJN6@^_2Z8T^_uM?*?bm_&HDY{*hk<L=C-}nH?;}86IDD4&>olFRFZ$iXJADfH
z9(dQ?!{>ZD*qwO$BtJpCzB6ED;2pnxRf~1Lg*{Sm>l_8$b-oQZM%^{ma29xm2|8wt
z=L${T;rU0{-MjxDxCneld@tgeC$RNdmvNVXalRWd=KVsSB*uL%1J|klSZE($yT88J
z<15&nTi>Ok4<BNyJM63XMJ@K}BkYwxUH>q%T0G0g*lLk~f^9GF7x_QMHb&j`-aoY%
ze-m46HP77VQUUhKyODzR;3jbG4QBmu?G(0JyaP3C@0ss?jG4w(kLQ`eHmCXz#To0^
z=F(@bTg;z>D)8C3x7;}Wv&>E4UOqqf^1il!dgOE1-qU-m(f<W7M%|pgYicom9$PJ*
z{VsNQZ@z@b-dKa*9b;l0Utt@w2qx*KdwvbnBkZ&KH^5v&z<n2hv7Reu)*sLHEw-Bc
z5c7Ay-c0aYEMEd@#`OWeUp~uTU_N7)z`yKx9QfVS@4a#?2gisTU|s?I2Cia`-@Mh>
z`Xb+0@YtudaM#5?tixUd)Z=sCfUR!dJd-)qVva4?YB9$)Y_+W*=GczC8R+vpvxXgD
V6VPW~&!!gh?!;F6kD9ct|9{+&7oPwC

diff --git a/wgpu/examples/water/water_shader.vert b/wgpu/examples/water/water_shader.vert
index 5b381571a2..b35251ef16 100644
--- a/wgpu/examples/water/water_shader.vert
+++ b/wgpu/examples/water/water_shader.vert
@@ -17,11 +17,9 @@ const float INV_1_CURVE_BIAS = 1.0 / (1.0 + CURVE_BIAS);
 layout(location = 0) in ivec2 position;
 layout(location = 1) in ivec4 offsets;
 
-layout(location = 0) out PerVertex {
-    vec2 f_WaterScreenPos;
-    float f_Fresnel;
-    vec3 f_Light;
-} f_In;
+layout(location = 0) out vec2 f_WaterScreenPos;
+layout(location = 1) out float f_Fresnel;
+layout(location = 2) out vec3 f_Light;
 
 //
 // The following code to calculate simplex 3D
@@ -201,13 +199,13 @@ void main() {
 
     vec4 transformed_light = vm * vec4(light_point, 1.0);
 
-    f_In.f_Light = light_colour * calc_specular(eye, normal, normalize(water_pos.xyz - (transformed_light.xyz / transformed_light.w)));
-    f_In.f_Fresnel = calc_fresnel(eye, normal);
+    f_Light = light_colour * calc_specular(eye, normal, normalize(water_pos.xyz - (transformed_light.xyz / transformed_light.w)));
+    f_Fresnel = calc_fresnel(eye, normal);
 
     vec4 projected_pos = projection * transformed_pos;
 
     gl_Position = projected_pos;
 
     vec4 gridpos = projection * vm * original_pos;
-    f_In.f_WaterScreenPos.xy = (0.5 * gridpos.xy / gridpos.w) + 0.5;
+    f_WaterScreenPos.xy = (0.5 * gridpos.xy / gridpos.w) + 0.5;
 }
diff --git a/wgpu/examples/water/water_shader.vert.spv b/wgpu/examples/water/water_shader.vert.spv
index dc7d6bd9c554a2f89dcb3d82768db6ec96f10622..688792a7c909a4f95b8096105fe80e7fed617504 100644
GIT binary patch
delta 1663
zcmZ9MOHWf#6opTrl!_81#2Bd(4Ff|oai9!{QDThZzy#0%&YA`a)<BD;MuR2|aU!B5
z*uUV!#00Uv@d3W@txzA}8x&FW7wE+GUG5>+o9v#o)_$CQ&fT}?PI$(;JcYSAW%<T<
zjMw<h@7}_SH46=oSJoPeM8S1A#_W}ympzcZmQD1BrhN5YM{5f1iZt&_m^@|OlCLck
z549=}KA6St{Kxa0dQHI{@o;-I+~Vd8r^fSF27KlzvGLgca6=;87;KBRJAR+Zq*nWv
zEziiy)7%oQjkQM-kyzCDOuoEz{(vWwYIT0Q{DBSh%R@io!p-qWBh~U0Jt5u{tPdr^
z@jVUka5$=33QZ08r^{wfS1L+@YGreJxJR~A`I*$vg5o+lLE+}+JkrQQ%au9N62NHO
zZ?zb?#8I7IsBY3r3;MjtRg(JLlqFI(xt!NPnYH3Rt^MME|8!JYenEV6q^@e6yyT_D
zH@b27sC!>4HOQwfoWt3=r#vQUo=M<5D-<v)OmL5^REWMcH;#r6qwp)O6v0nnIQNf+
z|E-J3g@18*i8%3a?je_3vM2bJ9$CE26JoZ=Bd$p6U>0Y#=KF`U_@jB;uYBgq#>2<c
z2aD=`$%~Q?$!hdPaDSJC(J&sa1h`pkkbYU@tjxw=5k|v!Z2VRYOsDu&>BLvaK@G0;
znmBr`@g<#2uZtjBJFaA!8IZ;X_>Z~T4PlzZw@BrPyD7}Z+hzFK2>rJ38QB)yF!u?!
zz9Hf6oaC&N%S9lNi=|+t&P%s<h1YAP0CD(x+-B|xGjYU_%e11|O&$u{26#bm>w7HR
zozxGBye))EZONujgv+&(gpU|T7M-g-s`a_-q>jzxQnX9>g{#APT`$GiqgOfb5n*D`
zshMOf5N*O6VKg>je8*&r^br{eaAIr|?}W3PcrOjzHuXWcLv~s<Y4W2mG17O>ZTv|>
zOlCX%EKDFe8}na=W*eOpMyt`e_@2HBqfMrUN{W-;gisF4V@GjHoQ(OS_+1>mR;^KG
nS{Myu3ekQDQxBhw`zcIqtkaE~kw&b11y0L++B4|`fr0XW`{VJJ

delta 1719
zcmZ9M$xl;J6vl5UlsXV37zu-@F)mPv3uHlz5QAf40&LWcX$TaoK}t%E28}PojX03t
z`xo4pm?&06#2IJBS;PTnM8#pR8^7P{dj@E8^1kmo-#zENdv813;X85Am*G!Ym~M>E
z1oi#hl~Foxn&FeG*ijp42G^t*vqjOZ819aY1`5*5N#W{nY*RQE5AT*Ipyg=B*!zNW
ztbhclPeMazZ7kf{9By)K$)z|OLK`EE+u|lo%_!Xv+TgT<Ulwnvjn(du4}NtDADF`L
zOy-Nty-7mAJc7rf+rxG7aDAvH+UgVzm?3*4JtucaSw4+Tq3URBBp!)2>jl!4%?RfE
zhU}tXehD6b(o?y!scChjHD23X7uI-wGwiNs)HlM7u}Hmo*miKN#P4hbhIQ_X7Sc+e
z^;+w7o{^N2n%zAuyO<2C$k5kwgV8vlb;>xtgm3!ERI5-0+4Vf70*YCR`7)l8#xim%
zT+WW8EfL3iTKw;ywhE6Y#GgE_saUEkb<T({cYWljds9zpkk>lP9MO5-mdLSVc;Fgn
zP$2$X9NeiW6k>MWK1U-*u<nJP6eiEWaP}CD{3{o;7XHKGnaMZzCjOP^%dGS*;40yx
zPL`frrHOpNF3!qdM20)#WrE_|nTh;OVr$msKyHuZU5YAQdEWf2Fj|j2n3I#+D|CE9
z_M9+UuiZX7$Le#lr9NX;Y9Kb_yfpM`G3xaTqj_;ar;2_-8r8_}ceRVc^d~pdU4Kbf
z<;@xedHS&aN{X?}F$v|`M|MTR|Kv5{LvD^8g5%?dM!_=e1jAkzUZyAO@saOzhq)ol
zHNmq=8rS2Nf~(f4iOP-TcLa>yRCk5Fq4*WUz1)3aZzv82UZyb^WKg(BPu7s5A=mAp
zf`(i}UI31l{9a4ovEs0%!9b%9;U}&R=ft0i<L%NS_%mTV=oIB<pn3k6!e}(%ZoXD<
zU-u~R!|_<o6apiPsYASVb#JJ5;%$nfD$0=Wh4G+!jXwxS72cp9h4G=&m_H*l*PmxT
zi6B<#z4)8>ER6QaZqLiMMukxLM`zS_J->*vV&at@6GyL>hbmu%(Fm?9+Bae9k@I}t
hg{e)nyS{O0c$F)3n(|}*so)g74TO&;=H~Yo{R8kc0zd!&