summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarco Trevisan (Treviño) <mail@3v1n0.net>2017-12-20 01:50:09 +0100
committerMarco Trevisan (Treviño) <mail@3v1n0.net>2017-12-20 05:56:51 -0500
commit2b60fb01445133e11214d3e66984708387128fd1 (patch)
tree60c4baf9486ba363141f829b086119a544657dd4
parent7f5f5eb8473649f19357b45baa925a1de8b8a683 (diff)
downloadmutter-2b60fb01445133e11214d3e66984708387128fd1.tar.gz
stage: Push framebuffer before setting up viewport
When capture_view* functions are called with the paint flag set to TRUE, we need to setup the framebuffer, however this was happening after setting up the viewport, while the viewport needs the framebuffer to be valid when calling cogl_set_viewport. https://bugzilla.gnome.org/show_bug.cgi?id=791809
-rw-r--r--clutter/clutter/clutter-stage.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/clutter/clutter/clutter-stage.c b/clutter/clutter/clutter-stage.c
index 02ab07b86..0a800f426 100644
--- a/clutter/clutter/clutter-stage.c
+++ b/clutter/clutter/clutter-stage.c
@@ -4726,8 +4726,8 @@ capture_view (ClutterStage *stage,
if (paint)
{
- _clutter_stage_maybe_setup_viewport (stage, view);
cogl_push_framebuffer (framebuffer);
+ _clutter_stage_maybe_setup_viewport (stage, view);
clutter_stage_do_paint_view (stage, view, rect);
}
@@ -4829,8 +4829,8 @@ capture_view_into (ClutterStage *stage,
if (paint)
{
- _clutter_stage_maybe_setup_viewport (stage, view);
cogl_push_framebuffer (framebuffer);
+ _clutter_stage_maybe_setup_viewport (stage, view);
clutter_stage_do_paint_view (stage, view, rect);
}