diff options
author | Georges Basile Stavracas Neto <georges.stavracas@gmail.com> | 2020-09-11 15:49:29 -0300 |
---|---|---|
committer | Georges Basile Stavracas Neto <georges.stavracas@gmail.com> | 2020-09-19 20:57:21 -0300 |
commit | d855751b81141493429a3c62d6806c11b0fb7522 (patch) | |
tree | 4911aea61713b5af6adf04fdf413cf87d65679f4 | |
parent | 69901a783e7ed6ac72c181e1af97760cb292d90d (diff) | |
download | gnome-shell-gbsneto/graphene-matrix.tar.gz |
Replace CoglMatrix by graphene_matrix_tgbsneto/graphene-matrix
Replace both the types, and the cogl_matrix_* API calls
with the corresponding graphene_matrix_* ones.
https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1436
-rw-r--r-- | src/shell-blur-effect.c | 18 | ||||
-rw-r--r-- | src/st/st-viewport.c | 20 |
2 files changed, 15 insertions, 23 deletions
diff --git a/src/shell-blur-effect.c b/src/shell-blur-effect.c index 1bdb4caa1..7647e1530 100644 --- a/src/shell-blur-effect.c +++ b/src/shell-blur-effect.c @@ -330,17 +330,13 @@ setup_projection_matrix (CoglFramebuffer *framebuffer, float width, float height) { - CoglMatrix projection; - - cogl_matrix_init_identity (&projection); - cogl_matrix_scale (&projection, - 2.0 / width, - -2.0 / height, - 1.f); - cogl_matrix_translate (&projection, - -width / 2.0, - -height / 2.0, - 0); + graphene_matrix_t projection; + + graphene_matrix_init_translate (&projection, + &GRAPHENE_POINT3D_INIT (-width / 2.0, + -height / 2.0, + 0.f)); + graphene_matrix_scale (&projection, 2.0 / width, -2.0 / height, 1.f); cogl_framebuffer_set_projection_matrix (framebuffer, &projection); } diff --git a/src/st/st-viewport.c b/src/st/st-viewport.c index 0eb1868ab..864b04404 100644 --- a/src/st/st-viewport.c +++ b/src/st/st-viewport.c @@ -325,28 +325,24 @@ get_hadjustment_value (StViewport *viewport) } static void -st_viewport_apply_transform (ClutterActor *actor, - CoglMatrix *matrix) +st_viewport_apply_transform (ClutterActor *actor, + graphene_matrix_t *matrix) { StViewport *viewport = ST_VIEWPORT (actor); StViewportPrivate *priv = st_viewport_get_instance_private (viewport); ClutterActorClass *parent_class = CLUTTER_ACTOR_CLASS (st_viewport_parent_class); - double x, y; - - parent_class->apply_transform (actor, matrix); + graphene_point3d_t p = GRAPHENE_POINT3D_INIT_ZERO; if (priv->hadjustment) - x = get_hadjustment_value (viewport); - else - x = 0; + p.x = -get_hadjustment_value (viewport); if (priv->vadjustment) - y = st_adjustment_get_value (priv->vadjustment); - else - y = 0; + p.y = -st_adjustment_get_value (priv->vadjustment); + + graphene_matrix_translate (matrix, &p); - cogl_matrix_translate (matrix, (int) -x, (int) -y, 0); + parent_class->apply_transform (actor, matrix); } /* If we are translated, then we need to translate back before chaining |