From 9070c457d64cea44e927edcfaf7fe48dbf333490 Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Sun, 21 May 2023 05:40:26 +0200
Subject: [PATCH] testsuite: Make clipped-repeat test work universally

Cover the rounded corners so that they cause no visible difference in
the end result.
---
 .../gsk/compare/clipped-repeat-3d-ngl.png     | Bin 1760 -> 0 bytes
 ...repeat-3d-ngl.node => clipped-repeat.node} |  19 ++++++++++++++++++
 testsuite/gsk/compare/clipped-repeat.png      | Bin 0 -> 879 bytes
 testsuite/gsk/meson.build                     |   2 +-
 4 files changed, 20 insertions(+), 1 deletion(-)
 delete mode 100644 testsuite/gsk/compare/clipped-repeat-3d-ngl.png
 rename testsuite/gsk/compare/{clipped-repeat-3d-ngl.node => clipped-repeat.node} (74%)
 create mode 100644 testsuite/gsk/compare/clipped-repeat.png

diff --git a/testsuite/gsk/compare/clipped-repeat-3d-ngl.png b/testsuite/gsk/compare/clipped-repeat-3d-ngl.png
deleted file mode 100644
index b9a847d7c13af6db15e3b19941cba0006821ed27..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1760
zcmdUweN>WH9LKM=uoulJOOKLnc&fwNrkNX3m|NmYs9DrGg)hTnHDgOKrvf3$Y^}!}
zxrVPn+K!>Q7t1*@U!bO?Cp9=8GGBlc91=$nof#0Id$j%0+28%M^PKa0zRx}9{+@e(
zzwiCr!o!E6+}3%o0|2-kj3$r(aL$D_v<3l3&bd!A;1?n_CW-)-mY*AvIzBv5dXVth
zF{aR{ZlrmTw{kUK)A#vD-1JR7fMEF-#9^Cyw<0v2Ub~$hZ2Z)9?WpJMEp=J@T=)-U
z*Y|dZUyd%!7*eP3hKhdTC96H8^PEji#!TyT!o8o5C1WO2LQo&+h4k7I+Rc)NQc^?Y
zgHq`3lLZz3(M=n7{gdFhG5`Kk`RZW`_T>=Ik$rMS>Q!Ss5YrDy_t(Y|4TD*GIjt=%
z=7uSJjNb9kXf*cW^pBwv#Zaldx}4M|dk4%ivM}fd-$h#*W_zY=Aoy_}k;<S_sb2+q
zb3){Wa#U`YCW95|g@+)v-g*H5;UgmEv`$eMA1|n7Jrf%hO`k9HrQw*t-k~U0ME=F$
zRp5D-L^w~0Q{eG^0i2;NQngw=m9AXecSYT{8r;AZ3u>*$iH4Rrrv23)7vd$ISa05p
zINg>8g#vChoL(nyZf<U`+ZM9Nl9Q7&Q&%FM#CifSe~dVikeJvWHdR4KjLBp&2gKZK
zt_Psv7gDc+JYXIi_u)k{!l#`;lGi2pQ`x?=fX-l;+mv?!@RVze>M2TI9@?^@x_dPk
zcYa?aJkz?gUOI5*MIfHH9%NkoE!P^#iTV?Z+E9L!Se$Q<1)zUqVsLO!Ctt#?lXeY>
zoWS94g!4y~ItW^>rY4&Tz{jmEjg9AU+CWRDOyH2M0{1(%p-^Wd?WVGs^Tka7+ySDJ
z1qi~!X}kEX@Pq_%a&oc^rx$SIox%N7SHuMYPLx$+`V4>*-;;WILQ>mP^Sc0i(BGUy
zY#lXwEXzR@^7yMNXTZJK`lG*=G<FnD99aIhp$EV#U%MZ0d*4p@Fm4B5npROyy(W#S
zc(mBoc#k%H+s8K5{aTvNCTUiITf*`Gb5M~K!5n#@;#81<{cYu&+k3rJS@)K=SJ1c9
zmj7hYL6%|j#${jhppYipiZ58zM~U=*r62}Ff9)0)KL&GqMLvwiNP5$i(rGq4aqG#w
z*QNc885PSDY2&!Vu2mULMx!M0GQ^zIKBQqzi%f;m+7%a2gDPKycE-NJnH4#|*+^#u
zRocx(<>h5%;#XA&z_os<%-N-#jq|A)cpgr`o3haWOd704WlI<V#cobeisNkp7r<p*
zJ5(2y&hW@(v)LxJ_DH~HClH7gl|)@~pNxFaI9>!*#O{di+}sYI+>yoZ?r#2s-(La6
z(HO_eiAg7rQk5y&nJ`0`<@HPqVMLGp_H2RyK_ZSMQ7HKioqlIQ06G=#yL6Rw{*I*)
zMg-r*$Hyl>*XTlVlR^-Tp4b;KCf2yq)NKpXiDC9HW+PA$)k^qxVfCcm$zO+yLbhAb
zS7@e1@2Y33fu(X<FU)s5O;=5nN%dzZ<}BF+dkyv4CFI=QsVta^6pU`5oFWP8t3PhJ
zB7m1ZDt2t|_|6U7aF^F93;}6{63Eoi$xvy0aCu|H!_3@_j5}l^8Afqa6<iO~?|#Vk
zbR~_Ghn*o`$65BnDDy*W$pm~N%nDyu1U3ePMQalXNjzv5@|>YV?*c3Ws~6G)_Z;pu
k5p#P~%wgHLQ1uIbydA=t<c+u1z*iPH7;%Wua3H1NA9E!(O8@`>

diff --git a/testsuite/gsk/compare/clipped-repeat-3d-ngl.node b/testsuite/gsk/compare/clipped-repeat.node
similarity index 74%
rename from testsuite/gsk/compare/clipped-repeat-3d-ngl.node
rename to testsuite/gsk/compare/clipped-repeat.node
index 288560c89d..86fe2159af 100644
--- a/testsuite/gsk/compare/clipped-repeat-3d-ngl.node
+++ b/testsuite/gsk/compare/clipped-repeat.node
@@ -30,3 +30,22 @@ transform {
  }
  transform: translate(6, 20);
 }
+
+/* cover the rounded corners */
+color {
+  color: red;
+  bounds: 6 20 25 25;
+}
+color {
+  color: red;
+  bounds: 617 20 25 25;
+}
+color {
+  color: red;
+  bounds: 6 131 25 25;
+}
+color {
+  color: red;
+  bounds: 617 131 25 25;
+}
+
diff --git a/testsuite/gsk/compare/clipped-repeat.png b/testsuite/gsk/compare/clipped-repeat.png
new file mode 100644
index 0000000000000000000000000000000000000000..cffc4dca25937f62757b5a8912dea3d7bea1a14e
GIT binary patch
literal 879
zcmeAS@N?(olHy`uVBq!ia0y~yV5$MKJ2=>YWNo2Y0RscGnWu|mNX4ADcO3Ji4MkWT
z)h`H29&wjBxMy)OGvlf2858`j#wmOa<JEh1{QGerI{EJS$Lss=R`36ywtoAyUB9^a
zZ{{DXGyXPv<Ncn$X>ZIwpQ($_zwzt&OLYc@0?mW$3<Byu7#JS0$TK+1dBDujAq;du
zVG}=tg5L*5h9jJI3=I}kQFQm+@xrgN3=IFG_g}O6%cD=JHF?$VSHJ&oA?o!jZJU(+
zlE2U1KzMWB<5uc>fO<iJ!=&A7x31fF*cs@r^&cjHqAD5Tt?E8;s>K8j>xqx}?f2);
zUoKx{-*@>u1H%vT+PAg8B;$xlMCH}T6{|lu9^873JO5MF<p1CJ;K>r~SDUT#`SqC@
i3{;6R3}3SS%b0K^KeHu#lPWMHF?hQAxvX<aXaWEx*e}We

literal 0
HcmV?d00001

diff --git a/testsuite/gsk/meson.build b/testsuite/gsk/meson.build
index df493d9332..eec36d5fac 100644
--- a/testsuite/gsk/meson.build
+++ b/testsuite/gsk/meson.build
@@ -28,7 +28,7 @@ compare_render_tests = [
   'clip-in-rounded-clip1',
   'clip-in-rounded-clip2',
   'clip-in-rounded-clip3',
-  'clipped-repeat-3d-ngl',
+  'clipped-repeat',
   'clipped_rounded_clip',
   'clip-nested1',
   'clip-translate-offscreen',
-- 
2.30.2