From: Pekka Paalanen <pekka.paala...@collabora.co.uk>
weston_compositor_add_pending_output() is the point through which all
backends must go when creating a new output. The enable and disable
vfuns are essential for anything to be done with the output, so it makes
sense to check them here, rather than when actually enabling or
disabling.
Particularly the disable vfunc is rarely called, so this gets the check
better excercised.
Signed-off-by: Pekka Paalanen <pekka.paala...@collabora.co.uk>
Reviewed-by: Armin Krezović <krezovic.ar...@gmail.com>
---
libweston/compositor.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/libweston/compositor.c b/libweston/compositor.c
index 0c6d1eb9..97ade223 100644
--- a/libweston/compositor.c
+++ b/libweston/compositor.c
@@ -4701,6 +4701,9 @@ WL_EXPORT void
weston_compositor_add_pending_output(struct weston_output *output,
struct weston_compositor *compositor)
{
+ assert(output->disable);
+ assert(output->enable);
+
wl_list_remove(&output->link);
wl_list_insert(compositor->pending_output_list.prev, &output->link);
wl_signal_emit(&compositor->output_pending_signal, output);
@@ -4745,8 +4748,6 @@ weston_output_enable(struct weston_output *output)
struct weston_output *iterator;
int x = 0, y = 0;
- assert(output->enable);
-
iterator = container_of(c->output_list.prev,
struct weston_output, link);
@@ -4833,8 +4834,6 @@ weston_output_enable(struct weston_output *output)
WL_EXPORT void
weston_output_disable(struct weston_output *output)
{
- assert(output->disable);
-
/* Should we rename this? */
output->destroying = 1;
--
2.13.0
_______________________________________________
wayland-devel mailing list
wayland-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/wayland-devel
