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

Update for swaywm/wlroots#1403
This commit is contained in:
Drew DeVault 2018-12-02 13:17:37 -05:00 committed by GitHub
commit 974a3fbc59
Failed to generate hash of commit

View file

@ -1079,15 +1079,22 @@ renderer_end:
wlr_render_texture(renderer, root->debug_tree, wlr_render_texture(renderer, root->debug_tree,
wlr_output->transform_matrix, 0, 40, 1); wlr_output->transform_matrix, 0, 40, 1);
} }
if (debug.damage == DAMAGE_HIGHLIGHT) {
int width, height;
wlr_output_transformed_resolution(wlr_output, &width, &height);
pixman_region32_union_rect(damage, damage, 0, 0, width, height);
}
wlr_renderer_scissor(renderer, NULL); wlr_renderer_scissor(renderer, NULL);
wlr_output_render_software_cursors(wlr_output, damage); wlr_output_render_software_cursors(wlr_output, damage);
wlr_renderer_end(renderer); wlr_renderer_end(renderer);
int width, height;
wlr_output_transformed_resolution(wlr_output, &width, &height);
if (debug.damage == DAMAGE_HIGHLIGHT) {
pixman_region32_union_rect(damage, damage, 0, 0, width, height);
}
enum wl_output_transform transform =
wlr_output_transform_invert(wlr_output->transform);
wlr_region_transform(damage, damage, transform, width, height);
if (!wlr_output_damage_swap_buffers(output->damage, when, damage)) { if (!wlr_output_damage_swap_buffers(output->damage, when, damage)) {
return; return;
} }