From 5555f975aca8e1a92c65f531edf74936559af328 Mon Sep 17 00:00:00 2001
From: Alexander Orzechowski <alex@ozal.ski>
Date: Mon, 7 Oct 2024 14:45:17 -0400
Subject: [PATCH] damage_ring: Remove return value of
 wlr_damage_ring_add/wlr_damage_ring_add_box

Compositors should compute whether the damage is part of the output
themselves.
---
 include/wlr/types/wlr_damage_ring.h |  8 ++------
 types/wlr_damage_ring.c             | 31 ++++++-----------------------
 2 files changed, 8 insertions(+), 31 deletions(-)

diff --git a/include/wlr/types/wlr_damage_ring.h b/include/wlr/types/wlr_damage_ring.h
index 3f469af6..68a935c0 100644
--- a/include/wlr/types/wlr_damage_ring.h
+++ b/include/wlr/types/wlr_damage_ring.h
@@ -54,18 +54,14 @@ void wlr_damage_ring_set_bounds(struct wlr_damage_ring *ring,
 
 /**
  * Add a region to the current damage.
- *
- * Returns true if the region intersects the ring bounds, false otherwise.
  */
-bool wlr_damage_ring_add(struct wlr_damage_ring *ring,
+void wlr_damage_ring_add(struct wlr_damage_ring *ring,
 	const pixman_region32_t *damage);
 
 /**
  * Add a box to the current damage.
- *
- * Returns true if the box intersects the ring bounds, false otherwise.
  */
-bool wlr_damage_ring_add_box(struct wlr_damage_ring *ring,
+void wlr_damage_ring_add_box(struct wlr_damage_ring *ring,
 	const struct wlr_box *box);
 
 /**
diff --git a/types/wlr_damage_ring.c b/types/wlr_damage_ring.c
index e0da90c6..108bb9c4 100644
--- a/types/wlr_damage_ring.c
+++ b/types/wlr_damage_ring.c
@@ -49,35 +49,16 @@ void wlr_damage_ring_set_bounds(struct wlr_damage_ring *ring,
 	wlr_damage_ring_add_whole(ring);
 }
 
-bool wlr_damage_ring_add(struct wlr_damage_ring *ring,
+void wlr_damage_ring_add(struct wlr_damage_ring *ring,
 		const pixman_region32_t *damage) {
-	pixman_region32_t clipped;
-	pixman_region32_init(&clipped);
-	pixman_region32_intersect_rect(&clipped, damage,
-		0, 0, ring->width, ring->height);
-	bool intersects = pixman_region32_not_empty(&clipped);
-	if (intersects) {
-		pixman_region32_union(&ring->current, &ring->current, &clipped);
-	}
-	pixman_region32_fini(&clipped);
-	return intersects;
+	pixman_region32_union(&ring->current, &ring->current, damage);
 }
 
-bool wlr_damage_ring_add_box(struct wlr_damage_ring *ring,
+void wlr_damage_ring_add_box(struct wlr_damage_ring *ring,
 		const struct wlr_box *box) {
-	struct wlr_box clipped = {
-		.x = 0,
-		.y = 0,
-		.width = ring->width,
-		.height = ring->height,
-	};
-	if (wlr_box_intersection(&clipped, &clipped, box)) {
-		pixman_region32_union_rect(&ring->current,
-			&ring->current, clipped.x, clipped.y,
-			clipped.width, clipped.height);
-		return true;
-	}
-	return false;
+	pixman_region32_union_rect(&ring->current,
+		&ring->current, box->x, box->y,
+		box->width, box->height);
 }
 
 void wlr_damage_ring_add_whole(struct wlr_damage_ring *ring) {