diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-04-12 19:27:57 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-12 19:27:57 -0400 |
| commit | 8f4039d799bc76612d2e440216cb9cb5242e2382 (patch) | |
| tree | 3e571ee8d29983841ffbaaf71e2654981151811f | |
| parent | 5c2d92371857140d7b752633e996f2e269e6e58a (diff) | |
| parent | 31c8bdc2778ba3efe0640031aaa722b7fb743f06 (diff) | |
Merge pull request #861 from emersion/fix-output-transform-compose
Fix wlr_output_transform_compose
| -rw-r--r-- | types/wlr_output.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/types/wlr_output.c b/types/wlr_output.c index f95a7ea0..22353ab3 100644 --- a/types/wlr_output.c +++ b/types/wlr_output.c @@ -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 rotated = (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; } |