xref: /OK3568_Linux_fs/buildroot/package/weston/0014-compositor-Fix-damage-tracking-error-when-overlapped.patch (revision 4882a59341e53eb6f0b4789bf948001014eff981)

From 6769833f52639d0acd9831b174bd12a6941417b4 Mon Sep 17 00:00:00 2001
From: Jeffy Chen <jeffy.chen@rock-chips.com>
Date: Thu, 2 Jun 2022 18:22:38 +0800
Subject: [PATCH 14/79] compositor: Fix damage tracking error when overlapped
 outputs

Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
---
 include/libweston/libweston.h |  2 ++
 libweston/compositor.c        | 32 ++++++++++++++++++++++++++------
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/include/libweston/libweston.h b/include/libweston/libweston.h
index 103c293b..984d5f3c 100644
--- a/include/libweston/libweston.h
+++ b/include/libweston/libweston.h
@@ -485,6 +485,8 @@ struct weston_output {
 	/** For cancelling the idle_repaint callback on output destruction. */
 	struct wl_event_source *idle_repaint_source;

+	pixman_region32_t damage;
+
 	int dirty;
 	struct wl_signal frame_signal;
 	struct wl_signal destroy_signal;	/**< sent when disabled */
diff --git a/libweston/compositor.c b/libweston/compositor.c
index 23316ef5..9f8282bc 100644
--- a/libweston/compositor.c
+++ b/libweston/compositor.c
@@ -1069,6 +1069,22 @@ weston_view_move_to_plane(struct weston_view *view,
 	weston_surface_damage(view->surface);
 }

+static void
+weston_add_damage(struct weston_compositor *compositor,
+		  struct weston_plane *plane, pixman_region32_t *damage)
+{
+	struct weston_output *output;
+
+	if (plane)
+		pixman_region32_union(&plane->damage, &plane->damage, damage);
+
+	if (plane != &compositor->primary_plane)
+		return;
+
+	wl_list_for_each(output, &compositor->output_list, link)
+		pixman_region32_union(&output->damage, &output->damage, damage);
+}
+
 /** Inflict damage on the plane where the view is visible.
  *
  * \param view The view that causes the damage.
@@ -1093,9 +1109,7 @@ weston_view_damage_below(struct weston_view *view)
 	pixman_region32_init(&damage);
 	pixman_region32_subtract(&damage, &view->transform.boundingbox,
 				 &view->clip);
-	if (view->plane)
-		pixman_region32_union(&view->plane->damage,
-				      &view->plane->damage, &damage);
+	weston_add_damage(view->surface->compositor, view->plane, &damage);
 	pixman_region32_fini(&damage);
 	weston_view_schedule_repaint(view);
 }
@@ -2853,6 +2867,7 @@ weston_output_damage(struct weston_output *output)
 	pixman_region32_union(&compositor->primary_plane.damage,
 			      &compositor->primary_plane.damage,
 			      &output->region);
+	pixman_region32_copy(&output->damage, &output->region);
 	weston_output_schedule_repaint(output);
 }

@@ -2906,8 +2921,7 @@ view_accumulate_damage(struct weston_view *view,
 	pixman_region32_intersect(&damage, &damage,
 				  &view->transform.boundingbox);
 	pixman_region32_subtract(&damage, &damage, opaque);
-	pixman_region32_union(&view->plane->damage,
-			      &view->plane->damage, &damage);
+	weston_add_damage(view->surface->compositor, view->plane, &damage);
 	pixman_region32_fini(&damage);
 	pixman_region32_copy(&view->clip, opaque);
 	pixman_region32_union(opaque, opaque, &view->transform.opaque);
@@ -3280,7 +3294,7 @@ weston_output_repaint(struct weston_output *output)

 	pixman_region32_init(&output_damage);
 	pixman_region32_intersect(&output_damage,
-				  &ec->primary_plane.damage, &output->region);
+				  &output->damage, &output->region);
 	pixman_region32_subtract(&output_damage,
 				 &output_damage, &ec->primary_plane.clip);

@@ -3289,6 +3303,10 @@ weston_output_repaint(struct weston_output *output)

 	r = output->repaint(output, &output_damage);

+	/* Clear painted primary damage */
+	pixman_region32_intersect(&output->damage,
+				  &output->damage, &ec->primary_plane.damage);
+
 	pixman_region32_fini(&output_damage);

 	output->repaint_needed = false;
@@ -7216,6 +7234,7 @@ weston_output_init(struct weston_output *output,
 	/* Can't use -1 on uint32_t and 0 is valid enum value */
 	output->transform = UINT32_MAX;

+	pixman_region32_init(&output->damage);
 	pixman_region32_init(&output->region);
 	wl_list_init(&output->mode_list);
 }
@@ -7527,6 +7546,7 @@ weston_output_release(struct weston_output *output)
 	weston_color_profile_unref(output->color_profile);
 	assert(output->color_outcome == NULL);

+	pixman_region32_fini(&output->damage);
 	pixman_region32_fini(&output->region);
 	wl_list_remove(&output->link);

--
2.20.1