renderer/native: Remove legacy non-stage-view code

A renderer view will, under the native backend, since long ago always
have a logical monitor associated with it, so remove the code handling
the legacy non-stage view case.

https://gitlab.gnome.org/GNOME/mutter/issues/460
This commit is contained in:
Jonas Ådahl 2019-02-12 11:25:45 +01:00
parent 252e64a0ea
commit 2c1ab8b3cc

View File

@ -1704,7 +1704,6 @@ meta_onscreen_native_flip_crtcs (CoglOnscreen *onscreen)
{ {
CoglOnscreenEGL *onscreen_egl = onscreen->winsys; CoglOnscreenEGL *onscreen_egl = onscreen->winsys;
MetaOnscreenNative *onscreen_native = onscreen_egl->platform; MetaOnscreenNative *onscreen_native = onscreen_egl->platform;
MetaGpuKms *render_gpu = onscreen_native->render_gpu;
MetaRendererView *view = onscreen_native->view; MetaRendererView *view = onscreen_native->view;
GClosure *flip_closure; GClosure *flip_closure;
MetaLogicalMonitor *logical_monitor; MetaLogicalMonitor *logical_monitor;
@ -1728,32 +1727,12 @@ meta_onscreen_native_flip_crtcs (CoglOnscreen *onscreen)
/* Either flip the CRTC's of the monitor info, if we are drawing just part /* Either flip the CRTC's of the monitor info, if we are drawing just part
* of the stage, or all of the CRTC's if we are drawing the whole stage. * of the stage, or all of the CRTC's if we are drawing the whole stage.
*/ */
logical_monitor = meta_renderer_view_get_logical_monitor (view);
if (logical_monitor)
{
FlipCrtcData data = { FlipCrtcData data = {
.onscreen = onscreen, .onscreen = onscreen,
.flip_closure = flip_closure, .flip_closure = flip_closure,
}; };
logical_monitor = meta_renderer_view_get_logical_monitor (view);
meta_logical_monitor_foreach_crtc (logical_monitor, meta_logical_monitor_foreach_crtc (logical_monitor, flip_crtc, &data);
flip_crtc,
&data);
fb_in_use = data.out_fb_in_use;
}
else
{
GList *l;
for (l = meta_gpu_get_crtcs (META_GPU (render_gpu)); l; l = l->next)
{
MetaCrtc *crtc = l->data;
meta_onscreen_native_flip_crtc (onscreen, flip_closure,
crtc, crtc->rect.x, crtc->rect.y,
&fb_in_use);
}
}
/* /*
* If the framebuffer is in use, but we don't have any pending flips it means * If the framebuffer is in use, but we don't have any pending flips it means