Commit 92287e49 authored by Alberts Muktupāvels's avatar Alberts Muktupāvels
Browse files

monitor-config-manager: only use crtc transform for assignment

Based on mutter commit:
mutter@43baf643
parent 71f9e4ac
...@@ -665,6 +665,7 @@ assign_monitor_crtc (GfMonitor *monitor, ...@@ -665,6 +665,7 @@ assign_monitor_crtc (GfMonitor *monitor,
GfCrtc *crtc; GfCrtc *crtc;
GfMonitorTransform transform; GfMonitorTransform transform;
GfMonitorTransform crtc_transform; GfMonitorTransform crtc_transform;
GfMonitorTransform crtc_hw_transform;
int crtc_x, crtc_y; int crtc_x, crtc_y;
float x_offset, y_offset; float x_offset, y_offset;
float scale; float scale;
...@@ -693,9 +694,12 @@ assign_monitor_crtc (GfMonitor *monitor, ...@@ -693,9 +694,12 @@ assign_monitor_crtc (GfMonitor *monitor,
transform = data->logical_monitor_config->transform; transform = data->logical_monitor_config->transform;
crtc_transform = gf_monitor_logical_to_crtc_transform (monitor, transform); crtc_transform = gf_monitor_logical_to_crtc_transform (monitor, transform);
if (!gf_monitor_manager_is_transform_handled (data->monitor_manager, if (gf_monitor_manager_is_transform_handled (data->monitor_manager,
crtc, crtc_transform)) crtc,
crtc_transform = GF_MONITOR_TRANSFORM_NORMAL; crtc_transform))
crtc_hw_transform = crtc_transform;
else
crtc_hw_transform = GF_MONITOR_TRANSFORM_NORMAL;
gf_monitor_calculate_crtc_pos (monitor, mode, output, crtc_transform, gf_monitor_calculate_crtc_pos (monitor, mode, output, crtc_transform,
&crtc_x, &crtc_y); &crtc_x, &crtc_y);
...@@ -738,7 +742,7 @@ assign_monitor_crtc (GfMonitor *monitor, ...@@ -738,7 +742,7 @@ assign_monitor_crtc (GfMonitor *monitor,
.crtc = crtc, .crtc = crtc,
.mode = crtc_mode, .mode = crtc_mode,
.layout = crtc_layout, .layout = crtc_layout,
.transform = crtc_transform, .transform = crtc_hw_transform,
.outputs = g_ptr_array_new () .outputs = g_ptr_array_new ()
}; };
g_ptr_array_add (crtc_info->outputs, output); g_ptr_array_add (crtc_info->outputs, output);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment