brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clutter/paint-nodes: Stop using implicit framebuffer stack Cogl API

Browse Source 
Stop using API that uses the implicit Cogl framebuffer stack, (e.g.
cogl_push_matrix()) and replace usage by the corresponding API taking an
explicit framebuffer (e.g. cogl_framebuffer_push_matrix()).

For offscreens etc, the offscreen framebuffer is still pushed to and
popped from the Cogl framebuffer stack, so that paint nodes still draw
to the right framebuffer.

https://gitlab.gnome.org/GNOME/mutter/merge_requests/935
This commit is contained in:
Jonas Ådahl 2019-11-22 11:30:11 +01:00 committed by Georges Basile Stavracas Neto
parent c621d4d571
commit fd0ce66ac1
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
clutter/clutter/clutter-paint-nodes.c
View File

@ -1256,6 +1256,7 @@ clutter_layer_node_pre_draw (ClutterPaintNode *node,
ClutterPaintContext *paint_context) ClutterPaintContext *paint_context)
{ {
ClutterLayerNode *lnode = (ClutterLayerNode *) node; ClutterLayerNode *lnode = (ClutterLayerNode *) node;
CoglFramebuffer *framebuffer;
CoglMatrix matrix; CoglMatrix matrix;
/* if we were unable to create an offscreen buffer for this node, then /* if we were unable to create an offscreen buffer for this node, then
@ -1271,7 +1272,8 @@ clutter_layer_node_pre_draw (ClutterPaintNode *node,
/* copy the same modelview from the current framebuffer to the one we /* copy the same modelview from the current framebuffer to the one we
* are going to use * are going to use
*/ */
cogl_get_modelview_matrix (&matrix); framebuffer = cogl_get_draw_framebuffer ();
cogl_framebuffer_get_modelview_matrix (framebuffer, &matrix);
cogl_push_framebuffer (lnode->offscreen); cogl_push_framebuffer (lnode->offscreen);
@ -1291,7 +1293,7 @@ clutter_layer_node_pre_draw (ClutterPaintNode *node,
COGL_BUFFER_BIT_COLOR | COGL_BUFFER_BIT_DEPTH, COGL_BUFFER_BIT_COLOR | COGL_BUFFER_BIT_DEPTH,
0.f, 0.f, 0.f, 0.f); 0.f, 0.f, 0.f, 0.f);
cogl_push_matrix (); cogl_framebuffer_push_matrix (lnode->offscreen);
/* every draw operation after this point will happen an offscreen /* every draw operation after this point will happen an offscreen
* framebuffer * framebuffer
@ -1309,7 +1311,7 @@ clutter_layer_node_post_draw (ClutterPaintNode *node,
guint i; guint i;
/* switch to the previous framebuffer */ /* switch to the previous framebuffer */
cogl_pop_matrix (); cogl_framebuffer_pop_matrix (lnode->offscreen);
cogl_pop_framebuffer (); cogl_pop_framebuffer ();
fb = cogl_get_draw_framebuffer (); fb = cogl_get_draw_framebuffer ();