tests: add buffer transform tests
authorPekka Paalanen <pekka.paalanen@collabora.com>
Thu, 27 Feb 2020 15:04:45 +0000 (17:04 +0200)
committerPekka Paalanen <pekka.paalanen@collabora.com>
Fri, 28 Feb 2020 14:02:10 +0000 (16:02 +0200)
This patch continues the buffer and output transforms testing by iterating
through a representative selection of buffer transforms and scales.

For more details, see the previous patch "tests: add output transform tests".

https://gitlab.freedesktop.org/wayland/weston/issues/52

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.com>
26 files changed:
tests/buffer-transforms-test.c [new file with mode: 0644]
tests/meson.build
tests/reference/output_1-NORMAL_buffer_1-180-00.png [new file with mode: 0644]
tests/reference/output_1-NORMAL_buffer_1-270-00.png [new file with mode: 0644]
tests/reference/output_1-NORMAL_buffer_1-90-00.png [new file with mode: 0644]
tests/reference/output_1-NORMAL_buffer_1-FLIPPED-00.png [new file with mode: 0644]
tests/reference/output_1-NORMAL_buffer_1-FLIPPED_180-00.png [new file with mode: 0644]
tests/reference/output_1-NORMAL_buffer_1-FLIPPED_270-00.png [new file with mode: 0644]
tests/reference/output_1-NORMAL_buffer_1-FLIPPED_90-00.png [new file with mode: 0644]
tests/reference/output_1-NORMAL_buffer_2-180-00.png [new file with mode: 0644]
tests/reference/output_1-NORMAL_buffer_2-FLIPPED-00.png [new file with mode: 0644]
tests/reference/output_1-NORMAL_buffer_2-NORMAL-00.png [new file with mode: 0644]
tests/reference/output_1-NORMAL_buffer_3-FLIPPED_90-00.png [new file with mode: 0644]
tests/reference/output_1-NORMAL_buffer_3-NORMAL-00.png [new file with mode: 0644]
tests/reference/output_2-90_buffer_1-180-00.png [new file with mode: 0644]
tests/reference/output_2-90_buffer_1-270-00.png [new file with mode: 0644]
tests/reference/output_2-90_buffer_1-90-00.png [new file with mode: 0644]
tests/reference/output_2-90_buffer_1-FLIPPED-00.png [new file with mode: 0644]
tests/reference/output_2-90_buffer_1-FLIPPED_180-00.png [new file with mode: 0644]
tests/reference/output_2-90_buffer_1-FLIPPED_270-00.png [new file with mode: 0644]
tests/reference/output_2-90_buffer_1-FLIPPED_90-00.png [new file with mode: 0644]
tests/reference/output_2-90_buffer_2-180-00.png [new file with mode: 0644]
tests/reference/output_2-90_buffer_2-FLIPPED-00.png [new file with mode: 0644]
tests/reference/output_2-90_buffer_2-NORMAL-00.png [new file with mode: 0644]
tests/reference/output_2-90_buffer_3-FLIPPED_90-00.png [new file with mode: 0644]
tests/reference/output_2-90_buffer_3-NORMAL-00.png [new file with mode: 0644]

diff --git a/tests/buffer-transforms-test.c b/tests/buffer-transforms-test.c
new file mode 100644 (file)
index 0000000..fdc86bb
--- /dev/null
@@ -0,0 +1,137 @@
+/*
+ * Copyright © 2020 Collabora, Ltd.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include "config.h"
+
+#include <stdio.h>
+#include <string.h>
+#include <sys/mman.h>
+
+#include "weston-test-client-helper.h"
+#include "weston-test-fixture-compositor.h"
+
+#define TRANSFORM(x) WL_OUTPUT_TRANSFORM_ ## x, #x
+#define RENDERERS(s, t) \
+       { RENDERER_PIXMAN, s, TRANSFORM(t) }, \
+       { RENDERER_GL,     s, TRANSFORM(t) }
+
+struct setup_args {
+       enum renderer_type renderer;
+       int scale;
+       enum wl_output_transform transform;
+       const char *transform_name;
+};
+
+static const struct setup_args my_setup_args[] = {
+       RENDERERS(1, NORMAL),
+       RENDERERS(2, 90),
+};
+
+static enum test_result_code
+fixture_setup(struct weston_test_harness *harness, const struct setup_args *arg)
+{
+       struct compositor_setup setup;
+
+       /* The width and height are chosen to produce 324x240 framebuffer, to
+        * emulate keeping the video mode constant.
+        * This resolution is divisible by 2 and 3.
+        * Headless multiplies the given size by scale.
+        */
+
+       compositor_setup_defaults(&setup);
+       setup.renderer = arg->renderer;
+       setup.width = 324 / arg->scale;
+       setup.height = 240 / arg->scale;
+       setup.scale = arg->scale;
+       setup.transform = arg->transform;
+       setup.shell = SHELL_TEST_DESKTOP;
+
+       return weston_test_harness_execute_as_client(harness, &setup);
+}
+DECLARE_FIXTURE_SETUP_WITH_ARG(fixture_setup, my_setup_args);
+
+struct buffer_args {
+       int scale;
+       enum wl_output_transform transform;
+       const char *transform_name;
+};
+
+static const struct buffer_args my_buffer_args[] = {
+       /* { 1, TRANSFORM(NORMAL) }, done in output-transforms-test.c */
+       { 1, TRANSFORM(90) },
+       { 1, TRANSFORM(180) },
+       { 1, TRANSFORM(270) },
+       { 1, TRANSFORM(FLIPPED) },
+       { 1, TRANSFORM(FLIPPED_90) },
+       { 1, TRANSFORM(FLIPPED_180) },
+       { 1, TRANSFORM(FLIPPED_270) },
+       { 2, TRANSFORM(NORMAL) },
+       /* { 2, TRANSFORM(90) }, done in output-transforms-test.c */
+       { 2, TRANSFORM(180) },
+       { 2, TRANSFORM(FLIPPED) },
+       { 3, TRANSFORM(NORMAL) },
+       { 3, TRANSFORM(FLIPPED_90) },
+};
+
+TEST_P(buffer_transform, my_buffer_args)
+{
+       const struct buffer_args *bargs = data;
+       const struct setup_args *oargs;
+       struct client *client;
+       bool match;
+       char *refname;
+       int ret;
+
+       oargs = &my_setup_args[get_test_fixture_index()];
+
+       ret = asprintf(&refname, "output_%d-%s_buffer_%d-%s",
+                      oargs->scale, oargs->transform_name,
+                      bargs->scale, bargs->transform_name);
+       assert(ret);
+
+       testlog("%s: %s\n", get_test_name(), refname);
+
+       /*
+        * NOTE! The transform set below is a lie.
+        * Take that into account when analyzing screenshots.
+        */
+
+       client = create_client();
+       client->surface = create_test_surface(client);
+       client->surface->width = 10000; /* used only for damage */
+       client->surface->height = 10000;
+       client->surface->buffer = client_buffer_from_image_file(client,
+                                                       "basic-test-card",
+                                                       bargs->scale);
+       wl_surface_set_buffer_scale(client->surface->wl_surface, bargs->scale);
+       wl_surface_set_buffer_transform(client->surface->wl_surface,
+                                       bargs->transform);
+       move_client(client, 19, 19);
+
+       match = verify_screen_content(client, refname, 0, NULL, 0);
+       assert(match);
+
+       client_destroy(client);
+}
index 705319c0711662c343b2503885d19f032e1ceae1..463d71293637c2a381477f2255d4368798587bb0 100644 (file)
@@ -112,6 +112,7 @@ dep_zucmain = declare_dependency(
 
 tests = [
        {       'name': 'bad-buffer', },
+       {       'name': 'buffer-transforms', },
        {       'name': 'devices', },
        {       'name': 'event', },
        {       'name': 'internal-screenshot', },
diff --git a/tests/reference/output_1-NORMAL_buffer_1-180-00.png b/tests/reference/output_1-NORMAL_buffer_1-180-00.png
new file mode 100644 (file)
index 0000000..3d3a065
Binary files /dev/null and b/tests/reference/output_1-NORMAL_buffer_1-180-00.png differ
diff --git a/tests/reference/output_1-NORMAL_buffer_1-270-00.png b/tests/reference/output_1-NORMAL_buffer_1-270-00.png
new file mode 100644 (file)
index 0000000..332b79c
Binary files /dev/null and b/tests/reference/output_1-NORMAL_buffer_1-270-00.png differ
diff --git a/tests/reference/output_1-NORMAL_buffer_1-90-00.png b/tests/reference/output_1-NORMAL_buffer_1-90-00.png
new file mode 100644 (file)
index 0000000..f95cec5
Binary files /dev/null and b/tests/reference/output_1-NORMAL_buffer_1-90-00.png differ
diff --git a/tests/reference/output_1-NORMAL_buffer_1-FLIPPED-00.png b/tests/reference/output_1-NORMAL_buffer_1-FLIPPED-00.png
new file mode 100644 (file)
index 0000000..6f55a9f
Binary files /dev/null and b/tests/reference/output_1-NORMAL_buffer_1-FLIPPED-00.png differ
diff --git a/tests/reference/output_1-NORMAL_buffer_1-FLIPPED_180-00.png b/tests/reference/output_1-NORMAL_buffer_1-FLIPPED_180-00.png
new file mode 100644 (file)
index 0000000..1ed5cba
Binary files /dev/null and b/tests/reference/output_1-NORMAL_buffer_1-FLIPPED_180-00.png differ
diff --git a/tests/reference/output_1-NORMAL_buffer_1-FLIPPED_270-00.png b/tests/reference/output_1-NORMAL_buffer_1-FLIPPED_270-00.png
new file mode 100644 (file)
index 0000000..5d9da36
Binary files /dev/null and b/tests/reference/output_1-NORMAL_buffer_1-FLIPPED_270-00.png differ
diff --git a/tests/reference/output_1-NORMAL_buffer_1-FLIPPED_90-00.png b/tests/reference/output_1-NORMAL_buffer_1-FLIPPED_90-00.png
new file mode 100644 (file)
index 0000000..bdb129b
Binary files /dev/null and b/tests/reference/output_1-NORMAL_buffer_1-FLIPPED_90-00.png differ
diff --git a/tests/reference/output_1-NORMAL_buffer_2-180-00.png b/tests/reference/output_1-NORMAL_buffer_2-180-00.png
new file mode 100644 (file)
index 0000000..3d3a065
Binary files /dev/null and b/tests/reference/output_1-NORMAL_buffer_2-180-00.png differ
diff --git a/tests/reference/output_1-NORMAL_buffer_2-FLIPPED-00.png b/tests/reference/output_1-NORMAL_buffer_2-FLIPPED-00.png
new file mode 100644 (file)
index 0000000..6f55a9f
Binary files /dev/null and b/tests/reference/output_1-NORMAL_buffer_2-FLIPPED-00.png differ
diff --git a/tests/reference/output_1-NORMAL_buffer_2-NORMAL-00.png b/tests/reference/output_1-NORMAL_buffer_2-NORMAL-00.png
new file mode 100644 (file)
index 0000000..83ff885
Binary files /dev/null and b/tests/reference/output_1-NORMAL_buffer_2-NORMAL-00.png differ
diff --git a/tests/reference/output_1-NORMAL_buffer_3-FLIPPED_90-00.png b/tests/reference/output_1-NORMAL_buffer_3-FLIPPED_90-00.png
new file mode 100644 (file)
index 0000000..bdb129b
Binary files /dev/null and b/tests/reference/output_1-NORMAL_buffer_3-FLIPPED_90-00.png differ
diff --git a/tests/reference/output_1-NORMAL_buffer_3-NORMAL-00.png b/tests/reference/output_1-NORMAL_buffer_3-NORMAL-00.png
new file mode 100644 (file)
index 0000000..83ff885
Binary files /dev/null and b/tests/reference/output_1-NORMAL_buffer_3-NORMAL-00.png differ
diff --git a/tests/reference/output_2-90_buffer_1-180-00.png b/tests/reference/output_2-90_buffer_1-180-00.png
new file mode 100644 (file)
index 0000000..85579dd
Binary files /dev/null and b/tests/reference/output_2-90_buffer_1-180-00.png differ
diff --git a/tests/reference/output_2-90_buffer_1-270-00.png b/tests/reference/output_2-90_buffer_1-270-00.png
new file mode 100644 (file)
index 0000000..86e4ba0
Binary files /dev/null and b/tests/reference/output_2-90_buffer_1-270-00.png differ
diff --git a/tests/reference/output_2-90_buffer_1-90-00.png b/tests/reference/output_2-90_buffer_1-90-00.png
new file mode 100644 (file)
index 0000000..a26f923
Binary files /dev/null and b/tests/reference/output_2-90_buffer_1-90-00.png differ
diff --git a/tests/reference/output_2-90_buffer_1-FLIPPED-00.png b/tests/reference/output_2-90_buffer_1-FLIPPED-00.png
new file mode 100644 (file)
index 0000000..9573061
Binary files /dev/null and b/tests/reference/output_2-90_buffer_1-FLIPPED-00.png differ
diff --git a/tests/reference/output_2-90_buffer_1-FLIPPED_180-00.png b/tests/reference/output_2-90_buffer_1-FLIPPED_180-00.png
new file mode 100644 (file)
index 0000000..ce944d9
Binary files /dev/null and b/tests/reference/output_2-90_buffer_1-FLIPPED_180-00.png differ
diff --git a/tests/reference/output_2-90_buffer_1-FLIPPED_270-00.png b/tests/reference/output_2-90_buffer_1-FLIPPED_270-00.png
new file mode 100644 (file)
index 0000000..6ade028
Binary files /dev/null and b/tests/reference/output_2-90_buffer_1-FLIPPED_270-00.png differ
diff --git a/tests/reference/output_2-90_buffer_1-FLIPPED_90-00.png b/tests/reference/output_2-90_buffer_1-FLIPPED_90-00.png
new file mode 100644 (file)
index 0000000..f40570d
Binary files /dev/null and b/tests/reference/output_2-90_buffer_1-FLIPPED_90-00.png differ
diff --git a/tests/reference/output_2-90_buffer_2-180-00.png b/tests/reference/output_2-90_buffer_2-180-00.png
new file mode 100644 (file)
index 0000000..1bc731b
Binary files /dev/null and b/tests/reference/output_2-90_buffer_2-180-00.png differ
diff --git a/tests/reference/output_2-90_buffer_2-FLIPPED-00.png b/tests/reference/output_2-90_buffer_2-FLIPPED-00.png
new file mode 100644 (file)
index 0000000..3124489
Binary files /dev/null and b/tests/reference/output_2-90_buffer_2-FLIPPED-00.png differ
diff --git a/tests/reference/output_2-90_buffer_2-NORMAL-00.png b/tests/reference/output_2-90_buffer_2-NORMAL-00.png
new file mode 100644 (file)
index 0000000..53fdb7b
Binary files /dev/null and b/tests/reference/output_2-90_buffer_2-NORMAL-00.png differ
diff --git a/tests/reference/output_2-90_buffer_3-FLIPPED_90-00.png b/tests/reference/output_2-90_buffer_3-FLIPPED_90-00.png
new file mode 100644 (file)
index 0000000..fe5507d
Binary files /dev/null and b/tests/reference/output_2-90_buffer_3-FLIPPED_90-00.png differ
diff --git a/tests/reference/output_2-90_buffer_3-NORMAL-00.png b/tests/reference/output_2-90_buffer_3-NORMAL-00.png
new file mode 100644 (file)
index 0000000..53fdb7b
Binary files /dev/null and b/tests/reference/output_2-90_buffer_3-NORMAL-00.png differ