From f6998f87c24ae435a12e416b70af5e734b8df8c6 Mon Sep 17 00:00:00 2001 From: Georges Basile Stavracas Neto Date: Fri, 11 Sep 2020 19:12:54 -0300 Subject: [PATCH] src: Use graphene APIs This commit encompasses the trivial ones. https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1439 --- src/backends/x11/nested/meta-stage-x11-nested.c | 9 ++++----- src/compositor/clutter-utils.c | 6 +++--- src/compositor/meta-window-actor.c | 6 ++++-- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/backends/x11/nested/meta-stage-x11-nested.c b/src/backends/x11/nested/meta-stage-x11-nested.c index e2c8de2b3..165d40c94 100644 --- a/src/backends/x11/nested/meta-stage-x11-nested.c +++ b/src/backends/x11/nested/meta-stage-x11-nested.c @@ -131,11 +131,10 @@ draw_view (MetaStageX11Nested *stage_nested, &transform); cogl_framebuffer_push_matrix (onscreen); - cogl_matrix_init_identity (&projection_matrix); - cogl_matrix_translate (&projection_matrix, -1, 1, 0); - cogl_matrix_scale (&projection_matrix, 2, -2, 0); - - cogl_matrix_multiply (&projection_matrix, &projection_matrix, &transform); + graphene_matrix_init_scale (&projection_matrix, 2, -2, 0); + graphene_matrix_translate (&projection_matrix, + &GRAPHENE_POINT3D_INIT (-1, 1, 0)); + graphene_matrix_multiply (&transform, &projection_matrix, &projection_matrix); cogl_framebuffer_set_projection_matrix (onscreen, &projection_matrix); s_1 = sample_x / texture_width; diff --git a/src/compositor/clutter-utils.c b/src/compositor/clutter-utils.c index 2be2da775..86d788562 100644 --- a/src/compositor/clutter-utils.c +++ b/src/compositor/clutter-utils.c @@ -148,9 +148,9 @@ meta_actor_painting_untransformed (CoglFramebuffer *fb, cogl_framebuffer_get_modelview_matrix (fb, &modelview); cogl_framebuffer_get_projection_matrix (fb, &projection); - cogl_matrix_multiply (&modelview_projection, - &projection, - &modelview); + graphene_matrix_multiply (&modelview, + &projection, + &modelview_projection); vertices[0].x = 0; vertices[0].y = 0; diff --git a/src/compositor/meta-window-actor.c b/src/compositor/meta-window-actor.c index a2086ca90..3b39ce9dd 100644 --- a/src/compositor/meta-window-actor.c +++ b/src/compositor/meta-window-actor.c @@ -1118,8 +1118,10 @@ meta_window_actor_set_geometry_scale (MetaWindowActor *window_actor, priv->geometry_scale = geometry_scale; - cogl_matrix_init_identity (&child_transform); - cogl_matrix_scale (&child_transform, geometry_scale, geometry_scale, 1); + graphene_matrix_init_scale (&child_transform, + geometry_scale, + geometry_scale, + 1); clutter_actor_set_child_transform (CLUTTER_ACTOR (window_actor), &child_transform); }