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

renderer/native: Use helper to iterate over logical monitor CRTCs

Browse Source 
Don't iterate over all the CRTCs and check the CRTC logical monitor
state, but use the new MetaLogicalMonitor helper instead.

https://bugzilla.gnome.org/show_bug.cgi?id=785381
This commit is contained in:
Jonas Ådahl 2017-03-28 12:17:38 +08:00
parent 903537a2a0
commit 5bb6f0ad8b
1 changed files with 66 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -615,6 +615,32 @@ meta_onscreen_native_flip_crtc (MetaOnscreenNative *onscreen_native,
} }
} }
typedef struct _SetCrtcFbData
{
MetaMonitorManager *monitor_manager;
MetaLogicalMonitor *logical_monitor;
uint32_t fb_id;
} SetCrtcFbData;
static void
set_crtc_fb (MetaLogicalMonitor *logical_monitor,
MetaCrtc *crtc,
gpointer user_data)
{
SetCrtcFbData *data = user_data;
MetaMonitorManagerKms *monitor_manager_kms =
META_MONITOR_MANAGER_KMS (data->monitor_manager);
int x, y;
x = crtc->rect.x - logical_monitor->rect.x;
y = crtc->rect.y - logical_monitor->rect.y;
meta_monitor_manager_kms_apply_crtc_mode (monitor_manager_kms,
crtc,
x, y,
data->fb_id);
}
static void static void
meta_onscreen_native_set_crtc_modes (MetaOnscreenNative *onscreen_native) meta_onscreen_native_set_crtc_modes (MetaOnscreenNative *onscreen_native)
{ {
@ -646,22 +672,14 @@ meta_onscreen_native_set_crtc_modes (MetaOnscreenNative *onscreen_native)
logical_monitor = meta_renderer_view_get_logical_monitor (view); logical_monitor = meta_renderer_view_get_logical_monitor (view);
if (logical_monitor) if (logical_monitor)
{ {
unsigned int i; SetCrtcFbData data = {
.monitor_manager = monitor_manager,
.fb_id = fb_id
};
for (i = 0; i < monitor_manager->n_crtcs; i++) meta_logical_monitor_foreach_crtc (logical_monitor,
{ set_crtc_fb,
MetaCrtc *crtc = &monitor_manager->crtcs[i]; &data);
int x = crtc->rect.x - logical_monitor->rect.x;
int y = crtc->rect.y - logical_monitor->rect.y;
if (crtc->logical_monitor != logical_monitor)
continue;
meta_monitor_manager_kms_apply_crtc_mode (monitor_manager_kms,
crtc,
x, y,
fb_id);
}
} }
else else
{ {
@ -679,6 +697,31 @@ meta_onscreen_native_set_crtc_modes (MetaOnscreenNative *onscreen_native)
} }
} }
typedef struct _FlipCrtcData
{
MetaOnscreenNative *onscreen_native;
GClosure *flip_closure;
gboolean out_fb_in_use;
} FlipCrtcData;
static void
flip_crtc (MetaLogicalMonitor *logical_monitor,
MetaCrtc *crtc,
gpointer user_data)
{
FlipCrtcData *data = user_data;
int x, y;
x = crtc->rect.x - logical_monitor->rect.x;
y = crtc->rect.y - logical_monitor->rect.y;
meta_onscreen_native_flip_crtc (data->onscreen_native,
data->flip_closure,
crtc, x, y,
&data->out_fb_in_use);
}
static void static void
meta_onscreen_native_flip_crtcs (CoglOnscreen *onscreen) meta_onscreen_native_flip_crtcs (CoglOnscreen *onscreen)
{ {
@ -713,21 +756,15 @@ meta_onscreen_native_flip_crtcs (CoglOnscreen *onscreen)
logical_monitor = meta_renderer_view_get_logical_monitor (view); logical_monitor = meta_renderer_view_get_logical_monitor (view);
if (logical_monitor) if (logical_monitor)
{ {
unsigned int i; FlipCrtcData data = {
.onscreen_native = onscreen_native,
.flip_closure = flip_closure,
};
for (i = 0; i < monitor_manager->n_crtcs; i++) meta_logical_monitor_foreach_crtc (logical_monitor,
{ flip_crtc,
MetaCrtc *crtc = &monitor_manager->crtcs[i]; &data);
int x = crtc->rect.x - logical_monitor->rect.x; fb_in_use = data.out_fb_in_use;
int y = crtc->rect.y - logical_monitor->rect.y;
if (crtc->logical_monitor != logical_monitor)
continue;
meta_onscreen_native_flip_crtc (onscreen_native, flip_closure,
crtc, x, y,
&fb_in_use);
}
} }
else else
{ {