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

monitor-manager: Remove is_transform_handled()

Browse Source 
There was one user, but it got changed to bypass the monitor manager and
talk directly to MetaCrtcNative.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3428>
This commit is contained in:
Jonas Ådahl 2023-11-28 22:14:07 +01:00 committed by Marge Bot
parent cc7bca073b
commit 48c7caadd2
4 changed files with 2 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/backends/meta-monitor-manager.c
View File

@ -3632,17 +3632,6 @@ meta_monitor_manager_tiled_monitor_removed (MetaMonitorManager *manager,
manager_class->tiled_monitor_removed (manager, monitor); manager_class->tiled_monitor_removed (manager, monitor);
} }
gboolean
meta_monitor_manager_is_transform_handled (MetaMonitorManager *manager,
MetaCrtc *crtc,
MetaMonitorTransform transform)
{
MetaMonitorManagerClass *manager_class =
META_MONITOR_MANAGER_GET_CLASS (manager);
return manager_class->is_transform_handled (manager, crtc, transform);
}
static void static void
meta_monitor_manager_real_read_current_state (MetaMonitorManager *manager) meta_monitor_manager_real_read_current_state (MetaMonitorManager *manager)
{ {

11
src/backends/native/meta-monitor-manager-native.c
View File

@ -437,15 +437,6 @@ meta_monitor_manager_native_resume (MetaMonitorManagerNative *manager_native)
meta_monitor_manager_native_connect_hotplug_handler (manager_native); meta_monitor_manager_native_connect_hotplug_handler (manager_native);
} }
static gboolean
meta_monitor_manager_native_is_transform_handled (MetaMonitorManager *manager,
MetaCrtc *crtc,
MetaMonitorTransform transform)
{
return meta_crtc_native_is_transform_handled (META_CRTC_NATIVE (crtc),
transform);
}
static MetaMonitorScalesConstraint static MetaMonitorScalesConstraint
get_monitor_scale_constraints_from_layout_mode (MetaLogicalMonitorLayoutMode layout_mode) get_monitor_scale_constraints_from_layout_mode (MetaLogicalMonitorLayoutMode layout_mode)
{ {
@ -717,8 +708,6 @@ meta_monitor_manager_native_class_init (MetaMonitorManagerNativeClass *klass)
meta_monitor_manager_native_apply_monitors_config; meta_monitor_manager_native_apply_monitors_config;
manager_class->set_power_save_mode = manager_class->set_power_save_mode =
meta_monitor_manager_native_set_power_save_mode; meta_monitor_manager_native_set_power_save_mode;
manager_class->is_transform_handled =
meta_monitor_manager_native_is_transform_handled;
manager_class->calculate_monitor_mode_scale = manager_class->calculate_monitor_mode_scale =
meta_monitor_manager_native_calculate_monitor_mode_scale; meta_monitor_manager_native_calculate_monitor_mode_scale;
manager_class->calculate_supported_scales = manager_class->calculate_supported_scales =

5
src/backends/native/meta-renderer-native.c
View File

@ -1279,9 +1279,8 @@ calculate_view_transform (MetaMonitorManager *monitor_manager,
crtc_transform = crtc_transform =
meta_output_logical_to_crtc_transform (output, logical_monitor->transform); meta_output_logical_to_crtc_transform (output, logical_monitor->transform);
if (meta_monitor_manager_is_transform_handled (monitor_manager, if (meta_crtc_native_is_transform_handled (META_CRTC_NATIVE (crtc),
crtc, crtc_transform))
crtc_transform))
return META_MONITOR_TRANSFORM_NORMAL; return META_MONITOR_TRANSFORM_NORMAL;
else else
return crtc_transform; return crtc_transform;

12
src/backends/x11/meta-monitor-manager-xrandr.c
View File

@ -832,17 +832,6 @@ meta_monitor_manager_xrandr_init_monitors (MetaMonitorManagerXrandr *manager_xra
XRRFreeMonitors (m); XRRFreeMonitors (m);
} }
static gboolean
meta_monitor_manager_xrandr_is_transform_handled (MetaMonitorManager *manager,
MetaCrtc *crtc,
MetaMonitorTransform transform)
{
g_warn_if_fail ((meta_crtc_get_all_transforms (crtc) & transform) ==
transform);
return TRUE;
}
static float static float
meta_monitor_manager_xrandr_calculate_monitor_mode_scale (MetaMonitorManager *manager, meta_monitor_manager_xrandr_calculate_monitor_mode_scale (MetaMonitorManager *manager,
MetaLogicalMonitorLayoutMode layout_mode, MetaLogicalMonitorLayoutMode layout_mode,
@ -980,7 +969,6 @@ meta_monitor_manager_xrandr_class_init (MetaMonitorManagerXrandrClass *klass)
manager_class->change_backlight = meta_monitor_manager_xrandr_change_backlight; manager_class->change_backlight = meta_monitor_manager_xrandr_change_backlight;
manager_class->tiled_monitor_added = meta_monitor_manager_xrandr_tiled_monitor_added; manager_class->tiled_monitor_added = meta_monitor_manager_xrandr_tiled_monitor_added;
manager_class->tiled_monitor_removed = meta_monitor_manager_xrandr_tiled_monitor_removed; manager_class->tiled_monitor_removed = meta_monitor_manager_xrandr_tiled_monitor_removed;
manager_class->is_transform_handled = meta_monitor_manager_xrandr_is_transform_handled;
manager_class->calculate_monitor_mode_scale = meta_monitor_manager_xrandr_calculate_monitor_mode_scale; manager_class->calculate_monitor_mode_scale = meta_monitor_manager_xrandr_calculate_monitor_mode_scale;
manager_class->calculate_supported_scales = meta_monitor_manager_xrandr_calculate_supported_scales; manager_class->calculate_supported_scales = meta_monitor_manager_xrandr_calculate_supported_scales;
manager_class->get_capabilities = meta_monitor_manager_xrandr_get_capabilities; manager_class->get_capabilities = meta_monitor_manager_xrandr_get_capabilities;