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

Merge pull request #861 from emersion/fix-output-transform-compose 

Fix wlr_output_transform_compose
This commit is contained in:
Drew DeVault 2018-04-12 19:27:57 -04:00 committed by GitHub
parent 5c2d923718 31c8bdc277
commit 8f4039d799
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
types/wlr_output.c
View File

@ -916,8 +916,5 @@ enum wl_output_transform wlr_output_transform_compose(
uint32_t flipped = (tr_a ^ tr_b) & WL_OUTPUT_TRANSFORM_FLIPPED; uint32_t flipped = (tr_a ^ tr_b) & WL_OUTPUT_TRANSFORM_FLIPPED;
uint32_t rotated = uint32_t rotated =
(tr_a + tr_b) & (WL_OUTPUT_TRANSFORM_90 | WL_OUTPUT_TRANSFORM_180); (tr_a + tr_b) & (WL_OUTPUT_TRANSFORM_90 | WL_OUTPUT_TRANSFORM_180);
if ((tr_a & WL_OUTPUT_TRANSFORM_FLIPPED) && (tr_b & WL_OUTPUT_TRANSFORM_FLIPPED)) {
rotated = wlr_output_transform_invert(rotated);
}
return flipped | rotated; return flipped | rotated;
} }