X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fcompositor.c;h=6097da04196ce90ba0d3b39009e8c02b395a71ac;hb=6d2720303d8441525ba2e37c9d87daef568f8cdc;hp=6447662ae3e7c5fc2c206b574f2a9f78f7ce87fe;hpb=54631603ff050cb014ac9260ca74e6b830109796;p=src%2Fagl-compositor.git

diff --git a/src/compositor.c b/src/compositor.c
index 6447662..6097da0 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -57,6 +57,7 @@
 #include "shared/os-compatibility.h"
 #include "shared/helpers.h"
 
+#include "config.h"
 #include "agl-shell-server-protocol.h"
 
 #ifdef HAVE_REMOTING
@@ -72,7 +73,7 @@ to_ivi_compositor(struct weston_compositor *ec)
 	return weston_compositor_get_user_data(ec);
 }
 
-static struct ivi_output_config *
+struct ivi_output_config *
 ivi_init_parsed_options(struct weston_compositor *compositor)
 {
 	struct ivi_compositor *ivi = to_ivi_compositor(compositor);
@@ -100,6 +101,67 @@ sigint_helper(int sig)
        raise(SIGUSR2);
 }
 
+struct {
+        char *name;
+        enum weston_renderer_type renderer;
+} renderer_name_map[] = {
+        { "auto", WESTON_RENDERER_AUTO },
+        { "gl", WESTON_RENDERER_GL },
+        { "noop", WESTON_RENDERER_NOOP },
+        { "pixman", WESTON_RENDERER_PIXMAN },
+};
+
+struct {
+	char *short_name;
+	char *long_name;
+	enum weston_compositor_backend backend;
+} backend_name_map[] = {
+	{ "drm", "drm-backend.so", WESTON_BACKEND_DRM },
+	{ "headless", "headless-backend.so", WESTON_BACKEND_HEADLESS },
+	{ "pipewire", "pipewire-backend.so", WESTON_BACKEND_PIPEWIRE },
+	{ "rdp", "rdp-backend.so", WESTON_BACKEND_RDP },
+	{ "vnc", "vnc-backend.so", WESTON_BACKEND_VNC },
+	{ "wayland", "wayland-backend.so", WESTON_BACKEND_WAYLAND },
+	{ "x11", "x11-backend.so", WESTON_BACKEND_X11 },
+};
+
+bool
+get_backend_from_string(const char *name,
+		enum weston_compositor_backend *backend)
+{
+	size_t i;
+
+	for (i = 0; i < ARRAY_LENGTH(backend_name_map); i++) {
+		if (strcmp(name, backend_name_map[i].short_name) == 0 ||
+				strcmp(name, backend_name_map[i].long_name) == 0) {
+			*backend = backend_name_map[i].backend;
+			return true;
+		}
+	}
+
+	return false;
+}
+
+
+bool
+get_renderer_from_string(const char *name, enum weston_renderer_type *renderer)
+{
+	size_t i;
+
+	if (!name)
+		name = "auto";
+
+	for (i = 0; i < ARRAY_LENGTH(renderer_name_map); i++) {
+		if (strcmp(name, renderer_name_map[i].name) == 0) {
+			*renderer = renderer_name_map[i].renderer;
+			return true;
+		}
+	}
+
+	return false;
+}
+
+
 void
 ivi_layout_save(struct ivi_compositor *ivi, struct ivi_output *output)
 {
@@ -199,7 +261,8 @@ handle_output_destroy(struct wl_listener *listener, void *data)
 
 	if (output->fullscreen_view.fs &&
 	    output->fullscreen_view.fs->view) {
-		weston_surface_destroy(output->fullscreen_view.fs->view->surface);
+		weston_surface_unref(output->fullscreen_view.fs->view->surface);
+		weston_buffer_destroy_solid(output->fullscreen_view.buffer_ref);
 		output->fullscreen_view.fs->view = NULL;
 	}
 
@@ -539,7 +602,7 @@ try_attach_heads(struct ivi_output *output)
 {
 	size_t fail_len = 0;
 
-	for (size_t i = 0; i < output->add_len; ++i) {
+	for (size_t i = 1; i < output->add_len; i++) {
 		if (weston_output_attach_head(output->output, output->add[i]) < 0) {
 			struct weston_head *tmp = output->add[i];
 			memmove(&output->add[fail_len + 1], output->add[fail_len],
@@ -550,6 +613,39 @@ try_attach_heads(struct ivi_output *output)
 	return fail_len;
 }
 
+/* Place output exactly to the right of the most recently enabled output.
+ *
+ * Historically, we haven't given much thought to output placement,
+ * simply adding outputs in a horizontal line as they're enabled. This
+ * function simply sets an output's x coordinate to the right of the
+ * most recently enabled output, and its y to zero.
+ *
+ * If you're adding new calls to this function, you're also not giving
+ * much thought to output placement, so please consider carefully if
+ * it's really doing what you want.
+ *
+ * You especially don't want to use this for any code that won't
+ * immediately enable the passed output.
+ */
+static void
+weston_output_lazy_align(struct weston_output *output)
+{
+	struct weston_compositor *c;
+	struct weston_output *peer;
+	int next_x = 0;
+
+	/* Put this output to the right of the most recently enabled output */
+	c = output->compositor;
+	if (!wl_list_empty(&c->output_list)) {
+		peer = container_of(c->output_list.prev,
+				struct weston_output, link);
+		next_x = peer->pos.c.x + peer->width;
+	}
+	output->pos.c.x = next_x;
+	output->pos.c.y = 0;
+}
+
+
 /*
  * Like try_attach_heads, this reorganizes the output's add array into a failed
  * and successful section.
@@ -561,6 +657,8 @@ try_enable_output(struct ivi_output *output, size_t i)
 	for (; i < output->add_len; ++i) {
 		struct weston_head *head;
 
+		weston_output_lazy_align(output->output);
+
 		if (weston_output_enable(output->output) == 0)
 			break;
 
@@ -942,7 +1040,8 @@ load_remoting_plugin(struct ivi_compositor *ivi, struct weston_config *config)
 	int (*module_init)(struct weston_compositor *wc);
 
 	module_init = weston_load_module("remoting-plugin.so",
-					 "weston_module_init");
+					 "weston_module_init",
+					 LIBWESTON_MODULEDIR);
 	if (!module_init)
 		return -1;
 
@@ -963,7 +1062,8 @@ load_remoting_plugin(struct weston_compositor *compositor, struct weston_config
 #endif
 
 static int
-load_drm_backend(struct ivi_compositor *ivi, int *argc, char *argv[])
+load_drm_backend(struct ivi_compositor *ivi, int *argc, char *argv[],
+		 enum weston_renderer_type renderer)
 {
 	struct weston_drm_backend_config config = {
 		.base = {
@@ -973,7 +1073,7 @@ load_drm_backend(struct ivi_compositor *ivi, int *argc, char *argv[])
 	};
 	struct weston_config_section *section;
 	int use_current_mode = 0;
-	int use_pixman = 0;
+	bool force_pixman = false;
 	bool use_shadow;
 	bool without_input = false;
 	int ret;
@@ -982,12 +1082,17 @@ load_drm_backend(struct ivi_compositor *ivi, int *argc, char *argv[])
 		{ WESTON_OPTION_STRING, "seat", 0, &config.seat_id },
 		{ WESTON_OPTION_STRING, "drm-device", 0, &config.specific_device },
 		{ WESTON_OPTION_BOOLEAN, "current-mode", 0, &use_current_mode },
-		{ WESTON_OPTION_BOOLEAN, "use-pixman", 0, &use_pixman },
+		{ WESTON_OPTION_BOOLEAN, "use-pixman", 0, &force_pixman },
 		{ WESTON_OPTION_BOOLEAN, "continue-without-input", false, &without_input }
 	};
 
 	parse_options(options, ARRAY_LENGTH(options), argc, argv);
-	config.use_pixman = use_pixman;
+
+	if (force_pixman)
+		config.renderer = WESTON_RENDERER_PIXMAN;
+	else
+		config.renderer = WESTON_RENDERER_AUTO;
+
 	ivi->cmdline.use_current_mode = use_current_mode;
 
 	section = weston_config_get_section(ivi->config, "core", NULL, NULL);
@@ -1023,7 +1128,7 @@ error:
 
 static void
 windowed_parse_common_options(struct ivi_compositor *ivi, int *argc, char *argv[],
-			      bool *use_pixman, bool *fullscreen, int *output_count)
+			      bool *force_pixman, bool *fullscreen, int *output_count)
 {
 	struct weston_config_section *section;
 	bool pixman;
@@ -1033,17 +1138,17 @@ windowed_parse_common_options(struct ivi_compositor *ivi, int *argc, char *argv[
 		{ WESTON_OPTION_INTEGER, "width", 0, &ivi->cmdline.width },
 		{ WESTON_OPTION_INTEGER, "height", 0, &ivi->cmdline.height },
 		{ WESTON_OPTION_INTEGER, "scale", 0, &ivi->cmdline.scale },
-		{ WESTON_OPTION_BOOLEAN, "use-pixman", 0, &pixman },
+		{ WESTON_OPTION_BOOLEAN, "use-pixman", 0, &force_pixman },
 		{ WESTON_OPTION_BOOLEAN, "fullscreen", 0, &fs },
 		{ WESTON_OPTION_INTEGER, "output-count", 0, output_count },
 	};
 
 	section = weston_config_get_section(ivi->config, "core", NULL, NULL);
-	weston_config_section_get_bool(section, "use-pixman", &pixman, 0);
+	weston_config_section_get_bool(section, "use-pixman", &pixman, false);
 
 	*output_count = 1;
 	parse_options(options, ARRAY_LENGTH(options), argc, argv);
-	*use_pixman = pixman;
+	*force_pixman = pixman;
 	*fullscreen = fs;
 }
 
@@ -1074,7 +1179,7 @@ windowed_create_outputs(struct ivi_compositor *ivi, int output_count,
 			continue;
 		}
 
-		if (ivi->window_api->create_head(ivi->compositor, output_name) < 0) {
+		if (ivi->window_api->create_head(ivi->compositor->backend, output_name) < 0) {
 			free(output_name);
 			return -1;
 		}
@@ -1087,7 +1192,7 @@ windowed_create_outputs(struct ivi_compositor *ivi, int output_count,
 		if (asprintf(&default_output, "%s%d", name_prefix, i) < 0)
 			return -1;
 
-		if (ivi->window_api->create_head(ivi->compositor, default_output) < 0) {
+		if (ivi->window_api->create_head(ivi->compositor->backend, default_output) < 0) {
 			free(default_output);
 			return -1;
 		}
@@ -1099,7 +1204,8 @@ windowed_create_outputs(struct ivi_compositor *ivi, int output_count,
 }
 
 static int
-load_wayland_backend(struct ivi_compositor *ivi, int *argc, char *argv[])
+load_wayland_backend(struct ivi_compositor *ivi, int *argc, char *argv[],
+		     enum weston_renderer_type renderer)
 {
 	struct weston_wayland_backend_config config = {
 		.base = {
@@ -1110,6 +1216,7 @@ load_wayland_backend(struct ivi_compositor *ivi, int *argc, char *argv[])
 	struct weston_config_section *section;
 	int sprawl = 0;
 	int output_count;
+	bool force_pixman = false;
 	int ret;
 
 	const struct weston_option options[] = {
@@ -1117,7 +1224,7 @@ load_wayland_backend(struct ivi_compositor *ivi, int *argc, char *argv[])
 		{ WESTON_OPTION_STRING, "sprawl", 0, &sprawl },
 	};
 
-	windowed_parse_common_options(ivi, argc, argv, &config.use_pixman,
+	windowed_parse_common_options(ivi, argc, argv, &force_pixman,
 				      &config.fullscreen, &output_count);
 
 	parse_options(options, ARRAY_LENGTH(options), argc, argv);
@@ -1155,7 +1262,8 @@ load_wayland_backend(struct ivi_compositor *ivi, int *argc, char *argv[])
 
 #ifdef HAVE_BACKEND_X11
 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)
 {
 	struct weston_x11_backend_config config = {
 		.base = {
@@ -1166,15 +1274,20 @@ load_x11_backend(struct ivi_compositor *ivi, int *argc, char *argv[])
 	int no_input = 0;
 	int output_count;
 	int ret;
+	bool force_pixman = false;
 
 	const struct weston_option options[] = {
 	       { WESTON_OPTION_BOOLEAN, "no-input", 0, &no_input },
 	};
 
-	windowed_parse_common_options(ivi, argc, argv, &config.use_pixman,
+	windowed_parse_common_options(ivi, argc, argv, &force_pixman,
 				      &config.fullscreen, &output_count);
 
 	parse_options(options, ARRAY_LENGTH(options), argc, argv);
+	if (force_pixman)
+		config.renderer = WESTON_RENDERER_PIXMAN;
+	else
+		config.renderer = WESTON_RENDERER_AUTO;
 	config.no_input = no_input;
 
 	ret = weston_compositor_load_backend(ivi->compositor, WESTON_BACKEND_X11,
@@ -1193,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;
 }
@@ -1201,29 +1315,40 @@ load_x11_backend(struct ivi_compositor *ivi, int *argc, char *argv[])
 
 #ifdef HAVE_BACKEND_HEADLESS
 static int
-load_headless_backend(struct ivi_compositor *ivi, int *argc, char **argv)
+load_headless_backend(struct ivi_compositor *ivi, int *argc, char **argv,
+		      enum weston_renderer_type renderer)
 {
 	struct weston_headless_backend_config config = {};
 	int ret = 0;
 
-	bool use_pixman;
+	bool force_pixman = false;
 	bool fullscreen;
-	bool use_gl;
+	bool force_gl = false;
 	int output_count;
 
 	struct weston_compositor *c = ivi->compositor;
 
 	const struct weston_option options[] = {
-		{ WESTON_OPTION_BOOLEAN, "use-pixman", 0, &use_pixman },
-		{ WESTON_OPTION_BOOLEAN, "use-gl", 0, &use_gl },
+		{ WESTON_OPTION_BOOLEAN, "use-pixman", false, &force_pixman },
+		{ WESTON_OPTION_BOOLEAN, "use-gl", false, &force_gl },
 	};
 
-	windowed_parse_common_options(ivi, argc, argv, &use_pixman,
+	windowed_parse_common_options(ivi, argc, argv, &force_pixman,
 			&fullscreen, &output_count);
 
 	parse_options(options, ARRAY_LENGTH(options), argc, argv);
-	config.use_pixman = use_pixman;
-	config.use_gl = use_gl;
+
+	if ((force_pixman && force_gl) ||
+	    (renderer != WESTON_RENDERER_AUTO && (force_pixman || force_gl))) {
+		weston_log("Conflicting renderer specifications\n");
+		return -1;
+	} else if (force_pixman) {
+		config.renderer = WESTON_RENDERER_PIXMAN;
+	} else if (force_gl) {
+		config.renderer = WESTON_RENDERER_GL;
+	} else {
+		config.renderer = renderer;
+	}
 
 	config.base.struct_version = WESTON_HEADLESS_BACKEND_CONFIG_VERSION;
 	config.base.struct_size = sizeof(struct weston_headless_backend_config);
@@ -1240,7 +1365,7 @@ load_headless_backend(struct ivi_compositor *ivi, int *argc, char **argv)
 		return -1;
 	}
 
-	if (ivi->window_api->create_head(c, "headless") < 0) {
+	if (ivi->window_api->create_head(c->backend, "headless") < 0) {
 		weston_log("Cannot create headless back-end\n");
 		return -1;
 	}
@@ -1249,7 +1374,7 @@ load_headless_backend(struct ivi_compositor *ivi, int *argc, char **argv)
 }
 #else
 static int
-load_headless_backend(struct ivi_compositor *ivi, int *argc, char **argv)
+load_headless_backend(struct ivi_compositor *ivi, int *argc, char **argv, enum weston_renderer_type renderer)
 {
 	return -1;
 }
@@ -1390,9 +1515,21 @@ load_rdp_backend(struct ivi_compositor *ivi, int *argc, char **argv)
 
 
 static int
-load_backend(struct ivi_compositor *ivi, const char *backend,
-	     int *argc, char *argv[])
+load_backend(struct ivi_compositor *ivi, int *argc, char **argv,
+	     const char *backend_name, const char *renderer_name)
 {
+	enum weston_compositor_backend backend;
+	enum weston_renderer_type renderer;
+
+	if (!get_backend_from_string(backend_name, &backend)) {
+		weston_log("Error: unknown backend \"%s\"\n", backend_name);
+		return -1;
+	}
+
+	if (!get_renderer_from_string(renderer_name, &renderer)) {
+		weston_log("Error: unknown renderer \"%s\"\n", renderer_name);
+		return -1;
+	}
 	if (strcmp(backend, "drm-backend.so") == 0) {
 		return load_drm_backend(ivi, argc, argv);
 	} else if (strcmp(backend, "wayland-backend.so") == 0) {
@@ -1403,9 +1540,8 @@ load_backend(struct ivi_compositor *ivi, const char *backend,
 		return load_headless_backend(ivi, argc, argv);
 	} else if (strcmp(backend, "rdp-backend.so") == 0) {
 		return load_rdp_backend(ivi, argc, argv);
-	}
 
-	weston_log("fatal: unknown backend '%s'.\n", backend);
+	weston_log("fatal: unknown backend '%s'.\n", backend_name);
 	return -1;
 }
 
@@ -1430,7 +1566,7 @@ load_modules(struct ivi_compositor *ivi, const char *modules,
 		} else if (strstr(buffer, "systemd-notify.so")) {
 			weston_log("systemd-notify plug-in already loaded!\n");
 		} else {
-			module_init = weston_load_module(buffer, "wet_module_init");
+			module_init = weston_load_module(buffer, "wet_module_init", WESTON_MODULEDIR);
 			if (!module_init)
 				return -1;
 
@@ -1802,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"
@@ -1897,8 +2034,10 @@ int wet_main(int argc, char *argv[], const struct weston_testsuite_data *test_da
 	int ret = EXIT_FAILURE;
 	bool xwayland = false;
 	struct sigaction action;
+	char *renderer = NULL;
 
 	const struct weston_option core_options[] = {
+		{ 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 },
@@ -2011,7 +2150,7 @@ int wet_main(int argc, char *argv[], const struct weston_testsuite_data *test_da
 	if (compositor_init_config(&ivi) < 0)
 		goto error_compositor;
 
-	if (load_backend(&ivi, backend, &argc, argv) < 0) {
+	if (load_backend(&ivi, &argc, argv, backend, renderer) < 0) {
 		weston_log("fatal: failed to create compositor backend.\n");
 		goto error_compositor;
 	}