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

monitor: Never return fractional scale values when NO_FRAC is used

Browse Source 
We introduced META_MONITOR_SCALES_CONSTRAINT_NO_FRAC to get global scale
values however, this didn't work properly for some resolutions.

In fact it may happen that for some resolutions (such as 3200x1800) that
we did not compute some odd scaling levels (such as 3.0) but instead
its closest fractional value that allowed to get an integer resolution
(2.98507452 in this case).

Now this is something relevant when using fractional scaling because we
want to ensure that the returned value, when multiplied to the scaled
sizes, will produce an integer resolution, but it's not in global scale
mode where we don't use a scaled framebuffer.

So, take a short path when using no fractional mode and just return all
the applicable values without waste iterations on fractional values.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1878>
This commit is contained in:
Marco Trevisan (Treviño) 2021-05-28 19:19:36 +02:00
parent f6e2059a65
commit 98f3f96978
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1840,31 +1840,30 @@ meta_monitor_calculate_supported_scales (MetaMonitor *monitor,
for (i = floorf (MINIMUM_SCALE_FACTOR); for (i = floorf (MINIMUM_SCALE_FACTOR);
i <= ceilf (MAXIMUM_SCALE_FACTOR); i <= ceilf (MAXIMUM_SCALE_FACTOR);
i++) i++)
{
if (constraints & META_MONITOR_SCALES_CONSTRAINT_NO_FRAC)
{
if (is_scale_valid_for_size (width, height, i))
{
float scale = i;
g_array_append_val (supported_scales, scale);
}
}
else
{ {
for (j = 0; j < SCALE_FACTORS_PER_INTEGER; j++) for (j = 0; j < SCALE_FACTORS_PER_INTEGER; j++)
{ {
float scale; float scale;
float scale_value = i + j * SCALE_FACTORS_STEPS; float scale_value = i + j * SCALE_FACTORS_STEPS;
if (constraints & META_MONITOR_SCALES_CONSTRAINT_NO_FRAC) scale = get_closest_scale_factor_for_resolution (width, height,
{
if (fmodf (scale_value, 1.0) != 0.0 ||
!is_scale_valid_for_size (width, height, scale_value))
continue;
scale = scale_value;
}
else
{
scale = get_closest_scale_factor_for_resolution (width,
height,
scale_value); scale_value);
}
if (scale > 0.0f) if (scale > 0.0)
g_array_append_val (supported_scales, scale); g_array_append_val (supported_scales, scale);
} }
} }
}
if (supported_scales->len == 0) if (supported_scales->len == 0)
{ {