diff options
| author | Ray Strode <rstrode@redhat.com> | 2017-11-08 10:08:22 -0500 |
|---|---|---|
| committer | Jonas Ådahl <jadahl@gmail.com> | 2018-01-25 11:41:54 +0800 |
| commit | 58bb61e16179864690f71bee3d8ea34dc05f6ba6 (patch) | |
| tree | 6e9301ec946b4bc897419bc3358b75db2326b9d7 /clutter | |
| parent | dbd053020a1f0a7982abeb7eedcf493d154f9421 (diff) | |
| download | mutter-58bb61e16179864690f71bee3d8ea34dc05f6ba6.tar.gz | |
clutter/stage: Set framebuffer state directly
clutter_set_viewport always operates on the draw fb, but
mutter sometimes has an offscreen fb it uses instead.
This commit uses the non-deprecated, clutter_framebuffer_set_viewport
function, which takes an explicit fb argument.
Closes: https://gitlab.gnome.org/GNOME/mutter/merge_requests/2
Diffstat (limited to 'clutter')
| -rw-r--r-- | clutter/clutter/clutter-stage.c | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/clutter/clutter/clutter-stage.c b/clutter/clutter/clutter-stage.c index 0a800f426..9352f49e8 100644 --- a/clutter/clutter/clutter-stage.c +++ b/clutter/clutter/clutter-stage.c @@ -1486,10 +1486,11 @@ _clutter_stage_do_pick_on_view (ClutterStage *stage, priv->viewport[1] * fb_scale - viewport_offset_y, priv->viewport[2] * fb_scale, priv->viewport[3] * fb_scale); - cogl_set_viewport (priv->viewport[0] * fb_scale - viewport_offset_x, - priv->viewport[1] * fb_scale - viewport_offset_y, - priv->viewport[2] * fb_scale, - priv->viewport[3] * fb_scale); + cogl_framebuffer_set_viewport (fb, + priv->viewport[0] * fb_scale - viewport_offset_x, + priv->viewport[1] * fb_scale - viewport_offset_y, + priv->viewport[2] * fb_scale, + priv->viewport[3] * fb_scale); read_x = dirty_x * fb_scale; read_y = dirty_y * fb_scale; @@ -3617,6 +3618,7 @@ _clutter_stage_maybe_setup_viewport (ClutterStage *stage, ClutterStageView *view) { ClutterStagePrivate *priv = stage->priv; + CoglFramebuffer *fb = clutter_stage_view_get_framebuffer (view); if (clutter_stage_view_is_dirty_viewport (view)) { @@ -3637,10 +3639,11 @@ _clutter_stage_maybe_setup_viewport (ClutterStage *stage, viewport_offset_x = view_layout.x * fb_scale; viewport_offset_y = view_layout.y * fb_scale; - cogl_set_viewport (priv->viewport[0] * fb_scale - viewport_offset_x, - priv->viewport[1] * fb_scale - viewport_offset_y, - priv->viewport[2] * fb_scale, - priv->viewport[3] * fb_scale); + cogl_framebuffer_set_viewport (fb, + priv->viewport[0] * fb_scale - viewport_offset_x, + priv->viewport[1] * fb_scale - viewport_offset_y, + priv->viewport[2] * fb_scale, + priv->viewport[3] * fb_scale); perspective = priv->perspective; @@ -3679,7 +3682,7 @@ _clutter_stage_maybe_setup_viewport (ClutterStage *stage, if (clutter_stage_view_is_dirty_projection (view)) { - cogl_set_projection_matrix (&priv->projection); + cogl_framebuffer_set_projection_matrix (fb, &priv->projection); clutter_stage_view_set_dirty_projection (view, FALSE); } |