blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

screencopy: don't use output transform for damage copy 

Only wlr_output_damage works in transformed coordinates,
wlr_output->damage is in output-buffer-local coordinates.

This essentially reverts 1ecc1b5 and fixes 1477401.
This commit is contained in:
Isaac Freund 2020-12-07 11:02:04 +01:00 committed by Simon Ser
parent 54b7ca56c0
commit baf2319fd3
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
types/wlr_screencopy_v1.c
View File

@ -48,17 +48,16 @@ static void screencopy_damage_accumulate(struct screencopy_damage *damage) {
return; return;
} }
int width, height;
wlr_output_transformed_resolution(output, &width, &height);
if (output->pending.committed & WLR_OUTPUT_STATE_DAMAGE) { if (output->pending.committed & WLR_OUTPUT_STATE_DAMAGE) {
// If the compositor submitted damage, copy it over // If the compositor submitted damage, copy it over
pixman_region32_union(region, region, &output->pending.damage); pixman_region32_union(region, region, &output->pending.damage);
pixman_region32_intersect_rect(region, region, 0, 0, width, height); pixman_region32_intersect_rect(region, region, 0, 0,
output->width, output->height);
} else if (output->pending.committed & WLR_OUTPUT_STATE_BUFFER) { } else if (output->pending.committed & WLR_OUTPUT_STATE_BUFFER) {
// If the compositor did not submit damage but did submit a buffer // If the compositor did not submit damage but did submit a buffer
// damage everything // damage everything
pixman_region32_union_rect(region, region, 0, 0, width, height); pixman_region32_union_rect(region, region, 0, 0,
output->width, output->height);
} }
damage->last_commit_seq = output->commit_seq; damage->last_commit_seq = output->commit_seq;