From 8f687ed98d06e472fe64c8c59aba430fafaad510 Mon Sep 17 00:00:00 2001
From: Sebastian Wick <sebastian.wick@redhat.com>
Date: Fri, 27 Oct 2023 20:31:24 +0200
Subject: [PATCH] tests/wayland/buffer-transform: Draw the buffer with the
 right size

This test currently only works because the monitor has the same width
and height. Generalize it to arbitrary monitor sizes by taking into
account that width and hight are swapped for some rotations.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3350>
---
 .../wayland_buffer_transform_1.ref.png        | Bin 1420 -> 1419 bytes
 .../wayland_buffer_transform_2.ref.png        | Bin 1419 -> 1419 bytes
 .../wayland_buffer_transform_3.ref.png        | Bin 1422 -> 1422 bytes
 .../wayland_buffer_transform_4.ref.png        | Bin 1419 -> 1420 bytes
 .../wayland_buffer_transform_5.ref.png        | Bin 1422 -> 1422 bytes
 .../wayland_buffer_transform_6.ref.png        | Bin 1422 -> 1422 bytes
 .../wayland-test-clients/buffer-transform.c   |  34 ++++++++++--------
 7 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/src/tests/ref-tests/wayland_buffer_transform_1.ref.png b/src/tests/ref-tests/wayland_buffer_transform_1.ref.png
index b39b9c654d1b00a41af9c4746fcb748c660ae01a..c9242749afc7ea99e200d83d576f2e7b8aa5381f 100644
GIT binary patch
literal 1419
zcmeAS@N?(olHy`uVBq!ia0y~yV4MKL985qF{<{lj11Yv7Z+91l{~)+v@AAnE46F{G
zE{-7;bKYJ%$lGAR!*a0YU$vR;2L{*fG_4)&TR+W<{IKushKl>8RSXA$n^;pg#3m?4
zIJ6}&N{(_y!+`$jVB_^OFM0n=SpA6GPDjCcLj%u2CL<Q^69S{0(J&a0bdc9|i&HA&
Tqvru&>B`{g>gTe~DWM4f@%M_z

delta 65
zcmeC??%|$b#^^ZFT%O&OJMQ_K9|tzZb~16N`}sfU|5g;S=Y0FdjV4SJF9eDm<9!g$
VDU~UaJCOkhJYD@<);T3K0RT^r81w)D

diff --git a/src/tests/ref-tests/wayland_buffer_transform_2.ref.png b/src/tests/ref-tests/wayland_buffer_transform_2.ref.png
index c9242749afc7ea99e200d83d576f2e7b8aa5381f..8bf3fc7cac23568da87311a6cf76d77eedc4a5b3 100644
GIT binary patch
delta 61
zcmeC??&h8l$`NPGeec<-ABQ%^b~16L`}seZzU}a%TD#4L%&tt66__1G^B#n8N{Pp<
Q7GeMbPgg&ebxsLQ0Qm?OHvj+t

delta 61
zcmeC??&h8l$}unU!@jp0D(-KL?PTJ*e&!|bp9!lUaocS+WOikmtibFjn%8xUQ!3-5
R=K%&F@O1TaS?83{1OQLA7}Nj&

diff --git a/src/tests/ref-tests/wayland_buffer_transform_3.ref.png b/src/tests/ref-tests/wayland_buffer_transform_3.ref.png
index fcbcb54a1822d10acb9e2b7593bd7d7bbcbc3ced..9a68091077f933030f43c0ad8b59a4678c826ba0 100644
GIT binary patch
delta 93
zcmV-j0HXhn3yuqrK_q}M5Jka6?7!vMf(IqMFjK)lERUUQtO1`}bN2!cbnPAh@RqZ2
z0|x?=a07e`++*#Yz=@{A;s-vl(H8=d;BOTkUjGOmBQ3n!00000NkvXXu0mjfE*~Y^

delta 94
zcmV-k0HObm3yuqrK_tK+5Jf=^>Az*uLJopFnW^9(mdDPq)_~pCn5QRjq384ffWNbG
z0|)|>FavuF<6Wm0aHr|A*w2Tt(H8=d;BFSi2VeaN9}>GX6951J07*qoM6N<$g6&Tz
AkpKVy

diff --git a/src/tests/ref-tests/wayland_buffer_transform_4.ref.png b/src/tests/ref-tests/wayland_buffer_transform_4.ref.png
index 8bf3fc7cac23568da87311a6cf76d77eedc4a5b3..b39b9c654d1b00a41af9c4746fcb748c660ae01a 100644
GIT binary patch
delta 62
zcmeC??%|$b#^^ZFT#jR&DR<oSH9rn)jO}G&@Bda5vFCjI#*HRS6E6gc9pilv&MB2C
SkvowA2s~Z=T-G@yGywnv+83?>

literal 1419
zcmeAS@N?(olHy`uVBq!ia0y~yV4MKL985qF{<{lj11Yv7Z+91l{~)+v@AAnE46F{G
zE{-7;bKYJ%$lGAR!*a0YU$vR;2L{*fG_4)&TR+7abKiTm>c^qdDux5WO{^&#ViOc2
z9NH2XB}X}<VL<<Murb}w|H1Tahac72=_ojFXy7@>WW>UKLSU3L8U_QB4)Pv^aY~8D
Strh~7t_+^8elF{r5}E*NwTLSK

diff --git a/src/tests/ref-tests/wayland_buffer_transform_5.ref.png b/src/tests/ref-tests/wayland_buffer_transform_5.ref.png
index 9833db07c346fe11695e270d3438bbea771ed08b..fcbcb54a1822d10acb9e2b7593bd7d7bbcbc3ced 100644
GIT binary patch
literal 1422
zcmeAS@N?(olHy`uVBq!ia0y~yV4MKL985qF{<{lj11Yv7Z+91l{~)+v@AAnE46M$c
zE{-7;bKYJ%$az3Pz}1oW<^I&mPJB%^Ggm&4pLYD*#%m3CugzGlUa;`_7lwxYEZipq
zbQGL7H1Hf`G8*NKh5`N4!Q<HF;swiJZn|;4oi&9+Y=UBhLt6r)WYZ{TGz<nJ9UNni
Y|H~mSwA(}&SimxPy85}Sb4q9e0KuJ$CIA2c

delta 98
zcmeC<?&F?dud<QzfPnyu<H^6@|KuHPbX+rI<%2~}zn#(fao5haLE3gXJ421?=0s+3
zrpX1&IlR?p=iEEcn)ddx@Qw-Xn;n_WLBf7w$GAIAa!NPf(Gg|<0#8>zmvv4FO#q4W
BD7F9q

diff --git a/src/tests/ref-tests/wayland_buffer_transform_6.ref.png b/src/tests/ref-tests/wayland_buffer_transform_6.ref.png
index 9a68091077f933030f43c0ad8b59a4678c826ba0..9833db07c346fe11695e270d3438bbea771ed08b 100644
GIT binary patch
delta 94
zcmV-k0HObm3yuqrKP0gUz%UR5LCO91{BFU4L9Cdm;G*UB%q;lbK0SaNJ*Ni%d?m5*
z_W_aMj17CuoZi5NX6@4xxR8gj(H8=d;BFSi3y8@H8-v^|6951J07*qoM6N<$f|Nrm
Ap#T5?

literal 1422
zcmeAS@N?(olHy`uVBq!ia0y~yV4MKL985qF{<{lj11Yv7Z+91l{~)+v@AAnE46M$c
zE{-7;bKYJ%$k|{Z;Cj&I&Hkr1n%GtM7z7`**Xf^|y@qjqbn$m4zLK|c3?HT?FiJMD
zrf`T&P>gVB8|93K0sYg#o#eOk4s<R%{D|F7N5OeR1J6MwBNpxx0;8PKFc^?@AQ$(a
WLta^T&uw4<%i!ti=d#Wzp$P!Lu!&Lt

diff --git a/src/tests/wayland-test-clients/buffer-transform.c b/src/tests/wayland-test-clients/buffer-transform.c
index 65122820c..cb78489b4 100644
--- a/src/tests/wayland-test-clients/buffer-transform.c
+++ b/src/tests/wayland-test-clients/buffer-transform.c
@@ -88,7 +88,7 @@ static const struct xdg_surface_listener xdg_surface_listener = {
 };
 
 static void
-draw_main (void)
+draw_main (gboolean rotated)
 {
   static uint32_t color0 = 0xffffffff;
   static uint32_t color1 = 0xff00ffff;
@@ -96,31 +96,36 @@ draw_main (void)
   static uint32_t color3 = 0xffffff00;
   WaylandBuffer *buffer;
   int x, y;
+  uint32_t width;
+  uint32_t height;
+
+  width = rotated ? window_height : window_width,
+  height = rotated ? window_width : window_height,
 
   buffer = wayland_buffer_create (display, NULL,
-                                  window_width, window_height,
+                                  width, height,
                                   DRM_FORMAT_XRGB8888,
                                   NULL, 0,
                                   GBM_BO_USE_LINEAR);
   if (!buffer)
     g_error ("Failed to create buffer");
 
-  for (y = 0; y < window_height; y++)
+  for (y = 0; y < height; y++)
     {
-      for (x = 0; x < window_width; x++)
+      for (x = 0; x < width; x++)
         {
           uint32_t current_color;
 
-          if (y < window_height / 2)
+          if (y < height / 2)
             {
-              if (x < window_width / 2)
+              if (x < width / 2)
                 current_color = color0;
               else
                 current_color = color1;
             }
           else
             {
-              if (x < window_width / 2)
+              if (x < width / 2)
                 current_color = color2;
               else
                 current_color = color3;
@@ -160,7 +165,7 @@ main (int    argc,
   wl_surface_commit (surface);
   wait_for_configure ();
 
-  draw_main ();
+  draw_main (FALSE);
   wl_surface_commit (surface);
   wait_for_effects_completed (display, surface);
 
@@ -168,27 +173,28 @@ main (int    argc,
   wl_surface_commit (surface);
   wait_for_view_verified (display, 0);
 
-  wl_surface_set_buffer_transform (surface, WL_OUTPUT_TRANSFORM_90);
+  wl_surface_set_buffer_transform (surface, WL_OUTPUT_TRANSFORM_180);
   wl_surface_commit (surface);
   wait_for_view_verified (display, 1);
 
-  wl_surface_set_buffer_transform (surface, WL_OUTPUT_TRANSFORM_180);
+  wl_surface_set_buffer_transform (surface, WL_OUTPUT_TRANSFORM_FLIPPED);
   wl_surface_commit (surface);
   wait_for_view_verified (display, 2);
 
-  wl_surface_set_buffer_transform (surface, WL_OUTPUT_TRANSFORM_270);
+  wl_surface_set_buffer_transform (surface, WL_OUTPUT_TRANSFORM_FLIPPED_180);
   wl_surface_commit (surface);
   wait_for_view_verified (display, 3);
 
-  wl_surface_set_buffer_transform (surface, WL_OUTPUT_TRANSFORM_FLIPPED);
+  draw_main (TRUE);
+  wl_surface_set_buffer_transform (surface, WL_OUTPUT_TRANSFORM_90);
   wl_surface_commit (surface);
   wait_for_view_verified (display, 4);
 
-  wl_surface_set_buffer_transform (surface, WL_OUTPUT_TRANSFORM_FLIPPED_90);
+  wl_surface_set_buffer_transform (surface, WL_OUTPUT_TRANSFORM_270);
   wl_surface_commit (surface);
   wait_for_view_verified (display, 5);
 
-  wl_surface_set_buffer_transform (surface, WL_OUTPUT_TRANSFORM_FLIPPED_180);
+  wl_surface_set_buffer_transform (surface, WL_OUTPUT_TRANSFORM_FLIPPED_90);
   wl_surface_commit (surface);
   wait_for_view_verified (display, 6);