summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarius Vlad <marius.vlad@collabora.com>2023-09-20 19:33:40 +0300
committerMarius Vlad <marius.vlad@collabora.com>2024-03-11 19:59:17 +0200
commit3ab2ba0c56ac830e47ba7265f03fc931a3a7aede (patch)
tree389e340fb11b7622d24a03b090a13c5be8856c11
parenta6ffcf30a926568e269b33b57f3740acfa7bb7f4 (diff)
compositor: Fix building when x11 is not enabled
This is just an aftermath of the change in 'meson.build, src: update for weston 12' which missed up the change for not having the x11 backend. Bug-AGL: SPEC-4578 Signed-off-by: Marius Vlad <marius.vlad@collabora.com> Change-Id: Iff2112ece5d378d7d9f8fe67ed05bd9c5d354155
-rw-r--r--src/compositor.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/compositor.c b/src/compositor.c
index 735a336..8d16802 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -1306,7 +1306,8 @@ load_x11_backend(struct ivi_compositor *ivi, int *argc, char *argv[],
}
#else
static int
-load_x11_backend(struct ivi_compositor *ivi, int *argc, char *argv[])
+load_x11_backend(struct ivi_compositor *ivi, int *argc, char **argv,
+ enum weston_renderer_type renderer)
{
return -1;
}
@@ -1937,6 +1938,7 @@ usage(int error_code)
"\t\t\t\twayland-backend.so\n"
"\t\t\t\tx11-backend.so\n"
"\t\t\t\theadless-backend.so\n"
+ " -r, --renderer=NAME\tName of renderer to use: auto, gl, noop, pixman\n"
" -S, --socket=NAME\tName of socket to listen on\n"
" --log=FILE\t\tLog to the given file\n"
" -c, --config=FILE\tConfig file to load, defaults to agl-compositor.ini\n"
@@ -2035,7 +2037,7 @@ int wet_main(int argc, char *argv[], const struct weston_testsuite_data *test_da
char *renderer = NULL;
const struct weston_option core_options[] = {
- { WESTON_OPTION_STRING, "renderer", 0, &renderer },
+ { WESTON_OPTION_STRING, "renderer", 'r', &renderer },
{ WESTON_OPTION_STRING, "backend", 'B', &backend },
{ WESTON_OPTION_STRING, "socket", 'S', &socket_name },
{ WESTON_OPTION_STRING, "log", 0, &log },