From f8887e1a038a7eceea9dd006837e246ee6bc598b Mon Sep 17 00:00:00 2001
From: YouSafe <yelagabani@hotmail.com>
Date: Sat, 6 Apr 2024 03:51:02 +0200
Subject: [PATCH] Fix wrong color space

---
 src/integration.rs        |   4 ++--
 src/shaders/spv/frag.spv  | Bin 740 -> 2088 bytes
 src/shaders/spv/vert.spv  | Bin 2600 -> 1620 bytes
 src/shaders/src/frag.frag |  15 ++++++++++++++-
 src/shaders/src/vert.vert |   8 +-------
 5 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/integration.rs b/src/integration.rs
index de7917c..601ef80 100644
--- a/src/integration.rs
+++ b/src/integration.rs
@@ -885,7 +885,7 @@ impl<A: AllocatorTrait> Integration<A> {
                 .array_layers(1)
                 .extent(extent)
                 .flags(vk::ImageCreateFlags::empty())
-                .format(vk::Format::R8G8B8A8_UNORM)
+                .format(vk::Format::R8G8B8A8_SRGB)
                 .image_type(vk::ImageType::TYPE_2D)
                 .initial_layout(vk::ImageLayout::UNDEFINED)
                 .mip_levels(1)
@@ -920,7 +920,7 @@ impl<A: AllocatorTrait> Integration<A> {
             let create_info = vk::ImageViewCreateInfo::builder()
                 .components(vk::ComponentMapping::default())
                 .flags(vk::ImageViewCreateFlags::empty())
-                .format(vk::Format::R8G8B8A8_UNORM)
+                .format(vk::Format::R8G8B8A8_SRGB)
                 .image(texture_image)
                 .subresource_range(
                     vk::ImageSubresourceRange::builder()
diff --git a/src/shaders/spv/frag.spv b/src/shaders/spv/frag.spv
index 594c91429156b12315bc91e95284874f1e07cb83..f080f07cee1f6dae3e4a817b96ef34338d0f04bd 100644
GIT binary patch
literal 2088
zcmZvd*;1215QPUw5F!Z3CW0Eo1qI^*vWRS25Y(^;BA2P(kU*-kP$8h+S!G#1i#J|#
z?K}7`-e`HgKhst&oT^jPefmuI{4>)@Q{%`v=NjC3*Y5UQZFIRtF-}}_I44s(sl;)0
zKQa0E0g4N*DHNjVa4jyP85DzjiNLC`CcG9pr6r~!vYM3HxgS~>aWR)nrIVYR$<#_Z
zb99tGu6`_J(}jE~o8He?vYBfBG>fjKPM0rb3Mc#Zf~XYrwWF?8`*!ZQa_}yF5EP3+
zI#($d!@NOd^fWgy=c3w2Od3gK$6S}!2mf6#Ij6965q(RzCNRHGM&_hi&gE+HLHUL9
z`)oxs`ncx9{J|jv{*?Tqpb`|rcr-kx@=5i1xlm?FsNvl5r5Y90`LD~*l}puhHT$7@
zQqhUjbewIzwENclH!>`DQnk2)s{}Rh$y@J}_c}oh;`qa%SM$k_URUM1b!*()aCn0*
zwEJW?i;D~WTF?FB^D^S{TQtLgVfn4zhDYD789jH0{(@$-@aQ|d4d0`R-I`g~qZ!-k
z^vY%({Fvh8yd(@I*5}6M5gYIvJTToA+1qCu%ckRd;S8o57B?UJx@bDi4bEV?8{&3%
ze=eBrrhGVq=|;tUPX_a*yCWaYV7i1jhWYnH@6*41(2QsdmhYiBw1!@t%M<x=fk8fe
z9=4t1Q`wwV?M@?Z#mBghIqC6NJ;!||Wj6>G$6xc@fNuMxY;vKgALb9L@+$?<kuT*%
zaMZ(J_Z;`WDVuz}L-bpk$pw!dpEnCPrA|V}+hXvIzr;i}qvcJ}FMRL3e7@m@!2a>s
z!-hb8d}?e9<lj>k^g99?_ytuUAKa{u@5=5H;J<i|W~B}>)^MJ1zqRWbfqk<le!m#>
z%(QeZn)$ur8`?DU4ZQn40X;q%et+uyxcB)6_<n&rXR1TLT=pFO!G6dGXZj)8=-EH(
zuL*GU33}?mnSMkz`ZlT2-x9bFauTB-EZ1$>^bwlRKL1_W@bm-u<C@_t|Cnqz^T%bg
z2YkNgp1?PJ^L_uwbMynf(xy{lUlRiRqHoAa9<+aSzQpV<xM%K=(IIdbyq!*gySS*?
z&VEWZx!DWrrUi7HzUGYQ;2G5Cjq;tWCC=L+$E?5`fL|6zZ_W$kqi3l>FD!&M?~;EC
l=N1LlGK^c24M#oWmOV%PEmdT{&ji*l3B<|GdBAfXe*y7bn=t?Y

literal 740
zcmYk2%Syvw5QWFKskOB?tF0nPtNY?YMG)PHWE1E@)Mb!1LLerkO+_ET7xSsy2%ax#
zAp?`iIdlHGl}l&aW?NRbrX5;tT`P$(YgjdluJ`DTm+5SLae0oSW#vqWrfoH=DB|z0
zVN7C2-jMIhJJOO<6aAG{+3ZITE9&TazB`$?-h)4#&;4ck6$O42#(_Tz7r`_QKLT{M
zf-a1w(P~x{I8qdQJLY8llT~`3M9D(!#8k3*!Z@cK?bQ+gmc*%_2A}C_p-#DunZx+$
z8SLsEyPN=IVD>6v>YS34kq3`5lw<0l=T<#!&;FzA5|;h<^<Nb?ln?ZtJAv70sBcY?
zYs25HF*CuDuPah}lLs>++>xelDpC(zv<*I1rIr%tsMlVL;OGZtCye>_6sgA^=zEIP
zf=3T#XSgd}9v!=2%=|0HQM?t)%)4^t1=F)DryrP_2XgAY=oR|D91Z;Unj7e!I^^!u
Mh5Nw$X^Lz4KM4gmmH+?%

diff --git a/src/shaders/spv/vert.spv b/src/shaders/spv/vert.spv
index fe6942aa959d8b4e7b880b15e2973c1433dee7fb..a8b917a177186f7196a6d3337e399a962b7f7431 100644
GIT binary patch
literal 1620
zcmZ9M+iMd+6voG-No%#OHMaFq<JNeu##<|bcqy%{4}k`XeO*ej=)gJ~vKvvK1QGnZ
z{HuHs{C>MTAvoo9&iT$aGv7I9NxjyYH|CT%W0uUWDc7p02{FQ&#UA#KdfhA^c6W9k
z!B{r+f(U0tEY_Ut(}{KXOR|>if$X8|iR`JYuD_c0-#R#F7ERcT!o$O`_cj`gMp2f3
zP2woAE{=wF91n8)Ifl0|!?SLXOop?Bh8VMNH>4RwACjmakB{SV9)D3Nw8ZhrrJ2ob
z>V(c0d}=9h>+&P}O)qn%%%NGi{ltzAY?hz6K|IaT338JpndTa*lOC|pM=z|?lSSM#
zm$dgM*~k6Vaa#_KK5$kx7{{@TGGtKC6=9?Q_zh*~Z#v2M(<B{pj<@KybtObh@5On4
zT;-XAbwz02=|nj_W?e3imGkGzFjF3VfJe=qhY!XKLS^vbg;m{c`7HRpzD@}hd@#?a
z9?$1IwGjI}wGg9;Jhk|^B^JCbX+RVHy1b_LK(-;iKJ+3+>zd*P?SYK7UB##6bN{B|
zMeUpiYs;fHe+M}%5bvyZ--j1f%>2Q4XSv{&_wo+$ii}0f8|RA1yg}!xd@yR@{`1<=
z1kU}$tqSwHFDPcgU(*hsJK9n~k2y>3vUchL<1S*pFEH|(mCsqPEs$@__t!qYTf`-Q
zTRwHt7w#iwj$qu^)s7aQCuXi-<R5E?>uV!s&S1V)<_!Otz9D+T{8(`Q2x(~F(|_t-
zm(d&g@ls6c*pPw$6o>etjDCaf38ChzGWx(=X3z3{k^5Dhy(XXY;6EyCOFnoY^E$4}
zM+bfNIy&;fy^b65(E;vt+?4Ni%$~g^oSfHjTR!K(y^cHb!2?-e9jE8_WauNu+yWUI
qnbUn4-zhb}Qa6d=qnES%*fT3~%#@fMv)Yj{7jn#t_^+n)T=oxs$$EkS

literal 2600
zcmZ9N*>V$C5QYynvcZ5Iu+0{1<e06>#O$l%4MRi{femI2%Sgy$d#Z*Rl{A7RS4pK(
z$txspkQ=VK&coyxxFMDQn>p=Laj2%d|NgsApFU^g-k!;R=eD^4x5qVHvG%$iA<pe`
zeYvhwSF6+QY;F4DrL!;wU2jf=Gb9#kyX18}O0dsKu1M}lRwXq_UDB(6J<|Uual3Y`
zRD;U$a;17JXf&HaJNq#XgE&gUU@dBejVyW-!rRfsi;_m%S?ea0#OU6;<offD+O3UO
zL6+wA>aA06)-TLBxC7dsm{jh6Cf(>{>H2!%kIIkJw_(f24@+-G8=C+n&Et&xjW}2d
zTaUt47XBbtXn|uBOWRQvrHRn~oX?zcJW8_F=qH_uoFc|N6kCd;=FO;`)ssfJ6=TZ8
zI&r)eD`|$zm&JLQbChVy-0yR<(kq?z=2DtaEd!@Na8|p~3d1C5(+2067uNiQUs8m-
zOFP+88mEjR-;2A9k^*Ay2lAWsR{gb)*QAy6@R9eq^C-z(cUu*h9jkaTZVO{RU})np
z7cgdE7&aL9T~UO3@G5=|<FZ-s?Yxr(l=H!i&-si`K4-(Xc+LCtM4Yn_#~&68-h_If
zC+z*Q`lQQ}1LEtW%6;Nx`8%Y+kO}!ay$wF13VWo<8<fVjydl}-fKMsT9{VK!zB@j9
zS{|`skAWk`J0Sc1`@4(AJ18H_#CS)9y{pu>>W#?<Gcn##VY36j&s)8+d@vK^eIe|x
zKMyS!k2?S};ha<QISY3=s{c<*mnAIf;D0G$-bdt5OTz~nm&M&%4Ppp$<_C(|5ufos
z-wPP~oR=<3sLMY17bGm}|6<`T(B~!D?8_Zf|FSf>;MB+G8?<`#eO1DOe@&VgHOAEi
zZ;)JKbJDy6FlyoRJ%SNm@HV;D+fCWd{XB2}o!l?@%d$BqbD<tS?;MPJ_oeB@;`qG#
z0xM?zM85F@Z`)b%YaX++*X5IcS>GHp;yzi__#mVt4VQP$?*;F5Q7Ch{E@5`eYgQc2
zIU@o8O&t8MB-{u1qL77L7jxp?x^r*%*dIQ3Nj~}Dzk2MJY;fjieS9sOK6qQ!M@2Tc
z^>JG^eSljZ-^k{^=%YLLTlvJSkMCrY4{m)_WrNelil)My+?CKDG49oR<Q`Wfykqv7
z({%CS(=WLXCEVq*Ce4ib4F*G4+!6OfF84tEnq~s`v1FG7+-CArHuZQ9Hk0pVgWvPB
zd?uS*mSN9jgR!4sFFeNncGj1&$%jvz+VsYICB~k-yH^t47_pl7KdSmw32%=6>7B)Q
zb45Jf8h__`f4il5e?!vzt%q;#ar6`au=m*;-d+iH-fN#h=@E|&OVbbaz>L3NHhk`#
z{6iA3gA(}c2WI@wWyAl)^T%a_jY+J=glzD#WVfnP_n3tF(l7Bz3H9-bS^eX(!OTA)
cn;!5v&q)bq_*>r<bx(N=9=ZQ%eqhY{e{96dP5=M^

diff --git a/src/shaders/src/frag.frag b/src/shaders/src/frag.frag
index 674db6f..817d033 100644
--- a/src/shaders/src/frag.frag
+++ b/src/shaders/src/frag.frag
@@ -7,4 +7,17 @@ layout(location = 0) out vec4 outColor;
 
 layout(binding = 0, set = 0) uniform sampler2D font_texture;
 
-void main() { outColor = inColor * texture(font_texture, inUV); }
+// 0-1 sRGB gamma  from  0-1 linear
+vec3 srgb_gamma_from_linear(vec3 rgb) {
+    bvec3 cutoff = lessThan(rgb, vec3(0.0031308));
+    vec3 lower = rgb * vec3(12.92);
+    vec3 higher = vec3(1.055) * pow(rgb, vec3(1.0 / 2.4)) - vec3(0.055);
+    return mix(higher, lower, vec3(cutoff));
+}
+
+// 0-1 sRGBA gamma  from  0-1 linear
+vec4 srgba_gamma_from_linear(vec4 rgba) {
+    return vec4(srgb_gamma_from_linear(rgba.rgb), rgba.a);
+}
+
+void main() { outColor = inColor * srgba_gamma_from_linear(texture(font_texture, inUV)); }
diff --git a/src/shaders/src/vert.vert b/src/shaders/src/vert.vert
index e1e025a..d67cc6e 100644
--- a/src/shaders/src/vert.vert
+++ b/src/shaders/src/vert.vert
@@ -10,17 +10,11 @@ layout(location = 1) out vec2 outUV;
 layout(push_constant) uniform PushConstants { vec2 screen_size; }
 pushConstants;
 
-vec3 srgb_to_linear(vec3 srgb) {
-    bvec3 cutoff = lessThan(srgb, vec3(0.04045));
-    vec3 lower = srgb / vec3(12.92);
-    vec3 higher = pow((srgb + vec3(0.055)) / vec3(1.055), vec3(2.4));
-    return mix(higher, lower, cutoff);
-}
 
 void main() {
   gl_Position =
       vec4(2.0 * inPos.x / pushConstants.screen_size.x - 1.0,
            2.0 * inPos.y / pushConstants.screen_size.y - 1.0, 0.0, 1.0);
-  outColor = vec4(srgb_to_linear(inColor.rgb), inColor.a);
+  outColor = inColor;
   outUV = inUV;
 }