brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

crtc: Move logical monitor pointer to MetaMonitor

Browse Source 
Since the last code fetching the logical monitor state directly from the
CRTC has been removed, we can move the logical monitor pointer to a more
natural place.

https://gitlab.gnome.org/GNOME/mutter/merge_requests/1042
This commit is contained in:
Jonas Ådahl
2020-01-16 10:10:42 +01:00
parent 1c98f01a65
commit 2d6665950c
8 changed files with 21 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/tests/meta-monitor-manager-test.c
View File

@ -177,8 +177,6 @@ apply_crtc_assignments (MetaMonitorManager *manager,
{
MetaCrtc *crtc = l->data;
crtc->logical_monitor = NULL;
if (crtc->is_dirty)
{
crtc->is_dirty = FALSE;

9
src/tests/monitor-unit-tests.c
View File

@ -520,7 +520,7 @@ check_current_monitor_mode (MetaMonitor *monitor,
g_assert (monitor_crtc_mode->crtc_mode == crtc_config->mode);
logical_monitor = crtc->logical_monitor;
logical_monitor = meta_monitor_get_logical_monitor (monitor);
g_assert_nonnull (logical_monitor);
}
@ -618,7 +618,8 @@ check_logical_monitor (MonitorTestCase *test_case,
}
crtc = meta_output_get_assigned_crtc (output);
g_assert (!crtc || crtc->logical_monitor == logical_monitor);
g_assert (!crtc ||
meta_monitor_get_logical_monitor (monitor) == logical_monitor);
g_assert_cmpint (logical_monitor->is_presentation,
==,
output->is_presentation);
@ -831,7 +832,6 @@ check_monitor_configuration (MonitorTestCase *test_case)
}
else
{
MetaLogicalMonitor *logical_monitor = crtc->logical_monitor;
MetaCrtcMode *expected_current_mode;
g_assert_nonnull (crtc_config);
@ -845,9 +845,6 @@ check_monitor_configuration (MonitorTestCase *test_case)
==,
test_case->expect.crtcs[i].transform);
logical_monitor = crtc->logical_monitor;
g_assert_nonnull (logical_monitor);
g_assert_cmpfloat_with_epsilon (crtc_config->layout.origin.x,
test_case->expect.crtcs[i].x,
FLT_EPSILON);