From: Benjamin Otte <otte@redhat.com>
Date: Fri, 20 Apr 2018 14:07:34 +0000 (+0200)
Subject: gsk: Refactor damage computation for GL renderer
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~22^2~393
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4d481ecb95d40fca1325e1c66aadf97c1b586cac;p=gtk4.git

gsk: Refactor damage computation for GL renderer

Previously, we got the damage, then computed the changed area, then
started a frame with that changed area.

But starting a frame computes the damage for us.

So now we start a frame, then get the damage area from that, then
compute the change area.
---

diff --git a/gsk/gl/gskglrenderer.c b/gsk/gl/gskglrenderer.c
index 177ac4b611..3e9dafaff1 100644
--- a/gsk/gl/gskglrenderer.c
+++ b/gsk/gl/gskglrenderer.c
@@ -2577,7 +2577,12 @@ gsk_gl_renderer_render (GskRenderer          *renderer,
                       gdk_surface_get_width (surface) * self->scale_factor,
                       gdk_surface_get_height (surface) * self->scale_factor
                   };
-  damage = gdk_gl_context_get_damage (self->gl_context);
+
+  context = gdk_surface_begin_draw_frame (surface,
+                                          GDK_DRAW_CONTEXT (self->gl_context),
+                                          update_area);
+
+  damage = gdk_drawing_context_get_clip (context);
   cairo_region_union (damage, update_area);
 
   if (cairo_region_contains_rectangle (damage, &whole_surface) == CAIRO_REGION_OVERLAP_IN)
@@ -2597,17 +2602,7 @@ gsk_gl_renderer_render (GskRenderer          *renderer,
         self->render_region = cairo_region_reference (damage);
     }
 
-  context = gdk_surface_begin_draw_frame (surface,
-                                          GDK_DRAW_CONTEXT (self->gl_context),
-                                          damage);
-
   cairo_region_destroy (damage);
-  if (self->render_region)
-    {
-      damage = gdk_drawing_context_get_clip (context);
-      cairo_region_union (self->render_region, damage);
-      cairo_region_destroy (damage);
-    }
 
   self->scale_factor = gdk_surface_get_scale_factor (surface);
   gdk_gl_context_make_current (self->gl_context);