[mutter/gbsneto/effects-paint-nodes: 86/88] clutter/paint-nodes: Push and pop framebuffer even without ops
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/gbsneto/effects-paint-nodes: 86/88] clutter/paint-nodes: Push and pop framebuffer even without ops
- Date: Sat, 4 Jul 2020 00:55:10 +0000 (UTC)
commit b5ae10d913b3808678fe65367383d3fcc80ba4cc
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date: Mon Jun 29 15:23:10 2020 -0300
clutter/paint-nodes: Push and pop framebuffer even without ops
ClutterLayerNode currently skips pushing and popping its framebuffer
to the paint context when no rectangles are added to it. However,
it's still useful to do that, since we might want to render child
nodes to the offscreen and reuse the pipeline in a later node.
Make ClutterLayerNode push and pop its framebuffer even without
rectangles.
https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1340
clutter/clutter/clutter-paint-nodes.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/clutter/clutter/clutter-paint-nodes.c b/clutter/clutter/clutter-paint-nodes.c
index d14b836399..eb610ad408 100644
--- a/clutter/clutter/clutter-paint-nodes.c
+++ b/clutter/clutter/clutter-paint-nodes.c
@@ -1341,10 +1341,6 @@ clutter_layer_node_pre_draw (ClutterPaintNode *node,
if (lnode->offscreen == NULL)
return FALSE;
- /* if no geometry was submitted for this node then we simply ignore it */
- if (node->operations == NULL)
- return FALSE;
-
if (lnode->update_modelview)
{
CoglFramebuffer *framebuffer;
@@ -1395,6 +1391,10 @@ clutter_layer_node_post_draw (ClutterPaintNode *node,
cogl_framebuffer_pop_matrix (lnode->offscreen);
clutter_paint_context_pop_framebuffer (paint_context);
+ /* if no geometry was submitted for this node then we simply ignore it */
+ if (node->operations == NULL)
+ return;
+
fb = clutter_paint_context_get_framebuffer (paint_context);
for (i = 0; i < node->operations->len; i++)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]