[gtk/wip/baedert/for-master: 747/748] gl renderer: handle cross-fade nodes with invisible children



commit f80a341b4f31dd6080ea9b034d62d6a091267e15
Author: Timm Bäder <mail baedert org>
Date:   Wed Jan 22 08:38:55 2020 +0100

    gl renderer: handle cross-fade nodes with invisible children

 gsk/gl/gskglrenderer.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)
---
diff --git a/gsk/gl/gskglrenderer.c b/gsk/gl/gskglrenderer.c
index 0817849e73..65933080c0 100644
--- a/gsk/gl/gskglrenderer.c
+++ b/gsk/gl/gskglrenderer.c
@@ -2155,14 +2155,24 @@ render_cross_fade_node (GskGLRenderer   *self,
                           start_node,
                           &start_region, &is_offscreen1,
                           FORCE_OFFSCREEN | RESET_CLIP | RESET_OPACITY))
-    g_assert_not_reached ();
+    {
+      gsk_gl_renderer_add_render_ops (self, end_node, builder);
+      return;
+    }
 
   if (!add_offscreen_ops (self, builder,
                           &node->bounds,
                           end_node,
                           &end_region, &is_offscreen2,
                           FORCE_OFFSCREEN | RESET_CLIP | RESET_OPACITY))
-    g_assert_not_reached ();
+    {
+      load_vertex_data_with_region (ops_draw (builder, NULL),
+                                    node,
+                                    builder,
+                                    &start_region,
+                                    TRUE);
+      return;
+    }
 
   ops_set_program (builder, &self->cross_fade_program);
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]