From 67820604b80161d768f92e3921312ee1a93de047 Mon Sep 17 00:00:00 2001
From: Sascha Willems <webmaster@saschawillems.de>
Date: Sat, 13 Jan 2024 15:59:19 +0100
Subject: [PATCH] Code cleanup, simplified, added code comments

---
 shaders/glsl/distancefieldfonts/sdf.frag     |   4 +++-
 shaders/glsl/distancefieldfonts/sdf.frag.spv | Bin 2164 -> 2344 bytes
 shaders/glsl/distancefieldfonts/sdf.vert     |   3 +++
 shaders/glsl/distancefieldfonts/sdf.vert.spv | Bin 1436 -> 1584 bytes
 shaders/hlsl/distancefieldfonts/sdf.frag     |   5 ++++-
 shaders/hlsl/distancefieldfonts/sdf.frag.spv | Bin 2584 -> 2152 bytes
 shaders/hlsl/distancefieldfonts/sdf.vert     |   4 ++++
 shaders/hlsl/distancefieldfonts/sdf.vert.spv | Bin 1820 -> 1344 bytes
 8 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/shaders/glsl/distancefieldfonts/sdf.frag b/shaders/glsl/distancefieldfonts/sdf.frag
index c8d42870..d161ebe1 100644
--- a/shaders/glsl/distancefieldfonts/sdf.frag
+++ b/shaders/glsl/distancefieldfonts/sdf.frag
@@ -2,8 +2,10 @@
 
 layout (binding = 1) uniform sampler2D samplerColor;
 
-layout (binding = 2) uniform UBO 
+layout (binding = 0) uniform UBO 
 {
+	mat4 projection;
+	mat4 model;
 	vec4 outlineColor;
 	float outlineWidth;
 	float outline;
diff --git a/shaders/glsl/distancefieldfonts/sdf.frag.spv b/shaders/glsl/distancefieldfonts/sdf.frag.spv
index f16588d15fd627143216e58c05d7fe24930c74bf..6230e0a75fff1bf1d71b0fa49295d9845f88a468 100644
GIT binary patch
literal 2344
zcmYk6*=|%v5Qf{!3?>kku!jI+3?VFWNWvC2o6R=h#0Fw~J>U_ZXzXK+2j!M1FOUnK
zhD+Xnr%8f@#P{_%1*ffls_L($tE>BXWO!mrN<(Q|8cWNmT)WdSOoD4>IXnMkesXiL
zGI`<Rc_VhDksN5u&a@?sBE?#}yRKswSj=)H^K3xI2vt*hOHu>29^Zf&!?)7i9JJS;
zcTi!PX*+VWy|&To^zRhCqF?f(xqf$j>1k;<(gEYviej+3++7*0=K5d5wR;<@ZDfPJ
zPayj*o@M<z^rhPi?9fc=u8n^2N9XyVTX2FVQSzQ|tyt;wkWJ1h=NXEZgI;&N^Qous
zIhD#+Hj?woTAsJ^<sQypzkF6?{UZ9Gz%x5H;%55o7oY0SGA(Cu9Js<BN4H09XMPm8
z=CI>jjck`a=$r6|HCLTc-TN^=@~m0U(>8A!M4sH|yt2NtG42(JIA<dFPmOaHa<9QG
zcN25<9L}YFPVI5v((ioYoO`$p_Z-i!tGt{2=uNm*#%S)*KIIOjt^Ad`{nuC6hspl}
zhjA_T+g1h1U8`*G!gT<92h!U1Vf;>{wd9T0cD8cHe}y#O8SLYCFR}$(XDfRjx^vSu
z_Ap>gneS}m^t+#P^nCIMu}>l0!}>?@I9s{k%@yXJM%uSA_Nwi?<?QV&vIT~Ky=b2U
z);9lpq_NhEUeBYu_Tu>w8T_TpzM6_Um$BoF*1ZR;W!;%d_Z->_NMp6_Q`>hScZrv3
zo;|tb{)6%T8tZJvfHG|VU({{?SA;!*exhc}`+X{JP|tVpCGZVsd(XRpcf8E5_P7Ta
zBmW4_`RoVs_IHzCdy=z;{)0g7U1cAtIAiTsJ7T{<m;1Y_eFWV%A|Ek+BgXty#T-L7
zMm}O%=<d0lUwaq_L%@5pra3KO56(z`<eo&ATO{*1@>?JmFvmH{-=YWK$|Uf8`G%s-
z4;BB0829}N$oY=`rN#xM>pgSP_cM_5j@6^~6?AJ~22uMLborRmRdnB>y#0BvauI(G
zT`uhF==C|@z&1ucVs4_>bEdHCbDzdGMm}<Gq1Wer8$0Ii9@D^>n7jVSy@Ot#`(13g
zfb*Eao(0b19x&H;IS1qy*xft3Uvcs-dl&|>*8}wWUJtS50=^sT%mZ`1U;DAHvDVT5
zEATD&7PWt?IP>D2$o<dmakt9Ie}ry+^z|6szT(?@l68KvEWfwkvtITUaZ45F85jAY
Xoyk*RzVZ64ZBPDx(f5IqT>&2f9pH!-

literal 2164
zcmYk6*-lhJ5QdxGU6D;(2XJ2y72Fj8SyU7hk?T<iOahF7A>L|yD=&QmpT;FI@%zr4
z!qcRts{a0K>FPc-H4e0;)R5ZJp7bu&S9@v%Nojv-&Ghu_!tCI7ZFz8bWJt!L)RYnB
z944|Et!$Jln{FII<}%%s;S?aEiL5DoC#VIq$ZrAJ!`^abyH?)(u!0HFnhv11%Nrlp
zSGFdq>(#9~-kjyHY%XT)8rvgpqgt)4Emf9lYaq?(I9Pf8<60TrLhZBYt=0FLeF1xM
ze2xljN!wN3sjXKwS9a^fo@dPW>dEn2$zq)6$@j9nm+*JqS2KGU`xD|hoCUn8t@7$_
z{%LyjeEo<k{61`J>O05Nh-)UVsXgEiD=_(D@&mIsu})-~^GCntwa;Q*ed`+IzWqks
z4p8yF>;~(cZtPaDQYOtzF=ZmwoA&bOjOyn=?JoOtogjW6T3(5I`vqBI4|3nxxO(sp
zq0MI>@(-iUB`#mzvx~_;ik9yi>*CiLln~dI-0#Bn73<4Afv`r6cQ#_~ThBRqM)A}6
zJwy$8axS9n&pF$ZzH=3`hs)>^(tub~{|e&1@mF)(e9_Z&Y*#0&A#~s)8TxrN^4!KR
z=6#y&*Yi$dTf=^>^9t>`^zBpM`xd*++2lGmm)I|m7PMSv;CHGH-*2zz``v}_-2Cps
zSNmP4ACb@dK8SeN`rc<d;$1FL)gC(#IpVLuoKH6*Zhw#YwI?xixPJ^0`;q&-IVRVB
z^@Dp7TkLC|`xLfsK|DBq3v#~XoHN*R#Di19w&nqT?V%6xPHrIPG^T{ugEMkJV$WfV
z%@f&=K97in7~>qp$LPVgat-l)`Gz9TV2*!-<9o5TnD6K(Ic}j{f0&DVHxV)KSUYmx
z!8W(=Dstb&7LPgI!}cAD+n@I;7X16zV&Ol)F3$NOz8vx3Ji;!<JjO51eKg}*?|;k_
z?Bd+V@MG@QFy;vob9X=Ljbj(*K7lV5;yfntrx54icV(>aavBkzqk2DjCdb5G_Rxq#
zt!LQ9TF>#tLVP#od4U+~z1fd><(kL+S;V*CThxD<W5&fh5&KQ`xLb9^&tn@OeZ9uE
sulTm!V9Rj@wty{WUxB^NG0!;97wt?I5#!~%Z*F_?|BHKn$#56>2gTBRC;$Ke

diff --git a/shaders/glsl/distancefieldfonts/sdf.vert b/shaders/glsl/distancefieldfonts/sdf.vert
index 1418d5c5..b09e4cf9 100644
--- a/shaders/glsl/distancefieldfonts/sdf.vert
+++ b/shaders/glsl/distancefieldfonts/sdf.vert
@@ -7,6 +7,9 @@ layout (binding = 0) uniform UBO
 {
 	mat4 projection;
 	mat4 model;
+	vec4 outlineColor;
+	float outlineWidth;
+	float outline;
 } ubo;
 
 layout (location = 0) out vec2 outUV;
diff --git a/shaders/glsl/distancefieldfonts/sdf.vert.spv b/shaders/glsl/distancefieldfonts/sdf.vert.spv
index 0872996a8fae4889cc9212be02f9dc1f4b261bec..076d2c2c59bfab2a2e86100d814c29e3b34bd77a 100644
GIT binary patch
delta 191
zcmbQky@7|5nMs+Qfq{{Mdn0E&qc<A^JA*g_0|OHf=a-h`Wagzh=jY@X0l5q?Ic9`h
zcxFmT21Je(td9jDw>h1WlhM+H0U`l1P#K6DfEXqQG6*C#0Z9yG07z`g=3J&oMsbL1
T#DD@I%nQV9AiVh^^Jzu^rDz#w

delta 45
ycmdnMGl!d#nMs+Qfq{{MeIsW)<K``l9E_WPFoiL4voMG=FffRL@a9yO(~JPZy9jLn

diff --git a/shaders/hlsl/distancefieldfonts/sdf.frag b/shaders/hlsl/distancefieldfonts/sdf.frag
index 104284a9..b645912c 100644
--- a/shaders/hlsl/distancefieldfonts/sdf.frag
+++ b/shaders/hlsl/distancefieldfonts/sdf.frag
@@ -1,16 +1,19 @@
 // Copyright 2020 Google LLC
+// Copyright 2023 Sascha Willems
 
 Texture2D textureColor : register(t1);
 SamplerState samplerColor : register(s1);
 
 struct UBO
 {
+	float4x4 projection;
+	float4x4 model;
 	float4 outlineColor;
 	float outlineWidth;
 	float outline;
 };
 
-cbuffer ubo : register(b2) { UBO ubo; }
+cbuffer ubo : register(b0) { UBO ubo; }
 
 float4 main([[vk::location(0)]] float2 inUV : TEXCOORD0) : SV_TARGET
 {
diff --git a/shaders/hlsl/distancefieldfonts/sdf.frag.spv b/shaders/hlsl/distancefieldfonts/sdf.frag.spv
index 5a1f75cd0b2b09f634a8434beafcff6b8d762561..562614d5ac79bee727ed7cabc864b7a19e70d5cd 100644
GIT binary patch
literal 2152
zcmZ9M+fGwa5QZ0}1r_8VXHeXLXLPFwh$57u^@5}b2;P}uceJKulTwV{VSE8Ed>Y@v
zhcO-!6aQ~@t-8Y`)0z2a)|}SbZB9+J8q;Kq=`cC{Lfs~1kv7v}Wo~18BRr}V!|9oO
z_&ZE9!umQ*t4T{wi7SQD0XSZ;E@|K@Ag$SCB=-emlo!4B@h}RfieafzcoWG6Zvl@!
z)Q+psYFv)1GA&LH8-G-&9G0U7enz;167d;x*2f?3$5NFyZ83D9jQTkz{l!Y&Rz-&n
ztMR+&b*&U@61oIuJC(Q?l_gs=4H$F9$F*|l;D4Xq$NbK>S1Q)t%53CfFV1IsXp>#<
zr&S#pQ#uIW7pmdT`peaPerwI{JL7h&bJn@N`)X%-E4RL*_>AUC?w;6o;fY-}7MxQo
zHAck{HvJ@R_CJnOgdclM%nq>GchZlY^fOP=kBuLC=Jts`!H+13amQU2OWPger#~M<
z51d;%g`GY}T=HB>Hs?;nJ{Nlc`;x#o1NPNnydek-%4vIG<m;DyUNR6*sv3HSSd{IP
z-6<sy(+hrVW}}9;yQM?^{Dr#NuzRe1lJ)VuvgzB~ebVV=NL}$g(F66sJYhqDD)-k_
z8#}Bh_69!SaO?rugOcQ;*FpUbSy{J7-TMdgII-}k+YjFdd50zGg`JUiM3Oi#{1+vg
z#NgPMB$<!;J&NL8jtRLeiB66{k{ra1=$E(7?3^EyBsczEY2yy({=msQuQ>L=yN0lt
zpLYyl(>L#yGuZS=y(VYVC%XZgRdsqJ7NXZ*vaU!jD2myxiiyRh*K1<xW3%(?V(Rb8
z%RD#4#DMQ9lD=<>!N~<ZS1fbh65}KPcjW_{6oY?uF}J1jHo-qR>`nq}S9Q*XVrINA
z<_t09*;EgK<Xtf_o|lEQbN-~*7w?%j&Rpap558}z$z4o2jCcN19Y2tS{wN;bv>1&2
zq5J$Z(tUou0iS<XIzB(=L+N}o;2xWk4xXI-Q3CU`KNjX^=L|8)+2>^w<C)$jWIqx6
z-uNErjr&?~zPxrDNMCdqI7BVp4D|!atQd^lQj2&b_Z3JkiP=AKzje~@3Hd{>h<z`M
zInUdpPj-kekX#XS9^aA}pMOKE((ywcTayk(Paa!$SW0qJd71O6nDfNrr-wz|ZCVoF
JUuBpR{{swliMs#*

literal 2584
zcmZ9M*KSl-6o!w>FbM`5LW^m!gTw_$BR~NmMZ|IpaxRceF?R0IAWvYDalszbLky(%
zgx&(YM&5#_Ns*B9edp}u9I>S}d;R~ad+j}^t8+&+%Q~_w>&;&9>sp(2=1fnvBHu@k
zo;+GxXiwGN+rLM9Z`S3O+xoI<){WkYOxK$;@>=EApvhAJtt+drpMj{5cP)DR@?4{~
zZ>rXuuAgmy<@ISdF0~iu8zZx=*?C~juann*p*}s=YAo|B;1gByuVfp-fAP#LDw(@;
zPF<=(KO50ceK>}#n(NwT7u&7o%>T8+=7f@MvN_d0r?1_b!!ssZp4amhHL6s}vgS<f
zLVdnAe&pkkv9S|}^BGps+=$DKCnrvi51$x4GLC<RUd!`zF7Lq4)#vNexp#Bs)P#Q3
zY%hFiF3ZClC5N@QBQCLbQpV2uU5za5;z7i-ik)rQE-u?WXW1^+ZtowF&Dpqi6x%Xq
zez`SB_!%R&K5^ckD`H1EjhucP(cfSnKz7ro`kM%AXajg9$^c>=?cyH9*ubmMT@k;!
zfXlcy$4f)u-v>5dKb3sD))bpFme@5wP0!}icQanTU-`ErS>jFLP3-0>?xvVoaPr&J
zxt*o)&c~Y0!uWo6{p7U2&EA2?i#M}(A?93%*B16cn62#U`uHZiJ7WgH&Rl<a?K|1E
zTgRHalWtz^yV$kMZy~pD(sOGYVz;;Ge>h=tt;cehUBAi1Tlami^YcBr#Lmt4=Mp;y
zYnof^x$UPTVbASMqsPzC^*8?kGJAGoUC!cf&^C5+dEQSD{R5wU4WBDv&)+Oz<3BB7
zYqv_+x%z)L{~_uXcUAQI0Uc`_NH*u_N7Y&A>$~xT<}4z14&9guyqx`c#2Ec1@$}4o
zFy-}i9mm%@SU|KnCu@6dIdf}oBXTbjUQC?6&O{u(7trNyrQ8?M{a?z5&n0wyZX}<}
z==#Wq&lPlQuA&2bxQckMp3R)b=wlDwgZ7BMhAwxEbNe1YN900`@vh{D>B0AT9q}&w
zCddu5e}TyNAd!0sUH(see784{CB$#XU*vtn?)sNmX}gKY`L@)f-YxXk>wO6)?{_BZ
zeT81|#a(?3_PZqSIecSs;r|V~T;Olfops#Dcj)@ahtK!u<(MD9#>D;nh^~)(#QcO_
zzMr4LaX;2DMxVGJ?GgJ6dij2S1<QrRjDCZwB5@~^=)WWKa^~}0-$vxecq!iZoy5tz
z?92ao)W3^fu73|K7vh^U&wa$$8e)&;)z>`QA0WOX=OliZIOF1t$^Aq1cmwVc{}|o)
z=<5l(eZ~LsDY`zc;Qm0Dv#;QuCC)P*V`9$aIbyv2+RbfGE%xV#HT4@r<g|4s{EF-c
Gk^caZXvr}E

diff --git a/shaders/hlsl/distancefieldfonts/sdf.vert b/shaders/hlsl/distancefieldfonts/sdf.vert
index 379daee9..a16d01d3 100644
--- a/shaders/hlsl/distancefieldfonts/sdf.vert
+++ b/shaders/hlsl/distancefieldfonts/sdf.vert
@@ -1,4 +1,5 @@
 // Copyright 2020 Google LLC
+// Copyright 2023 Sascha Willems
 
 struct VSInput
 {
@@ -10,6 +11,9 @@ struct UBO
 {
 	float4x4 projection;
 	float4x4 model;
+	float4 outlineColor;
+	float outlineWidth;
+	float outline;
 };
 
 cbuffer ubo : register(b0) { UBO ubo; }
diff --git a/shaders/hlsl/distancefieldfonts/sdf.vert.spv b/shaders/hlsl/distancefieldfonts/sdf.vert.spv
index 5b4eecdc002919dcab4bc412bdaa2556efc36751..44a1115d6be3e12309b519f0d63e7e008ec8ba45 100644
GIT binary patch
literal 1344
zcmZvbNlPn16ot#g#Ce{l*f9<ZA-EDjoE3FrJ4AHr5U?etB}BoUKf#4R){Wr#s;fc>
z*5kgq=iKSkO`A>?I*e&E#`K#N{m&UPDaWKOCOTlc8ve^&R0X7DWVFjN)=%5}UV)7M
zWyRG$UdzR|`&h1UyXEkqGOE^abG;vm&sv|@Yb|~*Kh&dGQ?kk;2MsUrW4WT6OgQGp
zZ}m!4Eg!^{xF*<$q07Z?qR0AE5=(la*Tt-cPT@pPhwT|vi|==};(2&=S~?BS)~KbD
zo-S58x;+TP%fm*D_p7HZYz}7hW~<%p>{yujJu(iMcjPQeFmu4v5vO-^9K8!N4smea
zB4bY6zJP^)IQBLuJ5e1z2R*)ynbhsJaIJOZHP`V5>ON(@7w>@kYT~GY`*s}P2nUXH
ztS!UQZ(KfKT_Bs#v~JyCdVtv>nA|bpUfqEVZL1FVwcvhX4smJ+Ec)D;6lO2XpnuMN
zV{o1)AImw7>?Bb3kZv@f8(qV?$>aURM|7hJ9z5zW`oUwm$z?Wp++pG)>O7%4uZ&6E
z_~cCKW+vJ;h0(xw00(9!ew)M0WQNDg<ehNjGc)-cHfCKObI9c|_eb5Pb#Ez`cg)D>
z4@T##j9z=%0@~(e=waU&d1&Q3Cg$_z<@-E-E1wt0Cw3t%>@qK7CdYFN^5M|wxq{=+
tcCO!$oi56#C!aXK`Iq_<TapnEWS(1=50BPuy^1}-;j<&&`m3oMvOntyOELfe

literal 1820
zcmZvc+iy}q5XQGqsP)oXYcJjqS~W3EP+!!<sA#KzmmXR!)<>#5V1z^PVB(v9f`6_r
zCVsy?vq*?bhMn)5%g)R$WHY-<&Mi3SR@_H@v({Y3n5@TGSKabdA9VXeKt_Vcq9o__
ztlv*%$myfRuG5Sr$!L;Db$NNhu^REWDJFlrlg6w`PkxMg<;iJ`A2Dz&sGLr`B)$DI
zk}dCbY@>1frS~c6$EqwZFMP;5h(GtfY9}tQJ<YM?Ywr)s-@D^-BWl)L_2}@v%)V-R
zGF$7_$$k_aA53lZ8BY=)IBU$QPJf=w27E)loo0PV`}6^3h2Fvcde6Ip@TfcP4t(~$
zkE<$<`JR)oz|0+A7MOa$<N{OUtew7hBrNRUl1I+fY*xVC|8U&bMM+I@%#=kvA&xVN
ztIToparlL}aG&A4sycw9uTAN^w4!875off6i3OiEoX#M9Px!!>70bEIYD2!~wHGCv
zy=VBs99|J-VdtDxkA6Pi7G9T5Zq6>~oBrXDg4GOHl#Llt6MazUhIaCCH`p(0rw(}V
zreW#^Z)wMu^T6ANv9Bxh740Q?T-A<FJ-i?Cg&fzV(?5Jk_B)2*$$8f>KHxpWA^x5)
zJ%pYf7^YwRA898x^iVNO%}-=!2D~kDfaw{1!7x43W5D#xY~k>y=k$NXxrfr|6JHj6
z|5mnZ+VQ2AeF^mhd@zIQnco2Rr}C%fn-b~)r#+`<H*{7yv(%?3pJ%Fy_>$?I#k+bT
zU*`5&f}Qsi@>PuwJ~d(D@F5=<AMDJ!E@580K{)39Mgk8<US|JR0w3buNuQ5<FAhG`
zL)@VRo;dC<l2CKV%}g4`AIWD~`jK(kq^I1maok1Vn#M8DhNjFLXnDJH_+#g{^h-Ig
zwI$f8DRBDB_dNYkV@3N12{WTcW(LNOS#Xyp671NxZ*Z{fNQa|F&b%doW8uH39S%G9
Se_Mi`zOeK5;QoktEcpu%U1fm)