isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-12 17:27:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

meta-monitor-config: Look at an output's modes directly when assigning

Browse Source 
Going through the global mode pool and then checking if the mode is
available for a given output is pointless work since we can look at
the output's available modes directly.

This implicitly changes how we choose the default mode since, instead
of relying on the sort order of the global modes array, we now rely on
the sort order of the output modes array. Still not ideal, but at
least it makes more sense since the global array is essentially
unsorted.

https://bugzilla.gnome.org/show_bug.cgi?id=772176
This commit is contained in:
Rui Matos 2016-10-06 16:04:49 +02:00
parent 04b75c45f8
commit 5261638bfd
1 changed files with 5 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/backends/meta-monitor-config.c
View File

@ -1801,19 +1801,6 @@ crtc_can_drive_output (MetaCRTC *crtc,
return FALSE; return FALSE;
} }
static gboolean
output_supports_mode (MetaOutput *output,
MetaMonitorMode *mode)
{
unsigned int i;
for (i = 0; i < output->n_modes; i++)
if (output->modes[i] == mode)
return TRUE;
return FALSE;
}
static gboolean static gboolean
crtc_assignment_assign (CrtcAssignment *assign, crtc_assignment_assign (CrtcAssignment *assign,
MetaCRTC *crtc, MetaCRTC *crtc,
@ -1828,9 +1815,6 @@ crtc_assignment_assign (CrtcAssignment *assign,
if (!crtc_can_drive_output (crtc, output)) if (!crtc_can_drive_output (crtc, output))
return FALSE; return FALSE;
if (!output_supports_mode (output, mode))
return FALSE;
if ((crtc->all_transforms & (1 << transform)) == 0) if ((crtc->all_transforms & (1 << transform)) == 0)
return FALSE; return FALSE;
@ -1917,10 +1901,9 @@ static gboolean
real_assign_crtcs (CrtcAssignment *assignment, real_assign_crtcs (CrtcAssignment *assignment,
unsigned int output_num) unsigned int output_num)
{ {
MetaMonitorMode *modes;
MetaCRTC *crtcs; MetaCRTC *crtcs;
MetaOutput *outputs; MetaOutput *outputs;
unsigned int n_crtcs, n_modes, n_outputs; unsigned int n_crtcs, n_outputs;
MetaOutputKey *output_key; MetaOutputKey *output_key;
MetaOutputConfig *output_config; MetaOutputConfig *output_config;
unsigned int i; unsigned int i;
@ -1936,7 +1919,7 @@ real_assign_crtcs (CrtcAssignment *assignment,
return real_assign_crtcs (assignment, output_num + 1); return real_assign_crtcs (assignment, output_num + 1);
meta_monitor_manager_get_resources (assignment->manager, meta_monitor_manager_get_resources (assignment->manager,
&modes, &n_modes, NULL, NULL,
&crtcs, &n_crtcs, &crtcs, &n_crtcs,
&outputs, &n_outputs); &outputs, &n_outputs);
@ -1953,9 +1936,9 @@ real_assign_crtcs (CrtcAssignment *assignment,
MetaOutput *output = find_output_by_key (outputs, n_outputs, output_key); MetaOutput *output = find_output_by_key (outputs, n_outputs, output_key);
unsigned int j; unsigned int j;
for (j = 0; j < n_modes; j++) for (j = 0; j < output->n_modes; j++)
{ {
MetaMonitorMode *mode = &modes[j]; MetaMonitorMode *mode = output->modes[j];
int width, height; int width, height;
if (meta_monitor_transform_is_rotated (output_config->transform)) if (meta_monitor_transform_is_rotated (output_config->transform))
@ -1980,7 +1963,7 @@ real_assign_crtcs (CrtcAssignment *assignment,
output_config->transform, output_config->transform,
pass); pass);
if (crtc_assignment_assign (assignment, crtc, &modes[j], if (crtc_assignment_assign (assignment, crtc, mode,
output_config->rect.x, output_config->rect.y, output_config->rect.x, output_config->rect.y,
output_config->transform, output_config->transform,
output)) output))