isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-26 21:02:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

clutter/actor: Cache absolute modelview matrices

Browse Source 
While we're now doing a fairly good job at not needing those matrices
all the time anymore, we still need it multiple times during every paint
cycle, so it definitely makes sense to introduce some caching here.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2679>
This commit is contained in:
Jonas Dreßler 2022-06-05 16:59:15 +02:00 committed by Marge Bot
parent 4579e86330
commit 2ef4960b4f
1 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
clutter/clutter/clutter-actor.c
View File

@ -689,6 +689,8 @@ struct _ClutterActorPrivate
/* the cached transformation matrix; see apply_transform() */ /* the cached transformation matrix; see apply_transform() */
graphene_matrix_t transform; graphene_matrix_t transform;
graphene_matrix_t absolute_modelview;
float resource_scale; float resource_scale;
guint8 opacity; guint8 opacity;
@ -851,6 +853,7 @@ struct _ClutterActorPrivate
guint clear_stage_views_needs_stage_views_changed : 1; guint clear_stage_views_needs_stage_views_changed : 1;
guint needs_redraw : 1; guint needs_redraw : 1;
guint needs_finish_layout : 1; guint needs_finish_layout : 1;
guint absolute_modelview_valid : 1;
}; };
enum enum
@ -2494,6 +2497,7 @@ absolute_geometry_changed (ClutterActor *actor)
{ {
actor->priv->needs_update_stage_views = TRUE; actor->priv->needs_update_stage_views = TRUE;
actor->priv->needs_visible_paint_volume_update = TRUE; actor->priv->needs_visible_paint_volume_update = TRUE;
actor->priv->absolute_modelview_valid = FALSE;
actor->priv->needs_finish_layout = TRUE; actor->priv->needs_finish_layout = TRUE;
/* needs_finish_layout is already TRUE on the whole parent tree thanks /* needs_finish_layout is already TRUE on the whole parent tree thanks
@ -2878,8 +2882,6 @@ clutter_actor_apply_transform_to_point (ClutterActor *self,
* instead. * instead.
* *
*/ */
/* XXX: We should consider caching the stage relative modelview along with
* the actor itself */
void void
clutter_actor_get_relative_transformation_matrix (ClutterActor *self, clutter_actor_get_relative_transformation_matrix (ClutterActor *self,
ClutterActor *ancestor, ClutterActor *ancestor,
@ -3119,6 +3121,30 @@ _clutter_actor_apply_relative_transformation_matrix (ClutterActor *self,
if (self == ancestor) if (self == ancestor)
return; return;
if (ancestor == NULL)
{
ClutterActorPrivate *priv = self->priv;
if (!priv->absolute_modelview_valid)
{
graphene_matrix_init_identity (&priv->absolute_modelview);
if (priv->parent != NULL)
{
_clutter_actor_apply_relative_transformation_matrix (priv->parent,
NULL,
&priv->absolute_modelview);
}
_clutter_actor_apply_modelview_transform (self, &priv->absolute_modelview);
priv->absolute_modelview_valid = TRUE;
}
graphene_matrix_multiply (&priv->absolute_modelview, matrix, matrix);
return;
}
if (self->priv->parent != NULL) if (self->priv->parent != NULL)
_clutter_actor_apply_relative_transformation_matrix (self->priv->parent, _clutter_actor_apply_relative_transformation_matrix (self->priv->parent,
ancestor, ancestor,
@ -7595,6 +7621,7 @@ clutter_actor_init (ClutterActor *self)
priv->enable_model_view_transform = TRUE; priv->enable_model_view_transform = TRUE;
priv->transform_valid = FALSE; priv->transform_valid = FALSE;
priv->absolute_modelview_valid = FALSE;
/* the default is to stretch the content, to match the /* the default is to stretch the content, to match the
* current behaviour of basically all actors. also, it's * current behaviour of basically all actors. also, it's