mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2026-04-18 06:47:31 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

wlr_damage_ring: Rework to use list instead of fixed length ring

Browse source 
When we add buffer support this model of keeping a fixed size list
simply won't be compatible.
This commit is contained in:
Alexander Orzechowski 2023-07-12 23:08:34 -04:00 • committed by Leo Li
parent a6d3eee63a
commit 600d995e94
2 changed files with 49 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

9
include/wlr/types/wlr_damage_ring.h
View file

@ -13,14 +13,14 @@
#include <stddef.h> #include <stddef.h>
#include <stdint.h> #include <stdint.h>
#include <pixman.h> #include <pixman.h>
#include <wayland-server-core.h>
/* For triple buffering, a history of two frames is required. */
#define WLR_DAMAGE_RING_PREVIOUS_LEN 2
struct wlr_box; struct wlr_box;
struct wlr_damage_ring_entry { struct wlr_damage_ring_entry {
pixman_region32_t damage; pixman_region32_t damage;
struct wl_list link; // struct wlr_damage_ring.previous
}; };
struct wlr_damage_ring { struct wlr_damage_ring {
@ -31,8 +31,7 @@ struct wlr_damage_ring {
// private state // private state
struct wlr_damage_ring_entry previous[WLR_DAMAGE_RING_PREVIOUS_LEN]; struct wl_list previous; // struct wlr_damage_ring_entry.link
size_t previous_idx;
}; };
void wlr_damage_ring_init(struct wlr_damage_ring *ring); void wlr_damage_ring_init(struct wlr_damage_ring *ring);

72
types/wlr_damage_ring.c
View file

@ -14,15 +14,21 @@ void wlr_damage_ring_init(struct wlr_damage_ring *ring) {
}; };
pixman_region32_init(&ring->current); pixman_region32_init(&ring->current);
for (size_t i = 0; i < WLR_DAMAGE_RING_PREVIOUS_LEN; ++i) { wl_list_init(&ring->previous);
pixman_region32_init(&ring->previous[i].damage); }
}
static void entry_destroy(struct wlr_damage_ring_entry *entry) {
wl_list_remove(&entry->link);
pixman_region32_fini(&entry->damage);
free(entry);
} }
void wlr_damage_ring_finish(struct wlr_damage_ring *ring) { void wlr_damage_ring_finish(struct wlr_damage_ring *ring) {
pixman_region32_fini(&ring->current); pixman_region32_fini(&ring->current);
for (size_t i = 0; i < WLR_DAMAGE_RING_PREVIOUS_LEN; ++i) {
pixman_region32_fini(&ring->previous[i].damage); struct wlr_damage_ring_entry *entry, *tmp_entry;
wl_list_for_each_safe(entry, tmp_entry, &ring->previous, link) {
entry_destroy(entry);
} }
} }
@ -79,38 +85,50 @@ void wlr_damage_ring_add_whole(struct wlr_damage_ring *ring) {
} }
void wlr_damage_ring_rotate(struct wlr_damage_ring *ring) { void wlr_damage_ring_rotate(struct wlr_damage_ring *ring) {
// modular decrement struct wlr_damage_ring_entry *last =
ring->previous_idx = ring->previous_idx + wl_container_of(ring->previous.prev, last, link);
WLR_DAMAGE_RING_PREVIOUS_LEN - 1; wl_list_remove(&last->link);
ring->previous_idx %= WLR_DAMAGE_RING_PREVIOUS_LEN; wl_list_insert(&ring->previous, &last->link);
pixman_region32_copy(&ring->previous[ring->previous_idx].damage, &ring->current); pixman_region32_copy(&last->damage, &ring->current);
pixman_region32_clear(&ring->current); pixman_region32_clear(&ring->current);
} }
void wlr_damage_ring_get_buffer_damage(struct wlr_damage_ring *ring, void wlr_damage_ring_get_buffer_damage(struct wlr_damage_ring *ring,
int buffer_age, pixman_region32_t *damage) { int buffer_age, pixman_region32_t *damage) {
if (buffer_age <= 0 || buffer_age - 1 > WLR_DAMAGE_RING_PREVIOUS_LEN) { pixman_region32_copy(damage, &ring->current);
// Accumulate damage from old buffers
struct wlr_damage_ring_entry *entry;
wl_list_for_each(entry, &ring->previous, link) {
if (--buffer_age <= 0) {
break;
}
pixman_region32_union(damage, damage, &entry->damage);
}
// if our buffer age is older than anything we are keeping track of, increase
// the size
if (buffer_age > 0) {
pixman_region32_clear(damage); pixman_region32_clear(damage);
pixman_region32_union_rect(damage, damage, pixman_region32_union_rect(damage, damage,
0, 0, ring->width, ring->height); 0, 0, ring->width, ring->height);
} else {
pixman_region32_copy(damage, &ring->current);
// Accumulate damage from old buffers struct wlr_damage_ring_entry *entry = calloc(1, sizeof(*entry));
for (int i = 0; i < buffer_age - 1; ++i) { if (entry) {
int j = (ring->previous_idx + i) % WLR_DAMAGE_RING_PREVIOUS_LEN; pixman_region32_init(&entry->damage);
pixman_region32_union(damage, damage, &ring->previous[j].damage); wl_list_insert(ring->previous.prev, &entry->link);
}
// Check the number of rectangles
int n_rects = pixman_region32_n_rects(damage);
if (n_rects > WLR_DAMAGE_RING_MAX_RECTS) {
pixman_box32_t *extents = pixman_region32_extents(damage);
pixman_region32_union_rect(damage, damage,
extents->x1, extents->y1,
extents->x2 - extents->x1,
extents->y2 - extents->y1);
} }
} }
// Check the number of rectangles
int n_rects = pixman_region32_n_rects(damage);
if (n_rects > WLR_DAMAGE_RING_MAX_RECTS) {
pixman_box32_t *extents = pixman_region32_extents(damage);
pixman_region32_union_rect(damage, damage,
extents->x1, extents->y1,
extents->x2 - extents->x1,
extents->y2 - extents->y1);
}
} }