From e1aa9b2f5db695e74db7e0f09e12a830aa043f7a Mon Sep 17 00:00:00 2001
From: Raph Levien <raph.levien@gmail.com>
Date: Wed, 3 Jun 2020 20:59:19 -0700
Subject: [PATCH] Remove bbox guard

It's probably not necessary.

This development still work in progress.
---
 piet-gpu/shader/coarse.comp |  28 ++++++++++++----------------
 piet-gpu/shader/coarse.spv  | Bin 29976 -> 29380 bytes
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/piet-gpu/shader/coarse.comp b/piet-gpu/shader/coarse.comp
index 692eeca..2a3ba56 100644
--- a/piet-gpu/shader/coarse.comp
+++ b/piet-gpu/shader/coarse.comp
@@ -413,22 +413,18 @@ void main() {
                 // should probably be stored in the annotated element.
                 uint path_ix = element_ix;
                 Path path = Path_read(PathRef(path_ix * Path_size));
-                // It may be we have a strong guarantee this will always be `true`, but
-                // I prefer not to take chances.
-                if (tile_x >= path.bbox.x && tile_x < path.bbox.z && tile_y >= path.bbox.y && tile_y < path.bbox.w) {
-                    uint stride = path.bbox.z - path.bbox.x;
-                    uint tile_subix = (tile_y - path.bbox.y) * stride + tile_x - path.bbox.x;
-                    Tile tile = Tile_read(Tile_index(path.tiles, tile_subix));
-                    if (tile.tile.offset != 0) {
-                        AnnoStroke stroke = Annotated_Stroke_read(ref);
-                        CmdStroke cmd_stroke;
-                        cmd_stroke.tile_ref = tile.tile.offset;
-                        cmd_stroke.half_width = 0.5 * stroke.linewidth;
-                        cmd_stroke.rgba_color = stroke.rgba_color;
-                        alloc_cmd(cmd_ref, cmd_limit);
-                        Cmd_Stroke_write(cmd_ref, cmd_stroke);
-                        cmd_ref.offset += Cmd_size;
-                    }
+                uint stride = path.bbox.z - path.bbox.x;
+                uint tile_subix = (tile_y - path.bbox.y) * stride + tile_x - path.bbox.x;
+                Tile tile = Tile_read(Tile_index(path.tiles, tile_subix));
+                if (tile.tile.offset != 0) {
+                    AnnoStroke stroke = Annotated_Stroke_read(ref);
+                    CmdStroke cmd_stroke;
+                    cmd_stroke.tile_ref = tile.tile.offset;
+                    cmd_stroke.half_width = 0.5 * stroke.linewidth;
+                    cmd_stroke.rgba_color = stroke.rgba_color;
+                    alloc_cmd(cmd_ref, cmd_limit);
+                    Cmd_Stroke_write(cmd_ref, cmd_stroke);
+                    cmd_ref.offset += Cmd_size;
                 }
                 break;
             }
diff --git a/piet-gpu/shader/coarse.spv b/piet-gpu/shader/coarse.spv
index b3a90c89d27c70e089535afb0615701fd3ec8fec..2cc0acfe36e52bfe32eb5cc7164197d9f8d4276e 100644
GIT binary patch
delta 1864
zcmZ9MOKg-?7>3WZGi@R1qJ^Y}m>4jo3rt9KVF*#vkg$+llakOTlBz5kHPp610byuq
zmHWjXrC`0(TT!$|2M`4cRW~kR1BM;O1q*TEf<@KD#OImL2hIGGlk>jscRA-f=Q}fY
zH}~_MTw`s`qxC7}QUkvqziIrdskkYhQvX0-&r2IqD)8G3ALw~y<A(mtFZ2wm<<n3_
zOMLQScyD)K_p22?TE+KP@gs27*z|IFjeI)#z+P8gG|PsX7qxxxKrSycQN=&2;-{<l
zbm`aTpK`gG(#gdu8kU~G%J=MYHe3fd17FPiIP8~PN;9QD9<D8v>*q+)D%@I`tv`4-
zZq^?BN$l1hTz_j1uHD*$Ux!<J@Q2{m9(-*|?J1ilbm8DBghMObQwXlzQwUCi<S7K#
zK3%%JY<9(hHp(=-H_LUjG`)sXFC)~x>{@$ETR%!4W0>Rihz7uVsy~xzlf9w#bma)Q
zfbVf8k!5Q()X`ELMBU1WEZe|(sz>B@u-Qf`EA0U5ryf49ga0J^?uyS&xPI!f;x2Fx
zqnF+8U=W-A)?O$U(X_=Lc7u&qw-Rqvt&QB?(jKsR#^-XRCzwaz>iT=j^4QxOU~_2m
z#^ozHGvnUOr#0y*fI%8{vJEicR7k6_?E|l2R@ZJ@sYPM?!9&^a>lPIcfMjQgoZ>hR
zg4HZ{mdL|kzkgG{Y&!&3`#aSnv0HAzehmCy&D?4>o!s3tV|xqy2(!Aou}Rg~&BAim
z9EZ$p=WUS8le3@R0o$_PfT41IwBJS>1DmcN>{b>qpM<NA;v+u=_IavD+`C}&dL!nQ
z<5#@D@Hm2rT{y1gJp&lAx%a^)adDH#_0hi*?L%;`awfhrdF1*CT&UQ5bMlp`SjVxZ
z^fAPLJA*Vv!cV|zE@onRB>WVtuQn6QBW@BL8}UKQwLQlgpMx#JxYIVUg3abez5u_-
zY>+QMD*qB}!uhB36`FcHs41|T|AZ0uH8|p2P_ExUtY%jgY^%fB#QL?xZ=nlWBGQ%M
zYPV=oL$#?z{b#{y!Oy`P;Zt;hjeQ=jk9zog2fl$V_yzb)I5F$WLEj_jq+zm>=m)UL
zwE03VG5h&Kv|VJVS&G=&n%Ic^Qa01M{IM&jaUIiOxo-uhbQSzO^K_}HtA5G<qf_--

delta 2405
zcmZvdU1*kN7{~8-d#4ucV4JXtKq|rm1ECH=!r~?9An8QGw4hkEgHgk^O|#4%HLaFu
z<=clVEBmyv=EvKYAFI|(Gsr&F#>zVDpgM?%u!5l9?|GjK$4l?Hx&QzFb=}v;{qgM3
zPo=HDlv<mcE}EWFDb3*Thdr&owPg>NQyLiT@42lzr564kgAexH(S7s4@>_aVs+H5W
zLQDMQ&%yh;`n!4yzP*9J+`!+2lVjQKd5&`0dB#31PdZXv+ul*xe@4#J9BklY4Sc+T
zPu5PhkC#fPYQr<<&bVMNR(@B_q2OtN!|<8Rm%xseQaV-p`TXXVynnVNU4h$dX8RA`
zg`2$xzYM#*2iM=;gKM|<;K$(h9{e1*y$4^A(!w+{MYs_McOe{R!`+48+TDfV1W4{e
zaP5<|(F;${J$HW5_A<=B(np214cAv4ThzJqPSife2pc_uwI8gf`svi12ATc+LlkWT
z47I;fQ;sA0a<r+@S5!wAc4l{>u3+pgqOSz&ss1++B9il;6mJE0gU!^<(BF(!vWht>
z(dQn9nw5y7l6%2_)cdSAy1F`lQD=4^@@hsjnt^pyx0DFw9Hp!Qo67R^H;tvNV~$ev
zS<6tf6mgVtKe#9*%lCXeLJy;l)tedNxB*RD?9&5a7pq%b1b2?&9t4}*g7r7C#SJn0
z^ThOdh%r>|s8=V63$W26YI_7_;}mt1*P^l+WfNl^2j`o46s)KEl_c?Fp%x814lX*)
z8{Oib_f}E2Fe1tmU_I4i<&$8etuHb?1=deJe4Yk-xz-duTjBbtM>oUPojrpx%!rK7
zg7sFnZXdN;g-AZq=fNJxHn7<)Wqtv!uD_359+kWZHiowC%<_5ckn3J5rz~9#aFIrx
z{0d;esU=;F?G^Af%<9_xs;EU9uY%RQA&yA=8k)A9#POBv0IRLS$5Vd;%q6WKyT;cU
zirz`FfjV({3;b_WJ-MGCxy7|(dmB89S>59NWT{1QyTJcf+-`Jjm5e}sTlPTwoY{ea
z<T|<SKcdyZ1|I-h*jdc)z|}Y4BYzjXm!Tf(-UA!g<1(&XKkeqt-iH`?>ehV#R}ZIs
zV1t<4AaZ>y<OZ|@;8L+e`@!-!hEZ@!VLJ$xd;Uo2L(kv;gf7w;0Y3t(nasfQ2>3Br
zUu_1K$GT6zQOForuI*ZK90J>f>&BVo^U|z(C7(iW#mPk)qw^!x-xqf*{S4&@BVN-{
zu-aipczzBxbsV5vKR-rstDNOS%-*u0>UGyI$i9G`&B};=46Zi8rL|aXYOw)dg4Ke5
z1#gANclv9%KI-A~4fr_mf**&UfU{<C{yI(|<W9^xxEsEhlVF2s^TkXs`|~@g?OTSL
nt%z-{jY8xT)!rp@F8&TR&SMfR_vzr2z6amL%s<^F)6e@4NR3$w