[PATCH weston v3 17/36] weston: move weston_output_enable() into callers

Pekka Paalanen ppaalanen at gmail.com
Tue Oct 31 11:48:27 UTC 2017


From: Pekka Paalanen <pekka.paalanen at collabora.co.uk>

Move the call out of wet_configure_windowed_output_from_config() and
into its callers.

This allows to migrate each frontend one by one.

Signed-off-by: Pekka Paalanen <pekka.paalanen at collabora.co.uk>
---
 compositor/main.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/compositor/main.c b/compositor/main.c
index 9f00ee3a..8775b380 100644
--- a/compositor/main.c
+++ b/compositor/main.c
@@ -1121,8 +1121,6 @@ wet_configure_windowed_output_from_config(struct weston_output *output,
 		return -1;
 	}
 
-	weston_output_enable(output);
-
 	return 0;
 }
 
@@ -1265,6 +1263,8 @@ headless_backend_output_configure(struct wl_listener *listener, void *data)
 
 	if (wet_configure_windowed_output_from_config(output, &defaults) < 0)
 		weston_log("Cannot configure output \"%s\".\n", output->name);
+
+	weston_output_enable(output);
 }
 
 static int
@@ -1483,6 +1483,8 @@ x11_backend_output_configure(struct wl_listener *listener, void *data)
 
 	if (wet_configure_windowed_output_from_config(output, &defaults) < 0)
 		weston_log("Cannot configure output \"%s\".\n", output->name);
+
+	weston_output_enable(output);
 }
 
 static int
@@ -1599,6 +1601,8 @@ wayland_backend_output_configure(struct wl_listener *listener, void *data)
 
 	if (wet_configure_windowed_output_from_config(output, &defaults) < 0)
 		weston_log("Cannot configure output \"%s\".\n", output->name);
+
+	weston_output_enable(output);
 }
 
 static int
-- 
2.13.6



More information about the wayland-devel mailing list