From e3b64b6e76c920ae48bd1be7d7728ba32a2f5cb0 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Mon, 5 Dec 2022 17:05:21 +0100 Subject: [PATCH] tests: use enum weston_renderer_type Now that enum weston_renderer_type is public, there is no need for a local enum renderer_type in the tests. Signed-off-by: Philipp Zabel --- tests/alpha-blending-test.c | 8 ++++---- tests/buffer-transforms-test.c | 6 +++--- tests/color-icc-output-test.c | 2 +- tests/color-manager-test.c | 2 +- tests/color-metadata-parsing-test.c | 2 +- tests/drm-smoke-test.c | 2 +- tests/internal-screenshot-test.c | 2 +- tests/linux-explicit-synchronization-test.c | 2 +- tests/output-capture-protocol-test.c | 6 +++--- tests/output-damage-test.c | 8 ++++---- tests/output-decorations-test.c | 2 +- tests/output-transforms-test.c | 6 +++--- tests/pointer-shot-test.c | 6 +++--- tests/single-pixel-buffer-test.c | 6 +++--- tests/subsurface-shot-test.c | 6 +++--- tests/viewporter-shot-test.c | 6 +++--- tests/weston-test-fixture-compositor.c | 12 ++++++------ tests/weston-test-fixture-compositor.h | 16 +--------------- tests/yuv-buffer-test.c | 2 +- 19 files changed, 44 insertions(+), 58 deletions(-) diff --git a/tests/alpha-blending-test.c b/tests/alpha-blending-test.c index 9515a700..1c033e29 100644 --- a/tests/alpha-blending-test.c +++ b/tests/alpha-blending-test.c @@ -36,7 +36,7 @@ struct setup_args { struct fixture_metadata meta; - enum renderer_type renderer; + enum weston_renderer_type renderer; bool color_management; }; @@ -45,17 +45,17 @@ static const int BLOCK_WIDTH = 3; static const struct setup_args my_setup_args[] = { { - .renderer = RENDERER_PIXMAN, + .renderer = WESTON_RENDERER_PIXMAN, .color_management = false, .meta.name = "pixman" }, { - .renderer = RENDERER_GL, + .renderer = WESTON_RENDERER_GL, .color_management = false, .meta.name = "GL" }, { - .renderer = RENDERER_GL, + .renderer = WESTON_RENDERER_GL, .color_management = true, .meta.name = "GL sRGB EOTF" }, diff --git a/tests/buffer-transforms-test.c b/tests/buffer-transforms-test.c index ca52e245..ed8b1cb5 100644 --- a/tests/buffer-transforms-test.c +++ b/tests/buffer-transforms-test.c @@ -35,14 +35,14 @@ #define TRANSFORM(x) WL_OUTPUT_TRANSFORM_ ## x, #x #define RENDERERS(s, t) \ { \ - .renderer = RENDERER_PIXMAN, \ + .renderer = WESTON_RENDERER_PIXMAN, \ .scale = s, \ .transform = WL_OUTPUT_TRANSFORM_ ## t, \ .transform_name = #t, \ .meta.name = "pixman " #s " " #t, \ }, \ { \ - .renderer = RENDERER_GL, \ + .renderer = WESTON_RENDERER_GL, \ .scale = s, \ .transform = WL_OUTPUT_TRANSFORM_ ## t, \ .transform_name = #t, \ @@ -51,7 +51,7 @@ struct setup_args { struct fixture_metadata meta; - enum renderer_type renderer; + enum weston_renderer_type renderer; int scale; enum wl_output_transform transform; const char *transform_name; diff --git a/tests/color-icc-output-test.c b/tests/color-icc-output-test.c index 60effc45..51f5c249 100644 --- a/tests/color-icc-output-test.c +++ b/tests/color-icc-output-test.c @@ -438,7 +438,7 @@ fixture_setup(struct weston_test_harness *harness, const struct setup_args *arg) cmsSetLogErrorHandler(test_lcms_error_logger); compositor_setup_defaults(&setup); - setup.renderer = RENDERER_GL; + setup.renderer = WESTON_RENDERER_GL; setup.backend = WESTON_BACKEND_HEADLESS; setup.width = WINDOW_WIDTH; setup.height = WINDOW_HEIGHT; diff --git a/tests/color-manager-test.c b/tests/color-manager-test.c index 2045573e..c095541f 100644 --- a/tests/color-manager-test.c +++ b/tests/color-manager-test.c @@ -34,7 +34,7 @@ fixture_setup(struct weston_test_harness *harness) struct compositor_setup setup; compositor_setup_defaults(&setup); - setup.renderer = RENDERER_GL; + setup.renderer = WESTON_RENDERER_GL; setup.shell = SHELL_TEST_DESKTOP; weston_ini_setup(&setup, diff --git a/tests/color-metadata-parsing-test.c b/tests/color-metadata-parsing-test.c index cc1325f1..d24928c1 100644 --- a/tests/color-metadata-parsing-test.c +++ b/tests/color-metadata-parsing-test.c @@ -38,7 +38,7 @@ fixture_setup(struct weston_test_harness *harness) struct compositor_setup setup; compositor_setup_defaults(&setup); - setup.renderer = RENDERER_GL; + setup.renderer = WESTON_RENDERER_GL; setup.shell = SHELL_TEST_DESKTOP; weston_ini_setup(&setup, diff --git a/tests/drm-smoke-test.c b/tests/drm-smoke-test.c index d42ddf26..04f3499c 100644 --- a/tests/drm-smoke-test.c +++ b/tests/drm-smoke-test.c @@ -36,7 +36,7 @@ fixture_setup(struct weston_test_harness *harness) compositor_setup_defaults(&setup); setup.shell = SHELL_TEST_DESKTOP; setup.backend = WESTON_BACKEND_DRM; - setup.renderer = RENDERER_PIXMAN; + setup.renderer = WESTON_RENDERER_PIXMAN; return weston_test_harness_execute_as_client(harness, &setup); } diff --git a/tests/internal-screenshot-test.c b/tests/internal-screenshot-test.c index 1c85660c..ef8d2170 100644 --- a/tests/internal-screenshot-test.c +++ b/tests/internal-screenshot-test.c @@ -39,7 +39,7 @@ fixture_setup(struct weston_test_harness *harness) struct compositor_setup setup; compositor_setup_defaults(&setup); - setup.renderer = RENDERER_PIXMAN; + setup.renderer = WESTON_RENDERER_PIXMAN; setup.width = 320; setup.height = 240; setup.shell = SHELL_DESKTOP; diff --git a/tests/linux-explicit-synchronization-test.c b/tests/linux-explicit-synchronization-test.c index c1ca395f..ae3e897d 100644 --- a/tests/linux-explicit-synchronization-test.c +++ b/tests/linux-explicit-synchronization-test.c @@ -45,7 +45,7 @@ fixture_setup(struct weston_test_harness *harness) /* We need to use the pixman renderer, since a few of the tests depend * on the renderer holding onto a surface buffer until the next one * is committed, which the noop renderer doesn't do. */ - setup.renderer = RENDERER_PIXMAN; + setup.renderer = WESTON_RENDERER_PIXMAN; return weston_test_harness_execute_as_client(harness, &setup); } diff --git a/tests/output-capture-protocol-test.c b/tests/output-capture-protocol-test.c index c457c7b7..8cd8a4ce 100644 --- a/tests/output-capture-protocol-test.c +++ b/tests/output-capture-protocol-test.c @@ -33,19 +33,19 @@ struct setup_args { struct fixture_metadata meta; - enum renderer_type renderer; + enum weston_renderer_type renderer; uint32_t expected_drm_format; }; static const struct setup_args my_setup_args[] = { { .meta.name = "pixman", - .renderer = RENDERER_PIXMAN, + .renderer = WESTON_RENDERER_PIXMAN, .expected_drm_format = DRM_FORMAT_XRGB8888, }, { .meta.name = "GL", - .renderer = RENDERER_GL, + .renderer = WESTON_RENDERER_GL, .expected_drm_format = DRM_FORMAT_ARGB8888, }, }; diff --git a/tests/output-damage-test.c b/tests/output-damage-test.c index f96c6c84..1114a670 100644 --- a/tests/output-damage-test.c +++ b/tests/output-damage-test.c @@ -34,7 +34,7 @@ #define RENDERERS(s, t) \ { \ - .renderer = RENDERER_PIXMAN, \ + .renderer = WESTON_RENDERER_PIXMAN, \ .scale = s, \ .transform = WL_OUTPUT_TRANSFORM_ ## t, \ .transform_name = #t, \ @@ -42,7 +42,7 @@ .meta.name = "pixman " #s " " #t, \ }, \ { \ - .renderer = RENDERER_GL, \ + .renderer = WESTON_RENDERER_GL, \ .scale = s, \ .transform = WL_OUTPUT_TRANSFORM_ ## t, \ .transform_name = #t, \ @@ -50,7 +50,7 @@ .meta.name = "GL no-shadow " #s " " #t, \ }, \ { \ - .renderer = RENDERER_GL, \ + .renderer = WESTON_RENDERER_GL, \ .scale = s, \ .transform = WL_OUTPUT_TRANSFORM_ ## t, \ .transform_name = #t, \ @@ -60,7 +60,7 @@ struct setup_args { struct fixture_metadata meta; - enum renderer_type renderer; + enum weston_renderer_type renderer; int scale; enum wl_output_transform transform; const char *transform_name; diff --git a/tests/output-decorations-test.c b/tests/output-decorations-test.c index 95c9fead..e24f6852 100644 --- a/tests/output-decorations-test.c +++ b/tests/output-decorations-test.c @@ -34,7 +34,7 @@ fixture_setup(struct weston_test_harness *harness) struct compositor_setup setup; compositor_setup_defaults(&setup); - setup.renderer = RENDERER_GL; + setup.renderer = WESTON_RENDERER_GL; setup.width = 300; setup.height = 150; setup.shell = SHELL_TEST_DESKTOP; diff --git a/tests/output-transforms-test.c b/tests/output-transforms-test.c index 392484d7..54769679 100644 --- a/tests/output-transforms-test.c +++ b/tests/output-transforms-test.c @@ -35,14 +35,14 @@ #define TRANSFORM(x) WL_OUTPUT_TRANSFORM_ ## x, #x #define RENDERERS(s, t) \ { \ - .renderer = RENDERER_PIXMAN, \ + .renderer = WESTON_RENDERER_PIXMAN, \ .scale = s, \ .transform = WL_OUTPUT_TRANSFORM_ ## t, \ .transform_name = #t, \ .meta.name = "pixman " #s " " #t, \ }, \ { \ - .renderer = RENDERER_GL, \ + .renderer = WESTON_RENDERER_GL, \ .scale = s, \ .transform = WL_OUTPUT_TRANSFORM_ ## t, \ .transform_name = #t, \ @@ -51,7 +51,7 @@ struct setup_args { struct fixture_metadata meta; - enum renderer_type renderer; + enum weston_renderer_type renderer; int scale; enum wl_output_transform transform; const char *transform_name; diff --git a/tests/pointer-shot-test.c b/tests/pointer-shot-test.c index 606eda3b..7bfd777e 100644 --- a/tests/pointer-shot-test.c +++ b/tests/pointer-shot-test.c @@ -35,16 +35,16 @@ struct setup_args { struct fixture_metadata meta; - enum renderer_type renderer; + enum weston_renderer_type renderer; }; static const struct setup_args my_setup_args[] = { { - .renderer = RENDERER_PIXMAN, + .renderer = WESTON_RENDERER_PIXMAN, .meta.name = "pixman" }, { - .renderer = RENDERER_GL, + .renderer = WESTON_RENDERER_GL, .meta.name = "GL" }, }; diff --git a/tests/single-pixel-buffer-test.c b/tests/single-pixel-buffer-test.c index 0273b43e..6c041a1d 100644 --- a/tests/single-pixel-buffer-test.c +++ b/tests/single-pixel-buffer-test.c @@ -39,16 +39,16 @@ struct setup_args { struct fixture_metadata meta; - enum renderer_type renderer; + enum weston_renderer_type renderer; }; static const struct setup_args my_setup_args[] = { { - .renderer = RENDERER_PIXMAN, + .renderer = WESTON_RENDERER_PIXMAN, .meta.name = "pixman" }, { - .renderer = RENDERER_GL, + .renderer = WESTON_RENDERER_GL, .meta.name = "GL" }, }; diff --git a/tests/subsurface-shot-test.c b/tests/subsurface-shot-test.c index df7d0d3c..bd25dceb 100644 --- a/tests/subsurface-shot-test.c +++ b/tests/subsurface-shot-test.c @@ -35,16 +35,16 @@ struct setup_args { struct fixture_metadata meta; - enum renderer_type renderer; + enum weston_renderer_type renderer; }; static const struct setup_args my_setup_args[] = { { - .renderer = RENDERER_PIXMAN, + .renderer = WESTON_RENDERER_PIXMAN, .meta.name = "pixman" }, { - .renderer = RENDERER_GL, + .renderer = WESTON_RENDERER_GL, .meta.name = "GL" }, }; diff --git a/tests/viewporter-shot-test.c b/tests/viewporter-shot-test.c index 7a8226be..3d57bd8c 100644 --- a/tests/viewporter-shot-test.c +++ b/tests/viewporter-shot-test.c @@ -35,16 +35,16 @@ struct setup_args { struct fixture_metadata meta; - enum renderer_type renderer; + enum weston_renderer_type renderer; }; static const struct setup_args my_setup_args[] = { { - .renderer = RENDERER_PIXMAN, + .renderer = WESTON_RENDERER_PIXMAN, .meta.name = "pixman" }, { - .renderer = RENDERER_GL, + .renderer = WESTON_RENDERER_GL, .meta.name = "GL" }, }; diff --git a/tests/weston-test-fixture-compositor.c b/tests/weston-test-fixture-compositor.c index ab606515..c0e25bc9 100644 --- a/tests/weston-test-fixture-compositor.c +++ b/tests/weston-test-fixture-compositor.c @@ -188,7 +188,7 @@ compositor_setup_defaults_(struct compositor_setup *setup, *setup = (struct compositor_setup) { .test_quirks = (struct weston_testsuite_quirks){ }, .backend = WESTON_BACKEND_HEADLESS, - .renderer = RENDERER_NOOP, + .renderer = WESTON_RENDERER_NOOP, .shell = SHELL_TEST_DESKTOP, .xwayland = false, .width = 320, @@ -218,12 +218,12 @@ backend_to_str(enum weston_compositor_backend b) } static const char * -renderer_to_str(enum renderer_type t) +renderer_to_str(enum weston_renderer_type t) { static const char * const names[] = { - [RENDERER_NOOP] = "noop", - [RENDERER_PIXMAN] = "pixman", - [RENDERER_GL] = "gl", + [WESTON_RENDERER_NOOP] = "noop", + [WESTON_RENDERER_PIXMAN] = "pixman", + [WESTON_RENDERER_GL] = "gl", }; assert(t >= 0 && t <= ARRAY_LENGTH(names)); return names[t]; @@ -405,7 +405,7 @@ execute_compositor(const struct compositor_setup *setup, #endif #ifndef ENABLE_EGL - if (setup->renderer == RENDERER_GL) { + if (setup->renderer == WESTON_RENDERER_GL) { fprintf(stderr, "GL-renderer required but not built, skipping.\n"); ret = RESULT_SKIP; } diff --git a/tests/weston-test-fixture-compositor.h b/tests/weston-test-fixture-compositor.h index 435ceed3..b94f62be 100644 --- a/tests/weston-test-fixture-compositor.h +++ b/tests/weston-test-fixture-compositor.h @@ -31,20 +31,6 @@ #include "weston-testsuite-data.h" -/** Weston renderer type - * - * \sa compositor_setup - * \ingroup testharness - */ -enum renderer_type { - /** Dummy renderer that does nothing. */ - RENDERER_NOOP = 0, - /** Pixman-renderer */ - RENDERER_PIXMAN, - /** GL-renderer */ - RENDERER_GL -}; - /** Weston shell plugin * * \sa compositor_setup @@ -76,7 +62,7 @@ struct compositor_setup { /** The backend to use. */ enum weston_compositor_backend backend; /** The renderer to use. */ - enum renderer_type renderer; + enum weston_renderer_type renderer; /** The shell plugin to use. */ enum shell_type shell; /** Whether to enable xwayland support. */ diff --git a/tests/yuv-buffer-test.c b/tests/yuv-buffer-test.c index d7de5367..f672afcb 100644 --- a/tests/yuv-buffer-test.c +++ b/tests/yuv-buffer-test.c @@ -44,7 +44,7 @@ fixture_setup(struct weston_test_harness *harness) struct compositor_setup setup; compositor_setup_defaults(&setup); - setup.renderer = RENDERER_GL; + setup.renderer = WESTON_RENDERER_GL; setup.width = 324; setup.height = 264; setup.shell = SHELL_TEST_DESKTOP;