mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-24 06:59:45 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

output: add damage tracking via buffer age

Browse source
This commit is contained in:
emersion 2018-01-21 00:06:35 +01:00
parent 78c13ead16
commit 0365b587f0
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
21 changed files with 163 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

22
types/wlr_output.c
View file

@ -281,7 +281,6 @@ void wlr_output_init(struct wlr_output *output, struct wlr_backend *backend,
wl_signal_init(&output->events.transform);
wl_signal_init(&output->events.destroy);
pixman_region32_init(&output->damage);
pixman_region32_init(&output->previous_damage);
output->display_destroy.notify = handle_display_destroy;
wl_display_add_destroy_listener(display, &output->display_destroy);
@ -310,7 +309,6 @@ void wlr_output_destroy(struct wlr_output *output) {
}
pixman_region32_fini(&output->damage);
pixman_region32_fini(&output->previous_damage);
if (output->impl && output->impl->destroy) {
output->impl->destroy(output);
@ -332,8 +330,8 @@ void wlr_output_effective_resolution(struct wlr_output *output,
*height /= output->scale;
}
void wlr_output_make_current(struct wlr_output *output) {
output->impl->make_current(output);
bool wlr_output_make_current(struct wlr_output *output, int *buffer_age) {
return output->impl->make_current(output, buffer_age);
}
static void output_fullscreen_surface_get_box(struct wlr_output *output,
@ -466,17 +464,17 @@ surface_damage_finish:
pixman_region32_fini(&surface_damage);
}
void wlr_output_swap_buffers(struct wlr_output *output, struct timespec *when,
bool wlr_output_swap_buffers(struct wlr_output *output, struct timespec *when,
pixman_region32_t *damage) {
wl_signal_emit(&output->events.swap_buffers, damage);
pixman_region32_t *render_damage = damage;
if (damage == NULL) {
// Damage tracking not supported, repaint the whole output
pixman_region32_t output_damage;
pixman_region32_init(&output_damage);
pixman_region32_copy(&output_damage, &output->damage);
pixman_region32_union(&output_damage, &output_damage,
&output->previous_damage);
pixman_region32_union_rect(&output_damage, &output_damage,
0, 0, output->width, output->height);
render_damage = &output_damage;
}
@ -503,14 +501,18 @@ void wlr_output_swap_buffers(struct wlr_output *output, struct timespec *when,
}
// TODO: provide `damage` (not `render_damage`) to backend
output->impl->swap_buffers(output);
if (!output->impl->swap_buffers(output)) {
return false;
}
output->needs_swap = false;
pixman_region32_copy(&output->previous_damage, &output->damage);
pixman_region32_clear(&output->damage);
if (damage == NULL) {
pixman_region32_fini(render_damage);
}
return true;
}
void wlr_output_set_gamma(struct wlr_output *output,

1
types/wlr_screenshooter.c
View file

@ -47,7 +47,6 @@ static void output_frame_notify(struct wl_listener *listener, void *_data) {
struct wlr_renderer *renderer = state->screenshot->screenshooter->renderer;
struct wlr_output *output = state->screenshot->output;
wlr_output_make_current(output);
wlr_renderer_read_pixels(renderer, 0, 0, output->width, output->height,
state->pixels);