From 1916755b6b3f84329c3e3f3e9a4e1b6d2b4e45a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Mon, 23 Nov 2020 00:43:59 +0100
Subject: [PATCH] Limit border radius to max dimension in `quad` pipeline

---
 glow/src/shader/quad.vert     |   5 +++++
 wgpu/src/shader/quad.vert     |   5 +++++
 wgpu/src/shader/quad.vert.spv | Bin 3372 -> 3604 bytes
 3 files changed, 10 insertions(+)

diff --git a/glow/src/shader/quad.vert b/glow/src/shader/quad.vert
index d37b5c8d..82417856 100644
--- a/glow/src/shader/quad.vert
+++ b/glow/src/shader/quad.vert
@@ -29,6 +29,11 @@ void main() {
     vec2 p_Pos = i_Pos * u_Scale;
     vec2 p_Scale = i_Scale  * u_Scale;
 
+    float i_BorderRadius = min(
+        i_BorderRadius,
+        min(i_Scale.x, i_Scale.y) / 2.0
+    );
+
     mat4 i_Transform = mat4(
         vec4(p_Scale.x + 1.0, 0.0, 0.0, 0.0),
         vec4(0.0, p_Scale.y + 1.0, 0.0, 0.0),
diff --git a/wgpu/src/shader/quad.vert b/wgpu/src/shader/quad.vert
index 1d9a4fd2..09a278b1 100644
--- a/wgpu/src/shader/quad.vert
+++ b/wgpu/src/shader/quad.vert
@@ -24,6 +24,11 @@ void main() {
     vec2 p_Pos = i_Pos * u_Scale;
     vec2 p_Scale = i_Scale  * u_Scale;
 
+    float i_BorderRadius = min(
+        i_BorderRadius,
+        min(i_Scale.x, i_Scale.y) / 2.0
+    );
+
     mat4 i_Transform = mat4(
         vec4(p_Scale.x + 1.0, 0.0, 0.0, 0.0),
         vec4(0.0, p_Scale.y + 1.0, 0.0, 0.0),
diff --git a/wgpu/src/shader/quad.vert.spv b/wgpu/src/shader/quad.vert.spv
index 7059b51bc4575638f541d299aa07e0a12e4f6599..fa71ba1e0a7ad7b811e3d52bb1c7013051410aa8 100644
GIT binary patch
literal 3604
zcmZXVYjYG;5Qc|j6A%!Dgo}!p0A4{r1w;@M5;Rd!13^H%Y&K+pfh7}nH;8zHvaIrx
zRr-_sRerI`=b1gdnZiT8IsLxf)7|H`3=ZsHpJnT^joF6man>8#vH_GV+msEL^UQ_$
z3x_-1rNhULA2ni2HdqE4vo#wj?HYgYHS%T2Ch#m62iL%L@D=zPEPzGO1b4t)&;bv@
zApZuK|0eNJR^#7VPWe;tmHJ#^yxcl@g>Qw=w2H+>t3&6*^wt}z^~>$Xa_45zzK1$g
z>h```pTE&)HBkn$Z7J5gyRldLzFN7Kyw8WT7xCxysiM8qY+q_D<*PI_L}u6fe|;!B
zQtE3xSi^lO>eEH5XqRhokMcerF88ZQHF{CK8t!4#Skr6ez800eaF2^h&+d2RtM=>}
zgnl(&>fVOC7SAQ>RP}GsZ?)=k&GwaMyW4yKC3-khcjzlRc{eYXQP-EcdtK`Ja(6y|
zXe)i6=Z$Z=m9L!7JKe_ejb`8HEz`H!YW01dmFMqpAH6sC)4FHUo!E<J%~^QdfuWN3
z&K@({?;pl2St5pqkUdk;%wgOln4zw5_G=yQ%Rb-;?)f|9-hcaucztsF(C_)n9dgfK
z?waMk7r8yiJ$JcpLcWlA<X=oYzIT(W@t(6h>U+NOVc;Ib`T3?Cp;=$eIW%jkSt~Sc
zwO)UNWxnXmGqRRrgdI^I=WD;w-ic)&V_+8<JO{bHG57{%H6h=~Y(MhTiARrq|1`Sa
z+skhLZedoF@8z%OsMf1lE6?0o>gMwfc)n^o;M<wUfHe;$K9acojA9#WzUasEH(tMM
zk2T51k}u-r<4LpLerz>|_2dUiw#Hw9uS<UO9PIfg&3_o%dalv$^}hwO?9oK<V<peB
zLqxhar+}I;);VI|!)8nz;+~lI3{Vr+yUOfYn#c9az29p3zhJi4@XNjLY7y^!H(sva
z`>x;b>&*JBtzW(XB3{0jxbaKLj{TMU9wJ`udk8*;eHU1758tma`>lJt7t6O{?`ryl
zb=u74&~IOIf1A|YyY0+f;4prb*?Z!-81FsyZCLjNd#kSo9On23#rJBgZ@~ZmVh`lI
zE8IKg|4ZTb4jf7R4BxA72ELPXWF2MR0leqlWn*05PN4orI_q87ey4txuIxcAaz2Oc
zU5}j4V?UX551M-9d;#0<)XnKS)S`!d*yF&QW6UoBYa9R(^K#N7=G7GAnMKTN*y@{E
zy=!|NxYy?Md;PytL*F5w-**)8Z(v8fJsD%a?z28?yYEMVYpC}3X3`(0{BOh6d|Pw$
z<9#{~)O~A#$aw<IoYnQb16PlnC$ZJ4Ip2kwOJC%SvpS9D`Ta^y-iNb5&G&pU^*NDr
zroJ|rH1{HUKZkAXB(RP>M2;zJ*X9Uq8e7dAp`B0KKt+2$Y2N>c`vBW@IYOJkR;%Wl
zO<FbIhe@mE`v~n6a74b3vDK>iE+nm*?~|le^L>iuemElEXV_}hd~->w=DV0Q^Tpm?
z!kz-tz&&zL!Z(lYez<<u>-xfX8QZnF7JIkX@O_SLpY~-R*45{4(G_4#bDP6h@43Gp
z`n*5h*Dt|!pzm7Z;rj;eZ?-;v%jI$J8ra@DeGAO;@ZG@np6gp=mh1CP-UPli-^3{M
zEwBxYfQY%B^xx9`&EbBhZq6pNTEw@o?}EsA5BtfS%V_G6v%vN{b#vZfRx`&c^L=2B
zF0hV!`W;XY{s7zk{EKh&e-DgNH^%q)19%AH4*i%kroQ%5(!5u3wm)MVtM3@_E&fRz
c&+HdqEo1EWD)S@I0ru;9<i`EWZ9NJ814hpRg#Z8m

literal 3372
zcmZXVU2{}L5QY!=*nlXA2t>u05EYdeQ2|ke1cD|?jDcWKQ8!Dn#DklhxVu5iD=o`g
ztK=v7tGuzw=Q%sQoQjj`o$j}L-s$P-IT;+79LchM*+{lO`zh;<BiR5*mL1G$<vhQ*
zvN+x8ZcLv$f7XaY*<cxH%;D^4sSokH)yTIs4kFJXi^vkPjNC+SBdf?)$X#R&X&^bW
zgADRF!2CDF!`Tpjk2$pu7*}5|I?USclUMA+*z>L8UZd3^^BTGJ#%}#~yRqH5U$nPC
zhfCbtck3(bjaCz6FgucB<sC)e>HCJtv*dkyIC}|yUg30&XD#Y;MXP9+xq0rqZ`aBi
z6!mLGd!yOzMR|r=S(p5O_)uA^qH;FtR`heIl{E~$TaAr;m!imLU4yTRua)b2``^ho
zy5D0PU)DeEU&S}^Z?@{o&Gu@u-EIDiNpvj}cjzlRc{eY%K}Sm5nwEIJ-CfClX&M(k
z?-k!%E8n@Ece;)3^=98^H|g7Lwfa8q#J+G?U;E=>s>gh~`!O*0T)>XI9xm<P9iwKG
z{xB9`i5MC_d%A+jVcaY-&%VZ)ulv{+rw~Wj6FsxE?Q`>pc>6%xVZ42y?HRRw3z4_B
z??T&N*Y=HQ2cP#|UGLke#(Uq|p4;_nd+bKCYs}Ul?$5X52+SIYIR|DAV&)#0x>zsY
z!ICd>^^VNNag-B?Pq5lG>c`Q{V;ngFgZH4VZyb9+vzVg&1he^QUrKi5==!I?U2iU<
z{2pQ!(;nm3dlc*KIaJ=cdx^_u4|u;~$FQGa9!K2sOtSsDX`9cp%*M(W`FQ`~_w45C
zp7M<|D-QX_nI|+D@||KfUOxTKuOM0W>rB|EOZ)Nq*Rl5@Q>^r?(}*#OYn@~5S#-wC
z6!$)Y@-`x-xc?1i??xWaqiz3+>Hmz`y~3}(l(2|j#x`DCzy0hQ*RL?^b8r3H_IJc<
z+uyO@mr0NMYTNJO{~BHH@N3)uV)7fmh6KO<2BQBY{`<_XwT5G8o6Md~OrK)jejDY`
zFR!-WA~9=gpFBVu#{a-<UwH4v+qXN2`(B{-`s_)E9RGm$UX8Wq4<Jz^?a_*DPx=2w
z|7GHxpG15IS7EUyk0JK4y=si-IgW_`neP4sy6eQRkcE4S1?ThV_HuB(fWDXWB$#+`
zzKHHRaXHOfOb&Z{5)qp~BCnSd{u?po`6?o2?=EvX@8dN@{B%Wv^9?XLy~E%<gDxJN
zQ|Mw<&Ns2;(-*vP_P4;S$M30D@1TqMUT&s5-$fU91a=Nx%zKX9&!Zcw&wb1x;xC|k
zHb-FZp^M28*u{j|H-WvMF#9L4570fABd|;8VpYBm6ISKBoUkh26)?Xij^LX?7pwBk
zCalVLHDOi0Yhc#H5qxv#VpYED39IsblrZ_CwjZNgLu+P@tV#Ih(XEH)_q?7jd<*EF
z&9lrR<{G|F(9P4l%)@>4`IbLL+*58jjJ3~wkNWH%`}K2V3DLKh?C{;f_M52BZ>4th
z-52Qgoj$*d+Tpu{ZlCL0W!BbLWBvxYi})sd|KB2e-|BY>|0DHp9ou!{a{65r3(kA!
z4J0_%(f4w0fQbiZ6Ww*<a;`Cp$>BG#g~;&$aUW~Cg@}i}jcz?3u||J^7$a`X2=kAK
z-_z)!cEXtYSSMljRorbC-B^9`7XM-&?`#)wFJsL22J=HCN6gprXdCx0-FgxE5AM_J
A<p2Nx