From 0d039c3ba38679a106094da85be5a7672776d3bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
Date: Thu, 6 Feb 2020 08:26:58 +0100
Subject: [PATCH] clutter/view: Don't take paint rect after paint

It was unused, and will be become unused by the primary paint function
as well, so go ahead and remove it here first.

https://gitlab.gnome.org/GNOME/mutter/merge_requests/1042
---
 clutter/clutter/clutter-stage-view-private.h |  3 +--
 clutter/clutter/clutter-stage-view.c         | 17 ++++++-----------
 clutter/clutter/cogl/clutter-stage-cogl.c    |  2 +-
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/clutter/clutter/clutter-stage-view-private.h b/clutter/clutter/clutter-stage-view-private.h
index bbdcbaef8..c63b62256 100644
--- a/clutter/clutter/clutter-stage-view-private.h
+++ b/clutter/clutter/clutter-stage-view-private.h
@@ -20,8 +20,7 @@
 
 #include "clutter/clutter-stage-view.h"
 
-void clutter_stage_view_after_paint (ClutterStageView            *view,
-                                     const cairo_rectangle_int_t *clip);
+void clutter_stage_view_after_paint (ClutterStageView *view);
 
 gboolean clutter_stage_view_is_dirty_viewport (ClutterStageView *view);
 
diff --git a/clutter/clutter/clutter-stage-view.c b/clutter/clutter/clutter-stage-view.c
index aa1cb212f..1fa7c5771 100644
--- a/clutter/clutter/clutter-stage-view.c
+++ b/clutter/clutter/clutter-stage-view.c
@@ -166,12 +166,11 @@ clutter_stage_view_invalidate_offscreen_blit_pipeline (ClutterStageView *view)
 }
 
 static void
-clutter_stage_view_copy_to_framebuffer (ClutterStageView            *view,
-                                        const cairo_rectangle_int_t *rect,
-                                        CoglPipeline                *pipeline,
-                                        CoglFramebuffer             *src_framebuffer,
-                                        CoglFramebuffer             *dst_framebuffer,
-                                        gboolean                     can_blit)
+clutter_stage_view_copy_to_framebuffer (ClutterStageView *view,
+                                        CoglPipeline     *pipeline,
+                                        CoglFramebuffer  *src_framebuffer,
+                                        CoglFramebuffer  *dst_framebuffer,
+                                        gboolean          can_blit)
 {
   CoglMatrix matrix;
 
@@ -204,8 +203,7 @@ clutter_stage_view_copy_to_framebuffer (ClutterStageView            *view,
 }
 
 void
-clutter_stage_view_after_paint (ClutterStageView            *view,
-                                const cairo_rectangle_int_t *rect)
+clutter_stage_view_after_paint (ClutterStageView *view)
 {
   ClutterStageViewPrivate *priv =
     clutter_stage_view_get_instance_private (view);
@@ -222,7 +220,6 @@ clutter_stage_view_after_paint (ClutterStageView            *view,
       if (priv->shadowfb)
         {
           clutter_stage_view_copy_to_framebuffer (view,
-                                                  rect,
                                                   priv->offscreen_pipeline,
                                                   priv->offscreen,
                                                   priv->shadowfb,
@@ -231,7 +228,6 @@ clutter_stage_view_after_paint (ClutterStageView            *view,
       else
         {
           clutter_stage_view_copy_to_framebuffer (view,
-                                                  rect,
                                                   priv->offscreen_pipeline,
                                                   priv->offscreen,
                                                   priv->framebuffer,
@@ -243,7 +239,6 @@ clutter_stage_view_after_paint (ClutterStageView            *view,
     {
       clutter_stage_view_ensure_shadowfb_blit_pipeline (view);
       clutter_stage_view_copy_to_framebuffer (view,
-                                              rect,
                                               priv->shadowfb_pipeline,
                                               priv->shadowfb,
                                               priv->framebuffer,
diff --git a/clutter/clutter/cogl/clutter-stage-cogl.c b/clutter/clutter/cogl/clutter-stage-cogl.c
index 73a31e7be..a2a946f9e 100644
--- a/clutter/clutter/cogl/clutter-stage-cogl.c
+++ b/clutter/clutter/cogl/clutter-stage-cogl.c
@@ -565,7 +565,7 @@ paint_stage (ClutterStageCogl *stage_cogl,
   _clutter_stage_maybe_setup_viewport (stage, view);
   _clutter_stage_paint_view (stage, view, &paint_rect);
 
-  clutter_stage_view_after_paint (view, &paint_rect);
+  clutter_stage_view_after_paint (view);
 }
 
 static void