[mutter] cursor-renderer-native: Don't use HW cursor on transformed logical monitor
- From: Jonas Ådahl <jadahl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] cursor-renderer-native: Don't use HW cursor on transformed logical monitor
- Date: Mon, 21 Aug 2017 13:25:31 +0000 (UTC)
commit 14fe6e9c95c5bc6784462131d525500ed99663ec
Author: Jonas Ådahl <jadahl gmail com>
Date: Fri Aug 11 15:02:43 2017 +0800
cursor-renderer-native: Don't use HW cursor on transformed logical monitor
The HW cursor plane can't do any transformations, and as we still don't
pre-transform any buffer before uploading to the cursor plane, we must
disable the HW cursor when a logical monitor is transformed.
This worked previously because the transform of a MetaCrtc did not
correspond to the transform of a CRTC, but the transform of the logical
monitor the CRTC was assigned to.
https://bugzilla.gnome.org/show_bug.cgi?id=786023
src/backends/meta-logical-monitor.c | 12 ++++++
src/backends/meta-logical-monitor.h | 4 ++
src/backends/native/meta-cursor-renderer-native.c | 43 ++++++++++++--------
3 files changed, 42 insertions(+), 17 deletions(-)
---
diff --git a/src/backends/meta-logical-monitor.c b/src/backends/meta-logical-monitor.c
index 84cb46c..2404d23 100644
--- a/src/backends/meta-logical-monitor.c
+++ b/src/backends/meta-logical-monitor.c
@@ -181,6 +181,18 @@ meta_logical_monitor_get_scale (MetaLogicalMonitor *logical_monitor)
return logical_monitor->scale;
}
+MetaMonitorTransform
+meta_logical_monitor_get_transform (MetaLogicalMonitor *logical_monitor)
+{
+ return logical_monitor->transform;
+}
+
+MetaRectangle
+meta_logical_monitor_get_layout (MetaLogicalMonitor *logical_monitor)
+{
+ return logical_monitor->rect;
+}
+
GList *
meta_logical_monitor_get_monitors (MetaLogicalMonitor *logical_monitor)
{
diff --git a/src/backends/meta-logical-monitor.h b/src/backends/meta-logical-monitor.h
index 755c0f6..6068700 100644
--- a/src/backends/meta-logical-monitor.h
+++ b/src/backends/meta-logical-monitor.h
@@ -80,6 +80,10 @@ void meta_logical_monitor_make_primary (MetaLogicalMonitor *logical_monitor);
float meta_logical_monitor_get_scale (MetaLogicalMonitor *logical_monitor);
+MetaMonitorTransform meta_logical_monitor_get_transform (MetaLogicalMonitor *logical_monitor);
+
+MetaRectangle meta_logical_monitor_get_layout (MetaLogicalMonitor *logical_monitor);
+
GList * meta_logical_monitor_get_monitors (MetaLogicalMonitor *logical_monitor);
gboolean meta_logical_monitor_has_neighbor (MetaLogicalMonitor *logical_monitor,
diff --git a/src/backends/native/meta-cursor-renderer-native.c
b/src/backends/native/meta-cursor-renderer-native.c
index bcaa195..72276eb 100644
--- a/src/backends/native/meta-cursor-renderer-native.c
+++ b/src/backends/native/meta-cursor-renderer-native.c
@@ -383,28 +383,37 @@ has_valid_cursor_sprite_gbm_bo (MetaCursorSprite *cursor_sprite)
}
static gboolean
-cursor_over_transformed_crtc (MetaCursorRenderer *renderer,
- MetaCursorSprite *cursor_sprite)
+cursor_over_transformed_logical_monitor (MetaCursorRenderer *renderer,
+ MetaCursorSprite *cursor_sprite)
{
- MetaMonitorManager *monitors;
- MetaCrtc *crtcs;
- unsigned int i, n_crtcs;
- ClutterRect rect;
-
- monitors = meta_monitor_manager_get ();
- meta_monitor_manager_get_resources (monitors, NULL, NULL,
- &crtcs, &n_crtcs, NULL, NULL);
- rect = meta_cursor_renderer_calculate_rect (renderer, cursor_sprite);
+ MetaBackend *backend = meta_get_backend ();
+ MetaMonitorManager *monitor_manager =
+ meta_backend_get_monitor_manager (backend);
+ GList *logical_monitors;
+ GList *l;
+ ClutterRect cursor_rect;
- for (i = 0; i < n_crtcs; i++)
+ cursor_rect = meta_cursor_renderer_calculate_rect (renderer, cursor_sprite);
+ logical_monitors =
+ meta_monitor_manager_get_logical_monitors (monitor_manager);
+ for (l = logical_monitors; l; l = l->next)
{
- MetaCrtc *crtc = &crtcs[i];
- ClutterRect crtc_rect = meta_rectangle_to_clutter_rect (&crtc->rect);
+ MetaLogicalMonitor *logical_monitor = l->data;
+ MetaRectangle logical_monitor_layout;
+ ClutterRect logical_monitor_rect;
+ MetaMonitorTransform transform;
- if (!clutter_rect_intersection (&rect, &crtc_rect, NULL))
+ logical_monitor_layout =
+ meta_logical_monitor_get_layout (logical_monitor);
+ logical_monitor_rect =
+ meta_rectangle_to_clutter_rect (&logical_monitor_layout);
+
+ if (!clutter_rect_intersection (&cursor_rect, &logical_monitor_rect,
+ NULL))
continue;
- if (crtc->transform != META_MONITOR_TRANSFORM_NORMAL)
+ transform = meta_logical_monitor_get_transform (logical_monitor);
+ if (transform != META_MONITOR_TRANSFORM_NORMAL)
return TRUE;
}
@@ -478,7 +487,7 @@ should_have_hw_cursor (MetaCursorRenderer *renderer,
if (!cursor_sprite)
return FALSE;
- if (cursor_over_transformed_crtc (renderer, cursor_sprite))
+ if (cursor_over_transformed_logical_monitor (renderer, cursor_sprite))
return FALSE;
texture = meta_cursor_sprite_get_cogl_texture (cursor_sprite);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]