system/weston
system/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston synced 2024-07-21 18:54:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

libweston: Remove overlapping output checks

Browse source 
We can now have overlapping outputs, so we can remove the checks that
protected us against this previously.

We may want to consider adding checks for discontinuities in the future
though, so leave a brief comment where the checks used to be.

Signed-off-by: Derek Foreman <derek.foreman@collabora.com>
This commit is contained in:
Derek Foreman 2023-06-26 15:57:14 -05:00
parent c4725f509f
commit 4c63a12857
1 changed files with 4 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
libweston/compositor.c
View file

@ -6880,8 +6880,8 @@ weston_output_move(struct weston_output *output,
* as we do for weston_output_enable, and allow moves to fail.
*
* However, while a front-end is rearranging outputs it may
* pass through indeterminate states where outputs overlap
* or are discontinuous, and this may be ok as long as no
* pass through indeterminate states where outputs are
* discontinuous, and this may be ok as long as no
* input processing or rendering occurs at that time.
*
* Ultimately, we probably need a way to pass complete output
@ -7519,45 +7519,6 @@ weston_output_create_heads_string(struct weston_output *output)
return str;
}
static bool
weston_outputs_overlap(struct weston_output *a, struct weston_output *b)
{
bool overlap;
pixman_region32_t intersection;
pixman_region32_init(&intersection);
pixman_region32_intersect(&intersection, &a->region, &b->region);
overlap = pixman_region32_not_empty(&intersection);
pixman_region32_fini(&intersection);
return overlap;
}
/* This only works if the output region is current!
*
* That means we shouldn't expect it to return usable results unless
* the output is at least undergoing enabling.
*/
static bool
weston_output_placement_ok(struct weston_output *output)
{
struct weston_compositor *c = output->compositor;
struct weston_output *iter;
wl_list_for_each(iter, &c->output_list, link) {
if (!iter->enabled)
continue;
if (weston_outputs_overlap(iter, output)) {
weston_log("Error: output '%s' overlaps enabled output '%s'.\n",
output->name, iter->name);
return false;
}
}
return true;
}
/** Constructs a weston_output object that can be used by the compositor.
*
* \param output The weston_output object that needs to be enabled. Must not
@ -7637,9 +7598,8 @@ weston_output_enable(struct weston_output *output)
weston_output_init_geometry(output, output->pos);
/* At this point we have a valid region so we can check placement. */
if (!weston_output_placement_ok(output))
return -1;
/* TODO: At this point we have a valid region so we can check placement.
* We should probably check for discontinuities here. */
wl_list_init(&output->animation_list);
wl_list_init(&output->feedback_list);