summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Ã…dahl <jadahl@gmail.com>2019-04-04 18:43:09 +0200
committerGeorges Basile Stavracas Neto <georges.stavracas@gmail.com>2019-06-20 13:31:56 +0000
commitbea76004717474c84871f605d5a17e95b35a011c (patch)
tree0386fe7f9b8bdc111c40e3d5cd5b70c99c8c7234
parent8932388dda51121c03b03782e832d36c8f8a42b6 (diff)
downloadmutter-bea76004717474c84871f605d5a17e95b35a011c.tar.gz
logical-monitor: Pass output when iterating over CRTCs
While not currently used by any users, it'll be useful in future commits. https://gitlab.gnome.org/GNOME/mutter/issues/548 https://gitlab.gnome.org/GNOME/mutter/merge_requests/525
-rw-r--r--src/backends/meta-logical-monitor.c1
-rw-r--r--src/backends/meta-logical-monitor.h1
-rw-r--r--src/backends/native/meta-renderer-native.c3
3 files changed, 5 insertions, 0 deletions
diff --git a/src/backends/meta-logical-monitor.c b/src/backends/meta-logical-monitor.c
index 99a35f7f3..580db8194 100644
--- a/src/backends/meta-logical-monitor.c
+++ b/src/backends/meta-logical-monitor.c
@@ -242,6 +242,7 @@ foreach_crtc (MetaMonitor *monitor,
ForeachCrtcData *data = user_data;
data->func (data->logical_monitor,
+ monitor_crtc_mode->output,
meta_output_get_assigned_crtc (monitor_crtc_mode->output),
data->user_data);
diff --git a/src/backends/meta-logical-monitor.h b/src/backends/meta-logical-monitor.h
index 0e46b05ce..4532e654c 100644
--- a/src/backends/meta-logical-monitor.h
+++ b/src/backends/meta-logical-monitor.h
@@ -63,6 +63,7 @@ G_DECLARE_FINAL_TYPE (MetaLogicalMonitor, meta_logical_monitor,
GObject)
typedef void (* MetaLogicalMonitorCrtcFunc) (MetaLogicalMonitor *logical_monitor,
+ MetaOutput *output,
MetaCrtc *crtc,
gpointer user_data);
diff --git a/src/backends/native/meta-renderer-native.c b/src/backends/native/meta-renderer-native.c
index f44be06fd..2cb3f1cf7 100644
--- a/src/backends/native/meta-renderer-native.c
+++ b/src/backends/native/meta-renderer-native.c
@@ -584,6 +584,7 @@ typedef struct _GetSupportedKmsFormatsData
static void
get_supported_kms_formats_crtc_func (MetaLogicalMonitor *logical_monitor,
+ MetaOutput *output,
MetaCrtc *crtc,
gpointer user_data)
{
@@ -1827,6 +1828,7 @@ typedef struct _SetCrtcFbData
static void
set_crtc_fb_cb (MetaLogicalMonitor *logical_monitor,
+ MetaOutput *output,
MetaCrtc *crtc,
gpointer user_data)
{
@@ -1937,6 +1939,7 @@ typedef struct _FlipCrtcData
static void
flip_crtc (MetaLogicalMonitor *logical_monitor,
+ MetaOutput *output,
MetaCrtc *crtc,
gpointer user_data)
{