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

surface-actor-wayland: Clean up and optimize check for primary view

Browse Source 
Avoid some allocations, save some CPU cycles and make the code easier
to read.

Behaviourwise the only expected change is that now, if there are mapped
clones, we unconditionally choose the view with the highest refresh
rate the actor (or one of its clones) is on and don't check the
obscurred region any more.

Thus in some cases a client may receive a higher rate of frame callbacks
when obscured on a faster view while a clone is present on a slower
one. The assumption is that cases like this are relatively rare and
that the reduction of code complexity, the reduction of allocations in
`meta_surface_actor_is_obscured_on_stage_view()` whenever the actor is
not fully obscured and has clones on other views, as well as generally
fewer lookups and less code in most common cases, compensate for that.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2671>
This commit is contained in:
Robert Mader 2022-10-18 15:40:19 +02:00 committed by Marge Bot
parent cef925c37f
commit 292a8500ed
4 changed files with 54 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
src/compositor/meta-surface-actor-wayland.c
View File

@ -67,60 +67,79 @@ meta_surface_actor_wayland_is_opaque (MetaSurfaceActor *actor)
#define UNOBSCURED_TRESHOLD 0.1
ClutterStageView *
meta_surface_actor_wayland_get_current_primary_view (MetaSurfaceActor *actor,
ClutterStage *stage)
gboolean
meta_surface_actor_wayland_is_view_primary (MetaSurfaceActor *actor,
ClutterStageView *stage_view)
{
ClutterStageView *current_primary_view = NULL;
float highest_refresh_rate = 0.f;
float biggest_unobscurred_fraction = 0.f;
GList *l;
for (l = clutter_stage_peek_stage_views (stage); l; l = l->next)
{
ClutterStageView *stage_view = l->data;
float refresh_rate;
float unobscurred_fraction = 1.f;
if (!clutter_actor_is_effectively_on_stage_view (CLUTTER_ACTOR (actor),
stage_view))
return FALSE;
if (clutter_actor_has_mapped_clones (CLUTTER_ACTOR (actor)))
{
ClutterStage *stage;
stage = CLUTTER_STAGE (clutter_actor_get_stage (CLUTTER_ACTOR (actor)));
for (l = clutter_stage_peek_stage_views (stage); l; l = l->next)
{
ClutterStageView *view = l->data;
float refresh_rate;
if (!clutter_actor_is_effectively_on_stage_view (CLUTTER_ACTOR (actor),
stage_view))
view))
continue;
refresh_rate = clutter_stage_view_get_refresh_rate (view);
if (refresh_rate > highest_refresh_rate)
{
current_primary_view = view;
highest_refresh_rate = refresh_rate;
}
else
}
return current_primary_view == stage_view;
}
l = clutter_actor_peek_stage_views (CLUTTER_ACTOR (actor));
g_return_val_if_fail (l, FALSE);
if (!l->next)
{
if (l->next || biggest_unobscurred_fraction > 0.f)
g_return_val_if_fail (l->data == stage_view, FALSE);
return !meta_surface_actor_is_obscured (actor);
}
for (; l; l = l->next)
{
ClutterStageView *view = l->data;
float refresh_rate;
float unobscurred_fraction;
if (meta_surface_actor_is_obscured_on_stage_view (actor,
stage_view,
view,
&unobscurred_fraction))
continue;
}
else
{
if (meta_surface_actor_is_obscured (actor) ||
!clutter_actor_is_effectively_on_stage_view (CLUTTER_ACTOR (actor),
stage_view))
continue;
}
}
refresh_rate = clutter_stage_view_get_refresh_rate (stage_view);
refresh_rate = clutter_stage_view_get_refresh_rate (view);
if ((refresh_rate > highest_refresh_rate &&
(unobscurred_fraction > UNOBSCURED_TRESHOLD ||
biggest_unobscurred_fraction < UNOBSCURED_TRESHOLD)) ||
(biggest_unobscurred_fraction < UNOBSCURED_TRESHOLD ||
unobscurred_fraction > UNOBSCURED_TRESHOLD)) ||
(biggest_unobscurred_fraction < UNOBSCURED_TRESHOLD &&
unobscurred_fraction > UNOBSCURED_TRESHOLD))
{
current_primary_view = stage_view;
current_primary_view = view;
highest_refresh_rate = refresh_rate;
biggest_unobscurred_fraction = unobscurred_fraction;
}
}
return current_primary_view;
return current_primary_view == stage_view;
}
static void

4
src/compositor/meta-surface-actor-wayland.h
View File

@ -44,8 +44,8 @@ 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);
ClutterStageView * meta_surface_actor_wayland_get_current_primary_view (MetaSurfaceActor *actor,
ClutterStage *stage);
gboolean meta_surface_actor_wayland_is_view_primary (MetaSurfaceActor *actor,
ClutterStageView *stage_view);
G_END_DECLS

6
src/wayland/meta-wayland-presentation-time.c
View File

@ -156,7 +156,6 @@ on_after_paint (ClutterStage *stage,
GList *l_cur = l;
MetaWaylandSurface *surface = l->data;
MetaSurfaceActor *actor;
ClutterStageView *surface_primary_view;
l = l->next;
@ -164,9 +163,8 @@ on_after_paint (ClutterStage *stage,
if (!actor)
continue;
surface_primary_view =
meta_surface_actor_wayland_get_current_primary_view (actor, stage);
if (stage_view != surface_primary_view)
if (!meta_surface_actor_wayland_is_view_primary (actor,
stage_view))
continue;
if (!wl_list_empty (&surface->presentation_time.feedback_list))

6
src/wayland/meta-wayland.c
View File

@ -229,7 +229,6 @@ on_after_update (ClutterStage *stage,
MetaWaylandSurface *surface = l->data;
MetaSurfaceActor *actor;
MetaWaylandActorSurface *actor_surface;
ClutterStageView *surface_primary_view;
l = l->next;
@ -237,9 +236,8 @@ on_after_update (ClutterStage *stage,
if (!actor)
continue;
surface_primary_view =
meta_surface_actor_wayland_get_current_primary_view (actor, stage);
if (stage_view != surface_primary_view)
if (!meta_surface_actor_wayland_is_view_primary (actor,
stage_view))
continue;
actor_surface = META_WAYLAND_ACTOR_SURFACE (surface->role);