mirror of
https://gitlab.freedesktop.org/wayland/weston
synced 2024-10-01 19:52:53 +00:00
tests: Just keep PIXMAN as renderer
No need to use both renderer for the tests, PIXMAN one is enough. For the kiosk-shell test which was recently added, but also for the older paint-node test. Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
This commit is contained in:
parent
329f5f49e1
commit
4193bd660f
|
@ -36,29 +36,13 @@
|
|||
#include "weston-test-fixture-compositor.h"
|
||||
#include "xdg-shell-client-protocol.h"
|
||||
|
||||
struct setup_args {
|
||||
struct fixture_metadata meta;
|
||||
enum weston_renderer_type renderer;
|
||||
};
|
||||
|
||||
static const struct setup_args my_setup_args[] = {
|
||||
{
|
||||
.renderer = WESTON_RENDERER_PIXMAN,
|
||||
.meta.name = "pixman"
|
||||
},
|
||||
{
|
||||
.renderer = WESTON_RENDERER_GL,
|
||||
.meta.name = "GL"
|
||||
},
|
||||
};
|
||||
|
||||
static enum test_result_code
|
||||
fixture_setup(struct weston_test_harness *harness, const struct setup_args *arg)
|
||||
fixture_setup(struct weston_test_harness *harness)
|
||||
{
|
||||
struct compositor_setup setup;
|
||||
|
||||
compositor_setup_defaults(&setup);
|
||||
setup.renderer = arg->renderer;
|
||||
setup.renderer = WESTON_RENDERER_PIXMAN;
|
||||
setup.width = 320;
|
||||
setup.height = 240;
|
||||
setup.shell = SHELL_KIOSK;
|
||||
|
@ -67,7 +51,7 @@ fixture_setup(struct weston_test_harness *harness, const struct setup_args *arg)
|
|||
|
||||
return weston_test_harness_execute_as_client(harness, &setup);
|
||||
}
|
||||
DECLARE_FIXTURE_SETUP_WITH_ARG(fixture_setup, my_setup_args, meta);
|
||||
DECLARE_FIXTURE_SETUP(fixture_setup);
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -33,29 +33,13 @@
|
|||
#include "weston-test-client-helper.h"
|
||||
#include "weston-test-fixture-compositor.h"
|
||||
|
||||
struct setup_args {
|
||||
struct fixture_metadata meta;
|
||||
enum weston_renderer_type renderer;
|
||||
};
|
||||
|
||||
static const struct setup_args my_setup_args[] = {
|
||||
{
|
||||
.renderer = WESTON_RENDERER_PIXMAN,
|
||||
.meta.name = "pixman"
|
||||
},
|
||||
{
|
||||
.renderer = WESTON_RENDERER_GL,
|
||||
.meta.name = "GL"
|
||||
},
|
||||
};
|
||||
|
||||
static enum test_result_code
|
||||
fixture_setup(struct weston_test_harness *harness, const struct setup_args *arg)
|
||||
fixture_setup(struct weston_test_harness *harness)
|
||||
{
|
||||
struct compositor_setup setup;
|
||||
|
||||
compositor_setup_defaults(&setup);
|
||||
setup.renderer = arg->renderer;
|
||||
setup.renderer = WESTON_RENDERER_PIXMAN;
|
||||
setup.width = 320;
|
||||
setup.height = 240;
|
||||
setup.shell = SHELL_TEST_DESKTOP;
|
||||
|
@ -64,7 +48,7 @@ fixture_setup(struct weston_test_harness *harness, const struct setup_args *arg)
|
|||
|
||||
return weston_test_harness_execute_as_client(harness, &setup);
|
||||
}
|
||||
DECLARE_FIXTURE_SETUP_WITH_ARG(fixture_setup, my_setup_args, meta);
|
||||
DECLARE_FIXTURE_SETUP(fixture_setup);
|
||||
|
||||
static struct buffer *
|
||||
surface_commit_color(struct client *client, struct wl_surface *surface,
|
||||
|
|
Loading…
Reference in a new issue