Merge branch 'master' into gles2-renderer-redesign

This commit is contained in:
emersion 2018-03-23 00:55:55 +01:00
commit a854c2f246
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
15 changed files with 121 additions and 58 deletions

View file

@ -680,6 +680,7 @@ static void damage_from_surface(struct wlr_surface *surface,
}
pixman_region32_translate(&damage, box.x, box.y);
wlr_output_damage_add(output->damage, &damage);
pixman_region32_fini(&damage);
} else {
pixman_box32_t *extents =
pixman_region32_extents(&surface->current->surface_damage);