Merge pull request #1403 from emersion/swap-buffers-damage-coords

output: switch swap_buffers damage to output-buffer-local coords
This commit is contained in:
Drew DeVault 2018-12-02 13:17:24 -05:00 committed by GitHub
commit 273e110b74
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 14 deletions

View file

@ -365,9 +365,6 @@ bool wlr_output_swap_buffers(struct wlr_output *output, struct timespec *when,
output->idle_frame = NULL;
}
int width, height;
wlr_output_transformed_resolution(output, &width, &height);
struct timespec now;
if (when == NULL) {
clock_gettime(CLOCK_MONOTONIC, &now);
@ -384,19 +381,12 @@ bool wlr_output_swap_buffers(struct wlr_output *output, struct timespec *when,
pixman_region32_t render_damage;
pixman_region32_init(&render_damage);
pixman_region32_union_rect(&render_damage, &render_damage, 0, 0,
width, height);
output->width, output->height);
if (damage != NULL) {
// Damage tracking supported
pixman_region32_intersect(&render_damage, &render_damage, damage);
}
// Transform damage into renderer coordinates, ie. upside down
// TODO: take transformed coords, make the renderer flip the damage
enum wl_output_transform transform =
wlr_output_transform_invert(output->transform);
wlr_region_transform(&render_damage, &render_damage, transform,
width, height);
if (!output->impl->swap_buffers(output, damage ? &render_damage : NULL)) {
pixman_region32_fini(&render_damage);
return false;