From df3582c4186101acc9cf532bc8c8bb402920b33d Mon Sep 17 00:00:00 2001
From: Joshua Simmons <josh@nega.tv>
Date: Sat, 11 Mar 2023 09:55:36 +0100
Subject: [PATCH] Tidy text shader

---
 bins/narcissus/Cargo.toml                 |   2 +-
 bins/narcissus/src/main.rs                |   5 ++---
 bins/narcissus/src/shaders/text.frag.glsl |   2 +-
 bins/narcissus/src/shaders/text.frag.spv  | Bin 840 -> 700 bytes
 bins/narcissus/src/shaders/text.vert.glsl |  14 ++++++++------
 bins/narcissus/src/shaders/text.vert.spv  | Bin 3076 -> 3076 bytes
 6 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/bins/narcissus/Cargo.toml b/bins/narcissus/Cargo.toml
index c17ab4c..03e3395 100644
--- a/bins/narcissus/Cargo.toml
+++ b/bins/narcissus/Cargo.toml
@@ -6,9 +6,9 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+narcissus-app = { path = "../../libs/narcissus-app" }
 narcissus-core = { path = "../../libs/narcissus-core" }
 narcissus-font = { path = "../../libs/narcissus-font" }
 narcissus-maths = { path = "../../libs/narcissus-maths" }
 narcissus-image = { path = "../../libs/narcissus-image" }
-narcissus-app = { path = "../../libs/narcissus-app" }
 narcissus-gpu = { path = "../../libs/narcissus-gpu" }
\ No newline at end of file
diff --git a/bins/narcissus/src/main.rs b/bins/narcissus/src/main.rs
index 3cfc546..cfe4e44 100644
--- a/bins/narcissus/src/main.rs
+++ b/bins/narcissus/src/main.rs
@@ -164,6 +164,8 @@ pub fn main() {
     }
 
     let mut glyph_instances = Vec::new();
+    let mut line_glyph_indices = Vec::new();
+    let mut line_kern_advances = Vec::new();
 
     let mut align_v = false;
     let mut kerning = true;
@@ -284,9 +286,6 @@ pub fn main() {
 
         glyph_instances.clear();
 
-        let mut line_glyph_indices = Vec::new();
-        let mut line_kern_advances = Vec::new();
-
         for line in 0.. {
             let (font_family, font_size_px, text) = if line & 1 == 0 {
                 (FontFamily::RobotoRegular, 14.0, line0)
diff --git a/bins/narcissus/src/shaders/text.frag.glsl b/bins/narcissus/src/shaders/text.frag.glsl
index 0163eda..f241618 100644
--- a/bins/narcissus/src/shaders/text.frag.glsl
+++ b/bins/narcissus/src/shaders/text.frag.glsl
@@ -8,6 +8,6 @@ layout(location = 1) in vec4 color;
 layout(location = 0) out vec4 outColor;
 
 void main() {
-    float coverage = texture(sampler2D(tex, texSampler), vec2(texcoord.x, texcoord.y)).r;
+    float coverage = texture(sampler2D(tex, texSampler), texcoord).r;
     outColor = color * coverage;
 }
diff --git a/bins/narcissus/src/shaders/text.frag.spv b/bins/narcissus/src/shaders/text.frag.spv
index c54b72753fa2755e08fda86ebadd2ef387a0872d..3bb4aa05dca613a4a2ed6c6c9023c2176a6bccc0 100644
GIT binary patch
delta 242
zcmYk0Jqp4=5QV=@cGp5usAvR#63iI{L9~^WVvz%gy(bYCuj2vitvrk%Z{5PFX1<yC
z<~{wx6?xY5@P<AGO(;%o0aW2~9;jLJs{@uQykBjJr35@+ff~yk$RYA=nk5#~UMA*m
zuerLfv+laXG6E*R80c`(WeN-vKjPxI8APs<PAO_R0k@=EC8pawc}yYp!LY&b1x~UM
AV*mgE

literal 840
zcmY+Cxk`g!5JgY^B|+o9$2G1ff>@{sqF|NALJ_nUY%H|V=kR%L1UZw5#(|LBJ9m~l
zU&>;;MYBPhaSrImGzATyO*6iGH}^M3?;p=cC#T0MCMZLwW|C1Vh|lZO%bSUI@GuW-
z1G~T!WoTMJk18}<{c*o|Gy9mIgnxOlc_*8<_xe!1bB3`q#qKyuK@s(3)cbpZk|xjv
zI*c#^fz=Pk0C%Yv&4k*E#CkQBDHxA_6%)yc)rsBTSfOMZqQ@c?vpLtDoH6&ibH7%s
zSNE8wVj*`n4ihg1>enx&R&Rs+N^;KI$a%h*^LztuD(|jhZz*SfCu;|JvA1=fGwRse
zUWPSa6x6^aRd^iB|AW|jOyw;esN)VZ5E}Vw>e#=Np7mv&UY6sX{xqwp(c3_?2EpG_
v$6bAY>*OD)!-MbbOmlbC(cAx(ykRfB?xoMqtlLjc?G<I*NbZ{k=QQ{M-d`I)

diff --git a/bins/narcissus/src/shaders/text.vert.glsl b/bins/narcissus/src/shaders/text.vert.glsl
index 26b1e08..dc8ce74 100644
--- a/bins/narcissus/src/shaders/text.vert.glsl
+++ b/bins/narcissus/src/shaders/text.vert.glsl
@@ -48,6 +48,12 @@ void main() {
         vec2(cg.offset_x1, cg.offset_y1)
     };
 
+    vec2 position = positions[gl_VertexIndex];
+    vec2 halfScreenSize = vec2(screenWidth, screenHeight) / 2.0;
+    vec2 glyphPosition = vec2(gi.x, gi.y);
+    vec2 vertexPosition = (position + glyphPosition) / halfScreenSize - 1.0;
+    gl_Position = vec4(vertexPosition, 0.0, 1.0);
+
     vec2 texcoords[4] = {
         vec2(cg.x0, cg.y0),
         vec2(cg.x0, cg.y1),
@@ -55,12 +61,8 @@ void main() {
         vec2(cg.x1, cg.y1)
     };
 
-    vec2 halfScreenSize = vec2(screenWidth, screenHeight) / 2.0;
-    vec2 glyphPosition = vec2(gi.x, gi.y);
-    vec2 vertexPosition = positions[gl_VertexIndex] + glyphPosition;
-    vec2 position = vertexPosition / halfScreenSize - 1.0;
-    gl_Position = vec4(position, 0.0, 1.0);
-    outTexcoord = texcoords[gl_VertexIndex] / vec2(atlasWidth, atlasHeight);
+    vec2 texcoord = texcoords[gl_VertexIndex];
+    outTexcoord = texcoord / vec2(atlasWidth, atlasHeight);
 
     vec4 color = unpackUnorm4x8(gi.color).bgra;
     outColor = color;
diff --git a/bins/narcissus/src/shaders/text.vert.spv b/bins/narcissus/src/shaders/text.vert.spv
index c4b15a6324e1b860c7e9c8dd73debeaa2b6b0bba..4f9060d4c25848441d0057d66c7f5b444f4a67f5 100644
GIT binary patch
literal 3076
zcmZve+l!TD6vlsh?{DuZ$3tcw0-Ze2(Mh^c38ZvxoS{Y>(~i)E7=)2Em8AxP5`sY&
z-W6z3YIUPsmED$y!owfrO%T7e*P1>yeK36A`>ezJthJu^-P7xC8e`C5oF&|2_$;SO
z2N-7%@9Ek7vs*qn`p%ZE+n&>7DZOyiXBkW4y8(_IJp6%+WxxtxJ@68+5BM1P4)_I_
zq0e|k!KQo{W==8l71mAcffgnM{T2h$H1Qq)4~0*YtYA&X3|aoS-!#3z%x%1!Hzt=_
zZ-526^~ia1=3Dze{KZE3i;eOZYxB2GF>AJ_VGTp9pV%X<eXUc!s?FH3#Qc{3ItV{!
zFhj#c@~xO!o5#m~h*dv~Yxl#o{jfgsJ6HShO!C^Bc`BbZiH-I{Y_uO@?S9Cm{M<|Z
zw7IyJi;w%v=XYtUF!vVoU6^}|xnE&^i`jqoHedBY%~r3pso$m91HZMIe+Au$*+4Jy
z8NZ6&!VFf@#Ek5t&jf?ev$OQi`S~X<mr;Bjz0kO}iPWyzUr!T!{8r;Ta;=`l+*duh
zuRJ&BdU^6N{^7LgXS{3muD|w`nQOTBA|7q=E#Aeq-V-cZ&}I4fE_=PLORcI~>$0D&
z-S@HFS4>{6t;4#ijyj|IKb|&ot)}7W+|OC)@BZr5Ij^OOv#gJp@snAXXWaEnuJx(D
zsC)b3oYZK$HouLVOZ{j!&b6AAhxS+UTmP!#wbp#>&3iGQQ#-BWNY)|ms>6#`9@g<;
z+QsChek(?sfA0HH>R!9NTzfC8fAhNU(UvZbr_Ef&^Gssq`!>I;KdwD5<}<(Xo)OoR
z^uzCV)@FUR=bho6JIm)T1SY<ne)P@Seav;AZrqFR;mn@RIn?^|T)&W7_wH2BQw&1O
ztMWI>GoVdBwY@sdES&2!aW=gx#rDyU-u#+(u1{gVCFU%|oawd1oOfZrCnkS+sMRN8
zE(8x_<e_$-Oq)DBYfmLsx&BD3c(~`EiM4rLPpr-3Mq=`)8g3?Lj|;n%n7==T{gs$H
zDeUjW<S>^r-Ug9V|H5`8rhj2m5c{<Kb|*IU8;i3z4Uy9v#_01Ry_mbUn)A!~|Hc&k
zIJ>i{4RL+c=^hANAJ5_bsAV_<eXQd^;`4bXUQMiGUe6fMY{k3*fmh6%5Lngv7DOKL
zGufxNA#n9xeup4*rmjw>-@D0M+u6hpL*VB4BC+=&aL-uH=Tiv0wBqbOOH8fIF&5|h
z7=*7j?*PxI^?HU+<UQeevG1<+uUbz+XtLI)AhcICordrcFQ2mzS}dP0(?`5~zDiw}
z&p8OpJcWIom~qzP-Th7Uj>u_@KJxZn&{q054}rDyaRCCaS%06i_IIXc{R0GEJTF3E
z6>}+Lyeli_G6Y^RKSE$t$4?M>#B0VsL-5fifA3bY#SCI*SMoPt7sUOtmj?sC3Srak
U*>}!9o_X_lC+qVM9iFGdzb^!~`2YX_

literal 3076
zcmZve$%~v-6vcntRo$)W491v5A!!qXV`6Y&L<kytV>cK~LO=x<B8YP|nt&@Yae#<Z
z#95q&jk<E!I*Y?!<VKL+t#jLt#t(}6-nrAc_nr5uM$^0In4Mytb^OKT*~m0gz&x|{
zy>#&C!M!I=-m~}Geb?x*o>4jKvw?N>J_e56{lFtGHUOJ|9l*oDQ^2dhyTDh#GBeCq
z6zs}(W9AeyUt`n3&KY1b&~GiU#JIj^f%D2|99D2)VkRvAtGC3cFmoF(=S#w+*E?aw
zZa;F~oqXH=hrifr{$i{7iw*hPr<gt4)1-$9HWTcEL0$XQuX{6gE|~A~-wx&H9xO9v
zA$&Wg*XHqY9%4NY<A(Ea?L6#Hz7Hm@;~QJuzkaLx7aR6(?e>$qni<x1ZEYXz>dC#h
zDqLQPtu-YVF}a8}XEC{mS-<^!7jyn{X+LYJ*`Ad)^}9YieAj0FO-xtros24<b+#~C
z*@MlDYmc0x&jPchXZO;N`{zeoF01kFj7sC$7NT9Xzk_k{@m-DY&ssf;Syw$-SDw4G
z-WVRnpC6lk#=BPU`fJ~uT$9>sxM;w)c{ktwUSQ3NF5AcNw)eMvsa17rU(VCDbuUg`
zF?qSR5Busq`i$y-X>8`&%9txt&%My!`fA2~-p07jvOZ$Q?@3>t@y>rVTIuy2gSp%v
ze{;BRYIxYI@8*3dy3=kSuGO@>v>(g6{yl#+-uvaOp0E8nb-=z}OkeiVeZ3Ta`+7Nc
zF?p%yj?w1Fx@XgycI&$Kp7uPL*SfC_bn;eg<}&`BtnJ@;*Pa*SUF+`|alMC`^7}o#
z*iYB^V^ZTl`}_%oiC@P|&B<PU%=I_ZbuU`OJ-a${@AY!lH$>~+o$7g!+0ycs{6={O
zwCSg|x7L}3vs2?bo8FaTN0_Nue4RVjr?GE>xmRND;kUuu-^RWRCVzRT)yry*6c1zM
zp>{8iO&*@LD}r^d?}IfDYyJ>y$m7RgLmoc`lSlXPb1-Mz*e}8S{b}siVCtf=--5~E
zaQ1i~R8IXH+aFB-#ulOK4E=5nHu0OQv$zD6(;UX=b0eeLcWuX`)mxxu)9YKIX3+Hx
zLHUTc&uvgMX`kEUBi=rDX1?un7Zhfm#_kPf+~M%P52~g)jnPNm>QmbyGj;a;)8u`i
z9@T)ed=v_A4#$Ia%wvi1KI)jqq41750fjZklhqT2KbO6F0t)xcwcnFaT36fV_IKe_
z{>NG0d+&74owz>U0Z#`%o!rj`GvAqDXP|KFJ`?PPvQu|M>*{qVyfv=o-Uz0~ow4`O
zn^3;mysNxd<mlb=cJ4Fh>fBxH-#xrn{{bewbr0`D;XUUMGG~8hdd?q0;XUV%ps<el
zI5GZqbj&AEc*lGSh4suogUTb`v-%v0k2d*xw~DQ0wtD{}cm7RK_sb#9E&NL;n|9B>
T^YZb`o5wp@pMRL*dZzdn-+R5V

-- 
2.49.0