diff --git a/src/compositor/meta-compositor-native.c b/src/compositor/meta-compositor-native.c index e2614f6f7..cc635d48c 100644 --- a/src/compositor/meta-compositor-native.c +++ b/src/compositor/meta-compositor-native.c @@ -135,8 +135,8 @@ maybe_assign_primary_plane (MetaCompositor *compositor) new_candidate = surface; onscreen = COGL_ONSCREEN (framebuffer); - scanout = meta_surface_actor_wayland_try_acquire_scanout (surface_actor_wayland, - onscreen); + scanout = meta_wayland_surface_try_acquire_scanout (surface, + onscreen); if (!scanout) goto done; diff --git a/src/compositor/meta-surface-actor-wayland.c b/src/compositor/meta-surface-actor-wayland.c index f6e8f8432..329b88e4e 100644 --- a/src/compositor/meta-surface-actor-wayland.c +++ b/src/compositor/meta-surface-actor-wayland.c @@ -65,23 +65,6 @@ meta_surface_actor_wayland_is_opaque (MetaSurfaceActor *actor) return meta_shaped_texture_is_opaque (stex); } -CoglScanout * -meta_surface_actor_wayland_try_acquire_scanout (MetaSurfaceActorWayland *self, - CoglOnscreen *onscreen) -{ - MetaWaylandSurface *surface; - CoglScanout *scanout; - - surface = meta_surface_actor_wayland_get_surface (self); - g_return_val_if_fail (surface, NULL); - - scanout = meta_wayland_surface_try_acquire_scanout (surface, onscreen); - if (!scanout) - return NULL; - - return scanout; -} - #define UNOBSCURED_TRESHOLD 0.1 ClutterStageView * diff --git a/src/compositor/meta-surface-actor-wayland.h b/src/compositor/meta-surface-actor-wayland.h index adb01a297..1a349af91 100644 --- a/src/compositor/meta-surface-actor-wayland.h +++ b/src/compositor/meta-surface-actor-wayland.h @@ -44,9 +44,6 @@ MetaSurfaceActor * meta_surface_actor_wayland_new (MetaWaylandSurface *surface); MetaWaylandSurface * meta_surface_actor_wayland_get_surface (MetaSurfaceActorWayland *self); void meta_surface_actor_wayland_surface_destroyed (MetaSurfaceActorWayland *self); -CoglScanout * meta_surface_actor_wayland_try_acquire_scanout (MetaSurfaceActorWayland *self, - CoglOnscreen *onscreen); - ClutterStageView * meta_surface_actor_wayland_get_current_primary_view (MetaSurfaceActor *actor, ClutterStage *stage);