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

Merge branch 'damage-ring-swapchain-helper' into 'master'

Browse source 
swapchain: Introduce new helper for damage rings

See merge request wlroots/wlroots!4854
This commit is contained in:
Alexander Orzechowski 2024-11-07 14:18:02 +00:00
commit 9ec28b81c9
3 changed files with 69 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

26
types/scene/wlr_scene.c
View file

@ -2103,7 +2103,9 @@ bool wlr_scene_output_build_state(struct wlr_scene_output *scene_output,
swapchain = output->swapchain;
}
struct wlr_buffer *buffer = wlr_swapchain_acquire(swapchain);
pixman_region32_init(&render_data.damage);
struct wlr_buffer *buffer = wlr_swapchain_acquire_from_damage_ring(swapchain,
&scene_output->damage_ring, &render_data.damage);
if (buffer == NULL) {
return false;
}
@ -2128,16 +2130,11 @@ bool wlr_scene_output_build_state(struct wlr_scene_output *scene_output,
.signal_point = scene_output->in_point,
});
if (render_pass == NULL) {
wlr_buffer_unlock(buffer);
return false;
goto fail;
}
render_data.render_pass = render_pass;
pixman_region32_init(&render_data.damage);
wlr_damage_ring_rotate_buffer(&scene_output->damage_ring, buffer,
&render_data.damage);
pixman_region32_t background;
pixman_region32_init(&background);
pixman_region32_copy(&background, &render_data.damage);
@ -2219,12 +2216,7 @@ bool wlr_scene_output_build_state(struct wlr_scene_output *scene_output,
pixman_region32_fini(&render_data.damage);
if (!wlr_render_pass_submit(render_pass)) {
wlr_buffer_unlock(buffer);
// if we failed to render the buffer, it will have undefined contents
// Trash the damage ring
wlr_damage_ring_add_whole(&scene_output->damage_ring);
return false;
goto fail;
}
wlr_output_state_set_buffer(state, buffer);
@ -2238,6 +2230,14 @@ bool wlr_scene_output_build_state(struct wlr_scene_output *scene_output,
scene_output_state_attempt_gamma(scene_output, state);
return true;
fail:
wlr_buffer_unlock(buffer);
// if we failed to render the buffer, it will have undefined contents
// Trash the damage ring
wlr_damage_ring_add_whole(&scene_output->damage_ring);
return false;
}
int64_t wlr_scene_timer_get_duration_ns(struct wlr_scene_timer *timer) {