mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-03 09:01:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

wlr_scene: Funnel all damage operations through scene_output_damage

Browse source 
We want to add logic to this function later

(cherry picked from commit 78dfa4f06d)
This commit is contained in:
Alexander Orzechowski 2024-08-13 16:47:12 -04:00 • committed by Simon Zeni
parent 89e1ea130d
commit 43388cd277
1 changed files with 25 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

41
types/scene/wlr_scene.c
View file

@ -315,6 +315,22 @@ static void transform_output_box(struct wlr_box *box, const struct render_data *
wlr_box_transform(box, box, transform, data->trans_width, data->trans_height); wlr_box_transform(box, box, transform, data->trans_width, data->trans_height);
} }
static void scene_output_damage(struct wlr_scene_output *scene_output,
const pixman_region32_t *region) {
if (wlr_damage_ring_add(&scene_output->damage_ring, region)) {
wlr_output_schedule_frame(scene_output->output);
}
}
static void scene_output_damage_whole(struct wlr_scene_output *scene_output) {
struct wlr_damage_ring *ring = &scene_output->damage_ring;
pixman_region32_t damage;
pixman_region32_init_rect(&damage, 0, 0, ring->width, ring->height);
scene_output_damage(scene_output, &damage);
pixman_region32_fini(&damage);
}
static void scene_damage_outputs(struct wlr_scene *scene, pixman_region32_t *damage) { static void scene_damage_outputs(struct wlr_scene *scene, pixman_region32_t *damage) {
if (!pixman_region32_not_empty(damage)) { if (!pixman_region32_not_empty(damage)) {
return; return;
@ -328,9 +344,7 @@ static void scene_damage_outputs(struct wlr_scene *scene, pixman_region32_t *dam
pixman_region32_translate(&output_damage, pixman_region32_translate(&output_damage,
-scene_output->x, -scene_output->y); -scene_output->x, -scene_output->y);
scale_output_damage(&output_damage, scene_output->output->scale); scale_output_damage(&output_damage, scene_output->output->scale);
if (wlr_damage_ring_add(&scene_output->damage_ring, &output_damage)) { scene_output_damage(scene_output, &output_damage);
wlr_output_schedule_frame(scene_output->output);
}
pixman_region32_fini(&output_damage); pixman_region32_fini(&output_damage);
} }
} }
@ -800,9 +814,7 @@ void wlr_scene_buffer_set_buffer_with_damage(struct wlr_scene_buffer *scene_buff
pixman_region32_translate(&output_damage, pixman_region32_translate(&output_damage,
(int)round((lx - scene_output->x) * output_scale), (int)round((lx - scene_output->x) * output_scale),
(int)round((ly - scene_output->y) * output_scale)); (int)round((ly - scene_output->y) * output_scale));
if (wlr_damage_ring_add(&scene_output->damage_ring, &output_damage)) { scene_output_damage(scene_output, &output_damage);
wlr_output_schedule_frame(scene_output->output);
}
pixman_region32_fini(&output_damage); pixman_region32_fini(&output_damage);
} }
@ -1226,7 +1238,7 @@ static void scene_entry_render(struct render_list_entry *entry, const struct ren
struct wlr_texture *texture = scene_buffer_get_texture(scene_buffer, struct wlr_texture *texture = scene_buffer_get_texture(scene_buffer,
data->output->output->renderer); data->output->output->renderer);
if (texture == NULL) { if (texture == NULL) {
wlr_damage_ring_add(&data->output->damage_ring, &render_region); scene_output_damage(data->output, &render_region);
break; break;
} }
@ -1313,8 +1325,7 @@ static void scene_node_output_update(struct wlr_scene_node *node,
static void scene_output_update_geometry(struct wlr_scene_output *scene_output, static void scene_output_update_geometry(struct wlr_scene_output *scene_output,
bool force_update) { bool force_update) {
wlr_damage_ring_add_whole(&scene_output->damage_ring); scene_output_damage_whole(scene_output);
wlr_output_schedule_frame(scene_output->output);
scene_node_output_update(&scene_output->scene->tree.node, scene_node_output_update(&scene_output->scene->tree.node,
&scene_output->scene->outputs, NULL, force_update ? scene_output : NULL); &scene_output->scene->outputs, NULL, force_update ? scene_output : NULL);
@ -1368,9 +1379,7 @@ static void scene_output_handle_damage(struct wl_listener *listener, void *data)
struct wlr_scene_output *scene_output = wl_container_of(listener, struct wlr_scene_output *scene_output = wl_container_of(listener,
scene_output, output_damage); scene_output, output_damage);
struct wlr_output_event_damage *event = data; struct wlr_output_event_damage *event = data;
if (wlr_damage_ring_add(&scene_output->damage_ring, event->damage)) { scene_output_damage(scene_output, event->damage);
wlr_output_schedule_frame(scene_output->output);
}
} }
static void scene_output_handle_needs_frame(struct wl_listener *listener, void *data) { static void scene_output_handle_needs_frame(struct wl_listener *listener, void *data) {
@ -1750,7 +1759,7 @@ bool wlr_scene_output_build_state(struct wlr_scene_output *scene_output,
if (state->committed & WLR_OUTPUT_STATE_TRANSFORM) { if (state->committed & WLR_OUTPUT_STATE_TRANSFORM) {
if (render_data.transform != state->transform) { if (render_data.transform != state->transform) {
wlr_damage_ring_add_whole(&scene_output->damage_ring); scene_output_damage_whole(scene_output);
} }
render_data.transform = state->transform; render_data.transform = state->transform;
@ -1758,7 +1767,7 @@ bool wlr_scene_output_build_state(struct wlr_scene_output *scene_output,
if (state->committed & WLR_OUTPUT_STATE_SCALE) { if (state->committed & WLR_OUTPUT_STATE_SCALE) {
if (render_data.scale != state->scale) { if (render_data.scale != state->scale) {
wlr_damage_ring_add_whole(&scene_output->damage_ring); scene_output_damage_whole(scene_output);
} }
render_data.scale = state->scale; render_data.scale = state->scale;
@ -1792,7 +1801,7 @@ bool wlr_scene_output_build_state(struct wlr_scene_output *scene_output,
render_data.trans_width, render_data.trans_height); render_data.trans_width, render_data.trans_height);
if (debug_damage == WLR_SCENE_DEBUG_DAMAGE_RERENDER) { if (debug_damage == WLR_SCENE_DEBUG_DAMAGE_RERENDER) {
wlr_damage_ring_add_whole(&scene_output->damage_ring); scene_output_damage_whole(scene_output);
} }
struct timespec now; struct timespec now;
@ -1829,7 +1838,7 @@ bool wlr_scene_output_build_state(struct wlr_scene_output *scene_output,
} }
} }
wlr_damage_ring_add(&scene_output->damage_ring, &acc_damage); scene_output_damage(scene_output, &acc_damage);
pixman_region32_fini(&acc_damage); pixman_region32_fini(&acc_damage);
} }