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

Fix wlr_output_transform_compose
8 years ago · 8f4039d799
parent 5c2d923718 31c8bdc277
commit 8f4039d799
1 changed files with 0 additions and 3 deletions
--- 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;
 }