From 71f98b4252498f48b64f12d069d18f5a490658cf Mon Sep 17 00:00:00 2001 From: Marius Vlad Date: Mon, 25 Mar 2024 16:46:52 +0200 Subject: [PATCH] compositor: Don't reuse weston_compositor_create_output With libweston 13 we don't have a create with head option. Just use the one available has underneath that's what is using as well. Bug-AGL: SPEC-5096, SPEC-5061 Signed-off-by: Marius Vlad Change-Id: I236d9caa193dafdd20dc2636a517c4e5bf597bd7 --- src/compositor.c | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/src/compositor.c b/src/compositor.c index 305260d..59c3d9f 100644 --- a/src/compositor.c +++ b/src/compositor.c @@ -1,5 +1,5 @@ /* - * Copyright © 2012-2021 Collabora, Ltd. + * Copyright © 2012-2024 Collabora, Ltd. * * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the @@ -327,15 +327,15 @@ ivi_ensure_output(struct ivi_compositor *ivi, char *name, output->name = name; output->config = config; - if (ivi->simple_output_configure) { - output->output = - weston_compositor_create_output(ivi->compositor, head, head->name); - if (!output->output) { - free(output->name); - free(output); - return NULL; - } + output->output = + weston_compositor_create_output(ivi->compositor, head, head->name); + if (!output->output) { + free(output->name); + free(output); + return NULL; + } + if (ivi->simple_output_configure) { int ret = ivi->simple_output_configure(output->output); if (ret < 0) { weston_log("Configuring output \"%s\" failed.\n", @@ -352,15 +352,6 @@ ivi_ensure_output(struct ivi_compositor *ivi, char *name, ivi->init_failed = true; return NULL; } - - } else { - output->output = - weston_compositor_create_output(ivi->compositor, head, name); - if (!output->output) { - free(output->name); - free(output); - return NULL; - } } output->output_destroy.notify = handle_output_destroy; -- 2.16.6