isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-01 20:30:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

cursor-renderer/native: Various fixes for rotated cursors

Browse Source 
- Drop bogus `meta_monitor_transform_invert()`. It papered over
  wrong `meta_rectangle_transform()` behaviour for non-flipped
  output transforms.
- Update `scale_and_transform_cursor_sprite_cpu` to match the GL
  pipeline matrix in `MetaShapedTexture`, fixing several of the
  flipped cases. Note: the rotation applied is the one a client would
  need to apply to the buffer for a given monitor transform.
- While on it, drop a redundant `return`.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2459>
This commit is contained in:
Robert Mader 2022-06-14 18:47:10 +02:00 committed by Marge Bot
parent d644a40cf5
commit 0c34908132
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/backends/native/meta-cursor-renderer-native.c
View File

@ -410,7 +410,6 @@ set_crtc_cursor (MetaCursorRendererNative *cursor_renderer_native,
float cursor_crtc_scale; float cursor_crtc_scale;
MetaRectangle cursor_rect; MetaRectangle cursor_rect;
MetaMonitorTransform transform; MetaMonitorTransform transform;
MetaMonitorTransform inverted_transform;
MetaMonitorMode *monitor_mode; MetaMonitorMode *monitor_mode;
MetaMonitorCrtcMode *monitor_crtc_mode; MetaMonitorCrtcMode *monitor_crtc_mode;
const MetaCrtcModeInfo *crtc_mode_info; const MetaCrtcModeInfo *crtc_mode_info;
@ -452,15 +451,13 @@ set_crtc_cursor (MetaCursorRendererNative *cursor_renderer_native,
transform = meta_logical_monitor_get_transform (logical_monitor); transform = meta_logical_monitor_get_transform (logical_monitor);
transform = meta_monitor_logical_to_crtc_transform (monitor, transform); transform = meta_monitor_logical_to_crtc_transform (monitor, transform);
inverted_transform = meta_monitor_transform_invert (transform);
monitor_mode = meta_monitor_get_current_mode (monitor); monitor_mode = meta_monitor_get_current_mode (monitor);
monitor_crtc_mode = meta_monitor_get_crtc_mode_for_output (monitor, monitor_crtc_mode = meta_monitor_get_crtc_mode_for_output (monitor,
monitor_mode, monitor_mode,
output); output);
crtc_mode_info = meta_crtc_mode_get_info (monitor_crtc_mode->crtc_mode); crtc_mode_info = meta_crtc_mode_get_info (monitor_crtc_mode->crtc_mode);
meta_rectangle_transform (&cursor_rect, meta_rectangle_transform (&cursor_rect,
inverted_transform, transform,
crtc_mode_info->width, crtc_mode_info->width,
crtc_mode_info->height, crtc_mode_info->height,
&cursor_rect); &cursor_rect);
@ -898,8 +895,6 @@ should_have_hw_cursor (MetaCursorRenderer *renderer,
return TRUE; return TRUE;
else else
return get_can_preprocess (cursor_sprite); return get_can_preprocess (cursor_sprite);
return TRUE;
} }
static gboolean static gboolean
@ -1494,19 +1489,19 @@ scale_and_transform_cursor_sprite_cpu (uint8_t *pixels,
cairo_rotate (cr, M_PI * 0.5); cairo_rotate (cr, M_PI * 0.5);
break; break;
case META_MONITOR_TRANSFORM_FLIPPED: case META_MONITOR_TRANSFORM_FLIPPED:
cairo_scale (cr, 1, -1); cairo_scale (cr, -1, 1);
break; break;
case META_MONITOR_TRANSFORM_FLIPPED_90: case META_MONITOR_TRANSFORM_FLIPPED_90:
cairo_rotate (cr, M_PI * 1.5);
cairo_scale (cr, -1, 1); cairo_scale (cr, -1, 1);
cairo_rotate (cr, M_PI * 0.5);
break; break;
case META_MONITOR_TRANSFORM_FLIPPED_180: case META_MONITOR_TRANSFORM_FLIPPED_180:
cairo_scale (cr, -1, 1);
cairo_rotate (cr, M_PI); cairo_rotate (cr, M_PI);
cairo_scale (cr, 1, -1);
break; break;
case META_MONITOR_TRANSFORM_FLIPPED_270: case META_MONITOR_TRANSFORM_FLIPPED_270:
cairo_rotate (cr, M_PI * 0.5);
cairo_scale (cr, -1, 1); cairo_scale (cr, -1, 1);
cairo_rotate (cr, M_PI * 1.5);
break; break;
case META_MONITOR_TRANSFORM_NORMAL: case META_MONITOR_TRANSFORM_NORMAL:
g_assert_not_reached (); g_assert_not_reached ();