[PATCH weston v5 17/36] weston: move weston_output_enable() into callers
Pekka Paalanen
ppaalanen at gmail.com
Thu Dec 14 11:40:54 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 32fb33e8..995e6f94 100644
--- a/compositor/main.c
+++ b/compositor/main.c
@@ -1122,8 +1122,6 @@ wet_configure_windowed_output_from_config(struct weston_output *output,
return -1;
}
- weston_output_enable(output);
-
return 0;
}
@@ -1266,6 +1264,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
@@ -1484,6 +1484,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
@@ -1600,6 +1602,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