1*4882a593SmuzhiyunFrom bb075f005d993e43b306059b5ea2d466e10d6b06 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Jeffy Chen <jeffy.chen@rock-chips.com> 3*4882a593SmuzhiyunDate: Thu, 3 Nov 2022 11:57:59 +0800 4*4882a593SmuzhiyunSubject: [PATCH 04/79] Revert "libweston: Check output placement" 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunThis reverts commit 7e7198bd881859b20f74cbdae46b5700ff1cc5d4. 7*4882a593Smuzhiyun 8*4882a593SmuzhiyunAllow outputs overlapping. 9*4882a593Smuzhiyun 10*4882a593SmuzhiyunSigned-off-by: Jeffy Chen <jeffy.chen@rock-chips.com> 11*4882a593Smuzhiyun--- 12*4882a593Smuzhiyun libweston/compositor.c | 56 ------------------------------------------ 13*4882a593Smuzhiyun 1 file changed, 56 deletions(-) 14*4882a593Smuzhiyun 15*4882a593Smuzhiyundiff --git a/libweston/compositor.c b/libweston/compositor.c 16*4882a593Smuzhiyunindex 6cfcba25..7b157695 100644 17*4882a593Smuzhiyun--- a/libweston/compositor.c 18*4882a593Smuzhiyun+++ b/libweston/compositor.c 19*4882a593Smuzhiyun@@ -6616,18 +6616,6 @@ weston_output_set_position(struct weston_output *output, int x, int y) 20*4882a593Smuzhiyun WL_EXPORT void 21*4882a593Smuzhiyun weston_output_move(struct weston_output *output, int x, int y) 22*4882a593Smuzhiyun { 23*4882a593Smuzhiyun- /* XXX: we should probably perform some sanity checking here 24*4882a593Smuzhiyun- * as we do for weston_output_enable, and allow moves to fail. 25*4882a593Smuzhiyun- * 26*4882a593Smuzhiyun- * However, while a front-end is rearranging outputs it may 27*4882a593Smuzhiyun- * pass through indeterminate states where outputs overlap 28*4882a593Smuzhiyun- * or are discontinuous, and this may be ok as long as no 29*4882a593Smuzhiyun- * input processing or rendering occurs at that time. 30*4882a593Smuzhiyun- * 31*4882a593Smuzhiyun- * Ultimately, we probably need a way to pass complete output 32*4882a593Smuzhiyun- * config atomically to libweston. 33*4882a593Smuzhiyun- */ 34*4882a593Smuzhiyun- 35*4882a593Smuzhiyun output->compositor->output_flow_dirty = true; 36*4882a593Smuzhiyun weston_output_set_position(output, x, y); 37*4882a593Smuzhiyun } 38*4882a593Smuzhiyun@@ -7250,45 +7238,6 @@ weston_output_create_heads_string(struct weston_output *output) 39*4882a593Smuzhiyun return str; 40*4882a593Smuzhiyun } 41*4882a593Smuzhiyun 42*4882a593Smuzhiyun-static bool 43*4882a593Smuzhiyun-weston_outputs_overlap(struct weston_output *a, struct weston_output *b) 44*4882a593Smuzhiyun-{ 45*4882a593Smuzhiyun- bool overlap; 46*4882a593Smuzhiyun- pixman_region32_t intersection; 47*4882a593Smuzhiyun- 48*4882a593Smuzhiyun- pixman_region32_init(&intersection); 49*4882a593Smuzhiyun- pixman_region32_intersect(&intersection, &a->region, &b->region); 50*4882a593Smuzhiyun- overlap = pixman_region32_not_empty(&intersection); 51*4882a593Smuzhiyun- pixman_region32_fini(&intersection); 52*4882a593Smuzhiyun- 53*4882a593Smuzhiyun- return overlap; 54*4882a593Smuzhiyun-} 55*4882a593Smuzhiyun- 56*4882a593Smuzhiyun-/* This only works if the output region is current! 57*4882a593Smuzhiyun- * 58*4882a593Smuzhiyun- * That means we shouldn't expect it to return usable results unless 59*4882a593Smuzhiyun- * the output is at least undergoing enabling. 60*4882a593Smuzhiyun- */ 61*4882a593Smuzhiyun-static bool 62*4882a593Smuzhiyun-weston_output_placement_ok(struct weston_output *output) 63*4882a593Smuzhiyun-{ 64*4882a593Smuzhiyun- struct weston_compositor *c = output->compositor; 65*4882a593Smuzhiyun- struct weston_output *iter; 66*4882a593Smuzhiyun- 67*4882a593Smuzhiyun- wl_list_for_each(iter, &c->output_list, link) { 68*4882a593Smuzhiyun- if (!iter->enabled) 69*4882a593Smuzhiyun- continue; 70*4882a593Smuzhiyun- 71*4882a593Smuzhiyun- if (weston_outputs_overlap(iter, output)) { 72*4882a593Smuzhiyun- weston_log("Error: output '%s' overlaps enabled output '%s'.\n", 73*4882a593Smuzhiyun- output->name, iter->name); 74*4882a593Smuzhiyun- return false; 75*4882a593Smuzhiyun- } 76*4882a593Smuzhiyun- } 77*4882a593Smuzhiyun- 78*4882a593Smuzhiyun- return true; 79*4882a593Smuzhiyun-} 80*4882a593Smuzhiyun- 81*4882a593Smuzhiyun /** Constructs a weston_output object that can be used by the compositor. 82*4882a593Smuzhiyun * 83*4882a593Smuzhiyun * \param output The weston_output object that needs to be enabled. Must not 84*4882a593Smuzhiyun@@ -7368,11 +7317,6 @@ weston_output_enable(struct weston_output *output) 85*4882a593Smuzhiyun weston_output_transform_scale_init(output, output->transform, output->scale); 86*4882a593Smuzhiyun 87*4882a593Smuzhiyun weston_output_init_geometry(output, output->x, output->y); 88*4882a593Smuzhiyun- 89*4882a593Smuzhiyun- /* At this point we have a valid region so we can check placement. */ 90*4882a593Smuzhiyun- if (!weston_output_placement_ok(output)) 91*4882a593Smuzhiyun- return -1; 92*4882a593Smuzhiyun- 93*4882a593Smuzhiyun weston_output_damage(output); 94*4882a593Smuzhiyun 95*4882a593Smuzhiyun wl_list_init(&output->animation_list); 96*4882a593Smuzhiyun-- 97*4882a593Smuzhiyun2.20.1 98*4882a593Smuzhiyun 99