X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fcompositor.c;h=305260d86bfe58076c7b5718c0972fe99ff03bf2;hb=51d39c0eb673e09ac685b72407d7970575e3892b;hp=735a336db8ecbd74761cb14b069a28e1e2a52699;hpb=a6ffcf30a926568e269b33b57f3740acfa7bb7f4;p=src%2Fagl-compositor.git

diff --git a/src/compositor.c b/src/compositor.c
index 735a336..305260d 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -329,8 +329,7 @@ ivi_ensure_output(struct ivi_compositor *ivi, char *name,
 
 	if (ivi->simple_output_configure) {
 		output->output =
-			weston_compositor_create_output_with_head(ivi->compositor,
-								  head);
+			weston_compositor_create_output(ivi->compositor, head, head->name);
 		if (!output->output) {
 			free(output->name);
 			free(output);
@@ -356,7 +355,7 @@ ivi_ensure_output(struct ivi_compositor *ivi, char *name,
 
 	} else {
 		output->output =
-			weston_compositor_create_output(ivi->compositor, name);
+			weston_compositor_create_output(ivi->compositor, head, name);
 		if (!output->output) {
 			free(output->name);
 			free(output);
@@ -639,10 +638,10 @@ weston_output_lazy_align(struct weston_output *output)
 	if (!wl_list_empty(&c->output_list)) {
 		peer = container_of(c->output_list.prev,
 				struct weston_output, link);
-		next_x = peer->x + peer->width;
+		next_x = peer->pos.c.x + peer->width;
 	}
-	output->x = next_x;
-	output->y = 0;
+	output->pos.c.x = next_x;
+	output->pos.c.y = 0;
 }
 
 
@@ -1076,7 +1075,6 @@ load_drm_backend(struct ivi_compositor *ivi, int *argc, char *argv[],
 	bool force_pixman = false;
 	bool use_shadow;
 	bool without_input = false;
-	int ret;
 
 	const struct weston_option options[] = {
 		{ WESTON_OPTION_STRING, "seat", 0, &config.seat_id },
@@ -1106,24 +1104,28 @@ load_drm_backend(struct ivi_compositor *ivi, int *argc, char *argv[],
 	if (without_input)
 		ivi->compositor->require_input = !without_input;
 
-	ret = weston_compositor_load_backend(ivi->compositor, WESTON_BACKEND_DRM,
-					     &config.base);
-	if (ret < 0)
-		return ret;
+	ivi->heads_changed.notify = heads_changed;
+	weston_compositor_add_heads_changed_listener(ivi->compositor,
+						     &ivi->heads_changed);
+
+	if (!weston_compositor_load_backend(ivi->compositor, WESTON_BACKEND_DRM,
+					    &config.base))
+		return -1;
 
 	ivi->drm_api = weston_drm_output_get_api(ivi->compositor);
 	if (!ivi->drm_api) {
 		weston_log("Cannot use drm output api.\n");
-		ret = -1;
 		goto error;
 	}
 
 	load_remoting_plugin(ivi, ivi->config);
 
+	return 0;
+
 error:
 	free(config.gbm_format);
 	free(config.seat_id);
-	return ret;
+	return -1;
 }
 
 static void
@@ -1179,7 +1181,7 @@ windowed_create_outputs(struct ivi_compositor *ivi, int output_count,
 			continue;
 		}
 
-		if (ivi->window_api->create_head(ivi->compositor->backend, output_name) < 0) {
+		if (ivi->window_api->create_head(ivi->backend, output_name) < 0) {
 			free(output_name);
 			return -1;
 		}
@@ -1192,7 +1194,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->backend, default_output) < 0) {
+		if (ivi->window_api->create_head(ivi->backend, default_output) < 0) {
 			free(default_output);
 			return -1;
 		}
@@ -1217,7 +1219,6 @@ load_wayland_backend(struct ivi_compositor *ivi, int *argc, char *argv[],
 	int sprawl = 0;
 	int output_count;
 	bool force_pixman = false;
-	int ret;
 
 	const struct weston_option options[] = {
 		{ WESTON_OPTION_STRING, "display", 0, &config.display_name },
@@ -1236,14 +1237,14 @@ load_wayland_backend(struct ivi_compositor *ivi, int *argc, char *argv[],
 	weston_config_section_get_int(section, "cursor-size",
 				      &config.cursor_size, 32);
 
-	ret = weston_compositor_load_backend(ivi->compositor, WESTON_BACKEND_WAYLAND,
-					     &config.base);
+	ivi->backend = weston_compositor_load_backend(ivi->compositor, WESTON_BACKEND_WAYLAND,
+						      &config.base);
 
 	free(config.cursor_theme);
 	free(config.display_name);
 
-	if (ret < 0)
-		return ret;
+	if (!ivi->backend)
+		return -1;
 
 	ivi->window_api = weston_windowed_output_get_api(ivi->compositor);
 
@@ -1290,11 +1291,8 @@ load_x11_backend(struct ivi_compositor *ivi, int *argc, char *argv[],
 		config.renderer = WESTON_RENDERER_AUTO;
 	config.no_input = no_input;
 
-	ret = weston_compositor_load_backend(ivi->compositor, WESTON_BACKEND_X11,
-					     &config.base);
-
-	if (ret < 0)
-		return ret;
+	if (!weston_compositor_load_backend(ivi->compositor, WESTON_BACKEND_X11, &config.base))
+		return -1;
 
 	ivi->window_api = weston_windowed_output_get_api(ivi->compositor);
 	if (!ivi->window_api) {
@@ -1306,7 +1304,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;
 }
@@ -1318,7 +1317,6 @@ 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 force_pixman = false;
 	bool fullscreen;
@@ -1326,6 +1324,7 @@ load_headless_backend(struct ivi_compositor *ivi, int *argc, char **argv,
 	int output_count;
 
 	struct weston_compositor *c = ivi->compositor;
+	struct weston_backend *wb = NULL;
 
 	const struct weston_option options[] = {
 		{ WESTON_OPTION_BOOLEAN, "use-pixman", false, &force_pixman },
@@ -1353,10 +1352,8 @@ load_headless_backend(struct ivi_compositor *ivi, int *argc, char **argv,
 	config.base.struct_size = sizeof(struct weston_headless_backend_config);
 
 	/* load the actual headless-backend and configure it */
-	ret = weston_compositor_load_backend(c, WESTON_BACKEND_HEADLESS,
-					     &config.base);
-	if (ret < 0)
-		return ret;
+	if (!weston_compositor_load_backend(c, WESTON_BACKEND_HEADLESS, &config.base))
+		return -1;
 
 	ivi->window_api = weston_windowed_output_get_api(c);
 	if (!ivi->window_api) {
@@ -1364,7 +1361,11 @@ load_headless_backend(struct ivi_compositor *ivi, int *argc, char **argv,
 		return -1;
 	}
 
-	if (ivi->window_api->create_head(c->backend, "headless") < 0) {
+	wb = weston_compositor_load_backend(ivi->compositor, WESTON_BACKEND_HEADLESS, &config.base);
+	if (!wb)
+		return -1;
+
+	if (ivi->window_api->create_head(wb, "headless") < 0) {
 		weston_log("Cannot create headless back-end\n");
 		return -1;
 	}
@@ -1408,6 +1409,7 @@ rdp_backend_output_configure(struct weston_output *output)
 	struct weston_config_section *section;
 	uint32_t transform = WL_OUTPUT_TRANSFORM_NORMAL;
 	char *transform_string;
+	struct weston_mode new_mode = {};
 
 	assert(parsed_options);
 
@@ -1444,13 +1446,12 @@ rdp_backend_output_configure(struct weston_output *output)
 		return -1;
 	}
 
-	weston_output_set_transform(output, transform);
 
-	if (api->output_set_size(output, width, height) < 0) {
-		weston_log("Cannot configure output \"%s\" using weston_rdp_output_api.\n",
-				output->name);
-		return -1;
-	}
+	new_mode.width = width;
+	new_mode.height = height;
+
+	api->output_set_mode(output, &new_mode);
+	weston_output_set_transform(output, transform);
 
 	return 0;
 }
@@ -1459,7 +1460,6 @@ static int
 load_rdp_backend(struct ivi_compositor *ivi, int *argc, char **argv)
 {
 	struct weston_rdp_backend_config config = {};
-	int ret = 0;
 	struct weston_config_section *section;
 
 	struct ivi_output_config *parsed_options = ivi_init_parsed_options(ivi->compositor);
@@ -1495,14 +1495,15 @@ load_rdp_backend(struct ivi_compositor *ivi, int *argc, char **argv)
 	parse_options(rdp_options, ARRAY_LENGTH(rdp_options), argc, argv);
 
 	ivi->simple_output_configure = rdp_backend_output_configure;
-	ret = weston_compositor_load_backend(ivi->compositor, WESTON_BACKEND_RDP, &config.base);
+	if (!weston_compositor_load_backend(ivi->compositor, WESTON_BACKEND_RDP, &config.base))
+		return -1;
 
 	free(config.bind_address);
 	free(config.rdp_key);
 	free(config.server_cert);
 	free(config.server_key);
 
-	return ret;
+	return 0;
 }
 #else
 static int
@@ -1529,19 +1530,23 @@ load_backend(struct ivi_compositor *ivi, int *argc, char **argv,
 		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) {
-		return load_wayland_backend(ivi, argc, argv);
-	} else if (strcmp(backend, "x11-backend.so") == 0) {
-		return load_x11_backend(ivi, argc, argv);
-	} else if (strcmp(backend, "headless-backend.so") == 0) {
-		return load_headless_backend(ivi, argc, argv);
-	} else if (strcmp(backend, "rdp-backend.so") == 0) {
+
+	switch (backend) {
+	case WESTON_BACKEND_DRM:
+		return load_drm_backend(ivi, argc, argv, renderer);
+	case WESTON_BACKEND_HEADLESS:
+		return load_headless_backend(ivi, argc, argv, renderer);
+	case WESTON_BACKEND_RDP:
 		return load_rdp_backend(ivi, argc, argv);
+	case WESTON_BACKEND_WAYLAND:
+		return load_wayland_backend(ivi, argc, argv, renderer);
+	case WESTON_BACKEND_X11:
+		return load_x11_backend(ivi, argc, argv, renderer);
+	default:
+		assert(!"unknown backend type in load_backend()");
+	}
 
-	weston_log("fatal: unknown backend '%s'.\n", backend_name);
-	return -1;
+	return 0;
 }
 
 static int
@@ -1937,6 +1942,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"
@@ -1968,12 +1974,12 @@ copy_command_line(int argc, char * const argv[])
 }
 
 #if !defined(BUILD_XWAYLAND)
-int
+void *
 wet_load_xwayland(struct weston_compositor *comp)
 {
 	weston_log("Attempted to load xwayland library but compositor "
 		   "was *not* built with xwayland support!\n");
-	return -1;
+	return NULL;
 }
 #endif
 
@@ -2035,7 +2041,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 },
@@ -2153,11 +2159,11 @@ int wet_main(int argc, char *argv[], const struct weston_testsuite_data *test_da
 		goto error_compositor;
 	}
 
-	ivi.heads_changed.notify = heads_changed;
-	weston_compositor_add_heads_changed_listener(ivi.compositor,
-						     &ivi.heads_changed);
+	if (weston_compositor_backends_loaded(ivi.compositor) < 0)
+                goto error_compositor;
 
 	weston_compositor_flush_heads_changed(ivi.compositor);
+
 	if (ivi_desktop_init(&ivi) < 0)
 		goto error_compositor;
 
@@ -2180,7 +2186,7 @@ int wet_main(int argc, char *argv[], const struct weston_testsuite_data *test_da
 		goto error_compositor;
 
 	if (xwayland) {
-		if (wet_load_xwayland(ivi.compositor) < 0)
+		if (!wet_load_xwayland(ivi.compositor))
 			goto error_compositor;
 	}