From eb86456f31b792a128c4a554fec134451432f854 Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Thu, 8 Apr 2021 19:55:44 +0200 Subject: [PATCH] elements.comp: don't modify BeginClip bounding box The BeginClip and EndClip bounding boxes are absolute and must pairwise match. I mistakenly modified the BeginClip bounding box for stroked clips. Signed-off-by: Elias Naur --- piet-gpu/shader/elements.comp | 4 ++-- piet-gpu/shader/elements.spv | Bin 71296 -> 71120 bytes 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/piet-gpu/shader/elements.comp b/piet-gpu/shader/elements.comp index 7fb02fc..56ad6e2 100644 --- a/piet-gpu/shader/elements.comp +++ b/piet-gpu/shader/elements.comp @@ -386,10 +386,10 @@ void main() { case Element_BeginClip: Clip begin_clip = Element_BeginClip_read(this_ref); AnnoBeginClip anno_begin_clip; + // This is the absolute bbox, it's been transformed during encoding. + anno_begin_clip.bbox = begin_clip.bbox; if (is_stroke) { vec2 lw = get_linewidth(st); - // This is the absolute bbox, it's been transformed during encoding. - anno_begin_clip.bbox = begin_clip.bbox + vec4(-lw, lw); anno_begin_clip.linewidth = st.linewidth * sqrt(abs(st.mat.x * st.mat.w - st.mat.y * st.mat.z)); } else { anno_begin_clip.bbox = begin_clip.bbox; diff --git a/piet-gpu/shader/elements.spv b/piet-gpu/shader/elements.spv index d1ca8dd4f2d9240477bf14ab198f8eff4b1beb20..6bd53b3ec06e76cc0bb53bf1053246fa7bb70323 100644 GIT binary patch delta 2410 zcmZ9OOKeni6voeVX4;v-QYK9^nl22%ZbXzZnn+Y)U1&5h(ztSkO)UwL@)$_EFy>Z^ zx^v;(xG|x=5i7zJ6}4ckQpFdb_yAGr0~ADq589$uzu%pE%^b4}-IeY>tMT{h z_(yg8Kpj6chiC0G@!qv}uk2Z~dcB1U%WcYgB)qR&3Qo-N%-HEVer68O+F9{UmF~40 zSFNkms>|AxYbz_gtKy0q=FPo>raGRl@oMXpV-2YV)x%eq=C+fPXnDl z)L>BqV;)$$96nDt>=i$f;3TB49$-S8zB&j}`a!VT=pX=2|UF<3Sxmo>~lI>$_w9;@HRIz9yaf!tVF} zdciJ_rqL5mLxSNrqYl%3I!(uYdZWy=dykaSgt}KaIa4@3p5{&A7A?;Lze^`4nT2ef zI!>3WlCiLBpuPB(l(9(7M$hDUcyMFu>bIqgYdxUW@Pxi2jJ8DkHpkjNar9esYzJa( zLY#=$R;X$FwD(BD*XoL+d?1X*kGqqjeJIYu?I#+J zABTx79}5$mEIjmZY*c?x_=fo8@&bTk8nmtbafn(R|K4g;ZAvfDg3am=tSkEjOOD#DvZXhP)3)0zY<5MX?w(v38S%}R}S0< z_jSR-I|eQ)ej`oz{}vsOMmH(txR#IZTVb^1=)Mz2Pmb<;aUx>#(fuHdP8Bp4?xQ;y zjqXP&C$)TZKMAAp^U<9WKcVHLgX8C;`&rmWcUl;ZjXwM$%>7dVuTuCj9bl&OYr*E* zqyWL$cqV-O{`TNEAzn4f_Wmvnos#&B{1N-`tdL6YF#A&)`U?3>i=Pu_A3EvJ>Wb!L zm=PX~^YBHB^99k7J1+qT@4;Wf6ty{BOUSYOTN=7g>K|dWDYXDSz$DOUU;K8-y|O%96w@^I43-%Lg)~m zs@yfPkroz&X&XlV5rF&j<_XWrC;H$C=fl3i#U1m7I#in9Yl}FVztpg`R7VHLAN>y_ C{AUmV delta 2611 zcmZ9OTWnNS6o%JKXWGudfYWNGwI;@3UqqA|O(ZI@z8Fo6<ijGy0-^VljQuf&_{>3alGJ~h>Yw`BZdt2KsA!9UI%8t))s^ zKW6dq89Z%M;%mE$ookkNbx&_2Z8j&?TD#kq$Ft3m_WxE>cEK!OGtEo2*X&Iu>Py4d zcI7ThNXsaGp-NS$XO(!Jo>z)xs?F+4?YCTA6%-Q|RaK?78|3bQPc5y1}T#-ga zoezmqQRhraMV%8*MV&vAw5Xyn53E5BRMQ>yh>w+VCZw)z9}=go&he+N&d-WdSLYMr z)YLiosOK~JB8RDQ&v_&c(q^Du`0qQ~GnOb~a%Z_B4WiQ?jA=YaGy+v}A;d z31xp)+9Jg)RSX4%FVTU#T(;+gFH+&rv2(1^nq_ZOfnE@PGHYSgx?HeH7*1YdUlhha zi1}t=G`GJL+m|WV0{L$d$A_P5FUOjea9(>w8nOJ`@71i`ABi}&s6xy1+$txMl7t{R z*+ZHP+iSus7$4tENthGVq$F$>jvw|WZFZY5g*q9oexNqftmBEgBOF~_$iFVzj>vaf z-5K`x6dK=!k(ce_7pS4HJ$i_0Owa6GH?!`b2-ah|+< zgJEJ_ZE;A-V43=^aCuST`1myM3D4K?S>Si;gqP34Y|U!w6+Xzc1xrq^6_0 z<4|~HO>M^qQVwaXS82FOJ`_eS_K`UHZF;?WW9_gw8L_pfXoHG9B8<*KxKU3y zEqhD{;AnWq+CuP&l%pD)L1r5kM&rlsMCN>83`5&bTpD)pgsC6f$ zoY3&r{UnT5-nyT~(aT$RN}PC-l=MFbUx+&l4XR+kBv@^D_2$+eW~eRCcb?L-m1C6pc=F8}}l