[mutter] Revert "wayland/surface: Swap 90 and 270 degree transforms"
- From: Marge Bot <marge-bot src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] Revert "wayland/surface: Swap 90 and 270 degree transforms"
- Date: Tue, 26 Jul 2022 19:16:11 +0000 (UTC)
commit 9e7127848836b2103a97ccbb8ac326a4c1e160e9
Author: Robert Mader <robert mader posteo de>
Date: Tue Jun 14 19:02:03 2022 +0200
Revert "wayland/surface: Swap 90 and 270 degree transforms"
As testing of direct scanout revealed, `META_MONITOR_TRANSFORM`
does actually match `WL_OUTPUT_TRANSFORM` enums. The fact that
things rendered correctly with 90/270 degree values swapped
was because other parts of the stack got the interpretation
wrong, most notably `meta_rectangle_transform()`.
Thus lets revert this change and fix the stack accordingly.
This reverts commit 8d9bbe109b16969557672330da0d6a26adc8eae2.
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2459>
src/wayland/meta-wayland-surface.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/src/wayland/meta-wayland-surface.c b/src/wayland/meta-wayland-surface.c
index aad2dc35cf..2279e894b6 100644
--- a/src/wayland/meta-wayland-surface.c
+++ b/src/wayland/meta-wayland-surface.c
@@ -1191,19 +1191,19 @@ transform_from_wl_output_transform (int32_t transform_value)
case WL_OUTPUT_TRANSFORM_NORMAL:
return META_MONITOR_TRANSFORM_NORMAL;
case WL_OUTPUT_TRANSFORM_90:
- return META_MONITOR_TRANSFORM_270;
+ return META_MONITOR_TRANSFORM_90;
case WL_OUTPUT_TRANSFORM_180:
return META_MONITOR_TRANSFORM_180;
case WL_OUTPUT_TRANSFORM_270:
- return META_MONITOR_TRANSFORM_90;
+ return META_MONITOR_TRANSFORM_270;
case WL_OUTPUT_TRANSFORM_FLIPPED:
return META_MONITOR_TRANSFORM_FLIPPED;
case WL_OUTPUT_TRANSFORM_FLIPPED_90:
- return META_MONITOR_TRANSFORM_FLIPPED_270;
+ return META_MONITOR_TRANSFORM_FLIPPED_90;
case WL_OUTPUT_TRANSFORM_FLIPPED_180:
return META_MONITOR_TRANSFORM_FLIPPED_180;
case WL_OUTPUT_TRANSFORM_FLIPPED_270:
- return META_MONITOR_TRANSFORM_FLIPPED_90;
+ return META_MONITOR_TRANSFORM_FLIPPED_270;
default:
return -1;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]