From e42c4e83283787062fb446a2aa698f227fe2db5f Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>

Date: Wed, 29 Apr 2020 16:26:52 +0200

Subject: [PATCH 01/20] cogl/dma-buf-handle: Pass more metadata to handle

 constructor

Could be useful would one want to mmap the dmabuf and deal with its

content manually in CPU space.

https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1237

(cherry picked from commit e656d0caf01d8b012d2b458676e5658c540525dc)

---

 cogl/cogl/cogl-dma-buf-handle.c            | 45 +++++++++++++++++++++

 cogl/cogl/cogl-dma-buf-handle.h            | 46 +++++++++++++++++++++-

 src/backends/native/meta-renderer-native.c | 14 +++++--

 3 files changed, 101 insertions(+), 4 deletions(-)

diff --git a/cogl/cogl/cogl-dma-buf-handle.c b/cogl/cogl/cogl-dma-buf-handle.c

index 4a8f709f2c..d8b4e57c55 100644

--- a/cogl/cogl/cogl-dma-buf-handle.c

+++ b/cogl/cogl/cogl-dma-buf-handle.c

@@ -40,6 +40,11 @@ struct _CoglDmaBufHandle

 {

   CoglFramebuffer *framebuffer;

   int dmabuf_fd;

+  int width;

+  int height;

+  int stride;

+  int offset;

+  int bpp;

   gpointer user_data;

   GDestroyNotify destroy_func;

 };

@@ -47,6 +52,11 @@ struct _CoglDmaBufHandle

 CoglDmaBufHandle *

 cogl_dma_buf_handle_new (CoglFramebuffer *framebuffer,

                          int              dmabuf_fd,

+                         int              width,

+                         int              height,

+                         int              stride,

+                         int              offset,

+                         int              bpp,

                          gpointer         user_data,

                          GDestroyNotify   destroy_func)

 {

@@ -61,6 +71,12 @@ cogl_dma_buf_handle_new (CoglFramebuffer *framebuffer,

   dmabuf_handle->user_data = user_data;

   dmabuf_handle->destroy_func = destroy_func;

+  dmabuf_handle->width = width;

+  dmabuf_handle->height = height;

+  dmabuf_handle->stride = stride;

+  dmabuf_handle->offset = offset;

+  dmabuf_handle->bpp = bpp;

+

   return dmabuf_handle;

 }

@@ -92,3 +108,32 @@ cogl_dma_buf_handle_get_fd (CoglDmaBufHandle *dmabuf_handle)

   return dmabuf_handle->dmabuf_fd;

 }

+int

+cogl_dma_buf_handle_get_width (CoglDmaBufHandle *dmabuf_handle)

+{

+  return dmabuf_handle->width;

+}

+

+int

+cogl_dma_buf_handle_get_height (CoglDmaBufHandle *dmabuf_handle)

+{

+  return dmabuf_handle->height;

+}

+

+int

+cogl_dma_buf_handle_get_stride (CoglDmaBufHandle *dmabuf_handle)

+{

+  return dmabuf_handle->stride;

+}

+

+int

+cogl_dma_buf_handle_get_offset (CoglDmaBufHandle *dmabuf_handle)

+{

+  return dmabuf_handle->offset;

+}

+

+int

+cogl_dma_buf_handle_get_bpp (CoglDmaBufHandle *dmabuf_handle)

+{

+  return dmabuf_handle->bpp;

+}

diff --git a/cogl/cogl/cogl-dma-buf-handle.h b/cogl/cogl/cogl-dma-buf-handle.h

index 25b9b0ccb5..f64a20678d 100644

--- a/cogl/cogl/cogl-dma-buf-handle.h

+++ b/cogl/cogl/cogl-dma-buf-handle.h

@@ -46,7 +46,12 @@

 CoglDmaBufHandle *

 cogl_dma_buf_handle_new (CoglFramebuffer *framebuffer,

                          int              dmabuf_fd,

-                         gpointer         data,

+                         int              width,

+                         int              height,

+                         int              stride,

+                         int              offset,

+                         int              bpp,

+                         gpointer         user_data,

                          GDestroyNotify   destroy_func);

 /**

@@ -79,5 +84,44 @@ cogl_dma_buf_handle_get_framebuffer (CoglDmaBufHandle *dmabuf_handle);

 int

 cogl_dma_buf_handle_get_fd (CoglDmaBufHandle *dmabuf_handle);

+/**

+ * cogl_dmabuf_handle_get_width: (skip)

+ *

+ * Returns: the buffer width

+ */

+int

+cogl_dma_buf_handle_get_width (CoglDmaBufHandle *dmabuf_handle);

+

+/**

+ * cogl_dmabuf_handle_get_height: (skip)

+ *

+ * Returns: the buffer height

+ */

+int

+cogl_dma_buf_handle_get_height (CoglDmaBufHandle *dmabuf_handle);

+

+/**

+ * cogl_dmabuf_handle_get_stride: (skip)

+ *

+ * Returns: the buffer stride

+ */

+int

+cogl_dma_buf_handle_get_stride (CoglDmaBufHandle *dmabuf_handle);

+

+/**

+ * cogl_dmabuf_handle_get_offset: (skip)

+ *

+ * Returns: the buffer offset

+ */

+int

+cogl_dma_buf_handle_get_offset (CoglDmaBufHandle *dmabuf_handle);

+

+/**

+ * cogl_dmabuf_handle_get_bpp: (skip)

+ *

+ * Returns: the number of bytes per pixel

+ */

+int

+cogl_dma_buf_handle_get_bpp (CoglDmaBufHandle *dmabuf_handle);

 #endif /* __COGL_DMA_BUF_HANDLE_H__ */

diff --git a/src/backends/native/meta-renderer-native.c b/src/backends/native/meta-renderer-native.c

index 25833b6cf6..c14cb5acda 100644

--- a/src/backends/native/meta-renderer-native.c

+++ b/src/backends/native/meta-renderer-native.c

@@ -2641,6 +2641,9 @@ meta_renderer_native_create_dma_buf (CoglRenderer  *cogl_renderer,

         CoglFramebuffer *dmabuf_fb;

         CoglDmaBufHandle *dmabuf_handle;

         struct gbm_bo *new_bo;

+        int stride;

+        int offset;

+        int bpp;

         int dmabuf_fd = -1;

         new_bo = gbm_bo_create (renderer_gpu_data->gbm.device,

@@ -2664,11 +2667,14 @@ meta_renderer_native_create_dma_buf (CoglRenderer  *cogl_renderer,

             return NULL;

           }

+        stride = gbm_bo_get_stride (new_bo);

+        offset = gbm_bo_get_offset (new_bo, 0);

+        bpp = 4;

         dmabuf_fb = create_dma_buf_framebuffer (renderer_native,

                                                 dmabuf_fd,

                                                 width, height,

-                                                gbm_bo_get_stride (new_bo),

-                                                gbm_bo_get_offset (new_bo, 0),

+                                                stride,

+                                                offset,

                                                 DRM_FORMAT_MOD_LINEAR,

                                                 DRM_FORMAT_XRGB8888,

                                                 error);

@@ -2677,7 +2683,9 @@ meta_renderer_native_create_dma_buf (CoglRenderer  *cogl_renderer,

           return NULL;

         dmabuf_handle =

-          cogl_dma_buf_handle_new (dmabuf_fb, dmabuf_fd, new_bo,

+          cogl_dma_buf_handle_new (dmabuf_fb, dmabuf_fd,

+                                   width, height, stride, offset, bpp,

+                                   new_bo,

                                    (GDestroyNotify) gbm_bo_destroy);

         cogl_object_unref (dmabuf_fb);

         return dmabuf_handle;

-- 

2.28.0

From 2270f6dcf7b1e70386f5b4242f92bf5735bb88ba Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>

Date: Thu, 30 Apr 2020 10:42:30 +0200

Subject: [PATCH 02/20] clutter/stage-view: Add name property

Will be used for logging to identify what view a log entry concerns. For

the native and nested backend this is the name of the output the CRTC is

assigned to drive; for X11 it's just "X11 screen", and for the legacy

"X11 screen" emulation mode of the nested backend it's called "legacy

nested".

https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1237

(cherry picked from commit c86367199febdee10ecd7ba24c69b6dda52cb896)

---

 clutter/clutter/clutter-stage-view.c           | 18 ++++++++++++++++++

 src/backends/native/meta-renderer-native.c     |  3 +++

 .../x11/nested/meta-renderer-x11-nested.c      |  4 ++++

 3 files changed, 25 insertions(+)

diff --git a/clutter/clutter/clutter-stage-view.c b/clutter/clutter/clutter-stage-view.c

index 0fad6fc446..6b543b5d51 100644

--- a/clutter/clutter/clutter-stage-view.c

+++ b/clutter/clutter/clutter-stage-view.c

@@ -27,6 +27,7 @@ enum

 {

   PROP_0,

+  PROP_NAME,

   PROP_LAYOUT,

   PROP_FRAMEBUFFER,

   PROP_OFFSCREEN,

@@ -40,6 +41,8 @@ static GParamSpec *obj_props[PROP_LAST];

 typedef struct _ClutterStageViewPrivate

 {

+  char *name;

+

   cairo_rectangle_int_t layout;

   float scale;

   CoglFramebuffer *framebuffer;

@@ -339,6 +342,9 @@ clutter_stage_view_get_property (GObject    *object,

   switch (prop_id)

     {

+    case PROP_NAME:

+      g_value_set_string (value, priv->name);

+      break;

     case PROP_LAYOUT:

       g_value_set_boxed (value, &priv->layout);

       break;

@@ -372,6 +378,9 @@ clutter_stage_view_set_property (GObject      *object,

   switch (prop_id)

     {

+    case PROP_NAME:

+      priv->name = g_value_dup_string (value);

+      break;

     case PROP_LAYOUT:

       layout = g_value_get_boxed (value);

       priv->layout = *layout;

@@ -414,6 +423,7 @@ clutter_stage_view_dispose (GObject *object)

   ClutterStageViewPrivate *priv =

     clutter_stage_view_get_instance_private (view);

+  g_clear_pointer (&priv->name, g_free);

   g_clear_pointer (&priv->framebuffer, cogl_object_unref);

   g_clear_pointer (&priv->shadowfb, cogl_object_unref);

   g_clear_pointer (&priv->offscreen, cogl_object_unref);

@@ -446,6 +456,14 @@ clutter_stage_view_class_init (ClutterStageViewClass *klass)

   object_class->set_property = clutter_stage_view_set_property;

   object_class->dispose = clutter_stage_view_dispose;

+  obj_props[PROP_NAME] =

+    g_param_spec_string ("name",

+                         "Name",

+                         "Name of view",

+                         NULL,

+                         G_PARAM_READWRITE |

+                         G_PARAM_CONSTRUCT_ONLY |

+                         G_PARAM_STATIC_STRINGS);

   obj_props[PROP_LAYOUT] =

     g_param_spec_boxed ("layout",

                         "View layout",

diff --git a/src/backends/native/meta-renderer-native.c b/src/backends/native/meta-renderer-native.c

index c14cb5acda..d3fb5b3c55 100644

--- a/src/backends/native/meta-renderer-native.c

+++ b/src/backends/native/meta-renderer-native.c

@@ -3679,6 +3679,7 @@ meta_renderer_native_create_view (MetaRenderer       *renderer,

   CoglContext *cogl_context =

     cogl_context_from_renderer_native (renderer_native);

   CoglDisplay *cogl_display = cogl_context_get_display (cogl_context);

+  MetaMonitor *monitor;

   CoglDisplayEGL *cogl_display_egl;

   CoglOnscreenEGL *onscreen_egl;

   MetaMonitorTransform view_transform;

@@ -3742,7 +3743,9 @@ meta_renderer_native_create_view (MetaRenderer       *renderer,

         g_error ("Failed to allocate shadow buffer texture: %s", error->message);

     }

+  monitor = meta_logical_monitor_get_monitors (logical_monitor)->data;

   view = g_object_new (META_TYPE_RENDERER_VIEW,

+                       "name", meta_monitor_get_connector (monitor),

                        "layout", &logical_monitor->rect,

                        "scale", scale,

                        "framebuffer", onscreen,

diff --git a/src/backends/x11/nested/meta-renderer-x11-nested.c b/src/backends/x11/nested/meta-renderer-x11-nested.c

index 5000bf3579..f3a5547dbb 100644

--- a/src/backends/x11/nested/meta-renderer-x11-nested.c

+++ b/src/backends/x11/nested/meta-renderer-x11-nested.c

@@ -163,6 +163,7 @@ meta_renderer_x11_nested_ensure_legacy_view (MetaRendererX11Nested *renderer_x11

     .height = height

   };

   legacy_view = g_object_new (META_TYPE_RENDERER_VIEW,

+                              "name", "legacy nested",

                               "layout", &view_layout,

                               "framebuffer", COGL_FRAMEBUFFER (fake_onscreen),

                               NULL);

@@ -179,6 +180,7 @@ meta_renderer_x11_nested_create_view (MetaRenderer       *renderer,

     meta_backend_get_monitor_manager (backend);

   ClutterBackend *clutter_backend = meta_backend_get_clutter_backend (backend);

   CoglContext *cogl_context = clutter_backend_get_cogl_context (clutter_backend);

+  MetaMonitor *monitor;

   MetaMonitorTransform view_transform;

   float view_scale;

   int width, height;

@@ -212,7 +214,9 @@ meta_renderer_x11_nested_create_view (MetaRenderer       *renderer,

   else

     offscreen = NULL;

+  monitor = meta_logical_monitor_get_monitors (logical_monitor)->data;

   return g_object_new (META_TYPE_RENDERER_VIEW,

+                       "name", meta_monitor_get_connector (monitor),

                        "layout", &logical_monitor->rect,

                        "framebuffer", COGL_FRAMEBUFFER (fake_onscreen),

                        "offscreen", COGL_FRAMEBUFFER (offscreen),

-- 

2.28.0

From 6716fde14c5b1a00a02a80b46db67d3f236a87c1 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>

Date: Thu, 30 Apr 2020 17:53:30 +0200

Subject: [PATCH 03/20] renderer-native: Move shadow fb construction to the

 stage view

The stage view will need a more involved approach to shadow buffers, in

order to implement things such double buffered shadow buffers and damage

detection.

https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1237

(cherry picked from commit 3ab89be574f0e02dc67e1b1f538bb24f94612bcf)

---

 clutter/clutter/clutter-stage-view.c       | 115 ++++++++++++++++++---

 src/backends/native/meta-renderer-native.c |  25 +----

 2 files changed, 106 insertions(+), 34 deletions(-)

diff --git a/clutter/clutter/clutter-stage-view.c b/clutter/clutter/clutter-stage-view.c

index 6b543b5d51..db0067297c 100644

--- a/clutter/clutter/clutter-stage-view.c

+++ b/clutter/clutter/clutter-stage-view.c

@@ -31,7 +31,7 @@ enum

   PROP_LAYOUT,

   PROP_FRAMEBUFFER,

   PROP_OFFSCREEN,

-  PROP_SHADOWFB,

+  PROP_USE_SHADOWFB,

   PROP_SCALE,

   PROP_LAST

@@ -50,6 +50,7 @@ typedef struct _ClutterStageViewPrivate

   CoglOffscreen *offscreen;

   CoglPipeline *offscreen_pipeline;

+  gboolean use_shadowfb;

   CoglOffscreen *shadowfb;

   CoglPipeline *shadowfb_pipeline;

@@ -206,6 +207,80 @@ clutter_stage_view_copy_to_framebuffer (ClutterStageView            *view,

   cogl_framebuffer_pop_matrix (dst_framebuffer);

 }

+static CoglOffscreen *

+create_offscreen_framebuffer (CoglContext  *context,

+                              int           width,

+                              int           height,

+                              GError      **error)

+{

+  CoglOffscreen *framebuffer;

+  CoglTexture2D *texture;

+

+  texture = cogl_texture_2d_new_with_size (context, width, height);

+  cogl_primitive_texture_set_auto_mipmap (COGL_PRIMITIVE_TEXTURE (texture),

+                                          FALSE);

+

+  if (!cogl_texture_allocate (COGL_TEXTURE (texture), error))

+    {

+      cogl_object_unref (texture);

+      return FALSE;

+    }

+

+  framebuffer = cogl_offscreen_new_with_texture (COGL_TEXTURE (texture));

+  cogl_object_unref (texture);

+  if (!cogl_framebuffer_allocate (COGL_FRAMEBUFFER (framebuffer), error))

+    {

+      cogl_object_unref (framebuffer);

+      return FALSE;

+    }

+

+  return framebuffer;

+}

+

+static gboolean

+init_offscreen_shadowfb (ClutterStageView  *view,

+                         CoglContext       *cogl_context,

+                         int                width,

+                         int                height,

+                         GError           **error)

+{

+  ClutterStageViewPrivate *priv =

+    clutter_stage_view_get_instance_private (view);

+  CoglOffscreen *offscreen;

+

+  offscreen = create_offscreen_framebuffer (cogl_context, width, height, error);

+  if (!offscreen)

+    return FALSE;

+

+  priv->shadowfb = offscreen;

+  return TRUE;

+}

+

+static void

+init_shadowfb (ClutterStageView *view)

+{

+  ClutterStageViewPrivate *priv =

+    clutter_stage_view_get_instance_private (view);

+  g_autoptr (GError) error = NULL;

+  int width;

+  int height;

+  CoglContext *cogl_context;

+

+  width = cogl_framebuffer_get_width (priv->framebuffer);

+  height = cogl_framebuffer_get_height (priv->framebuffer);

+  cogl_context = cogl_framebuffer_get_context (priv->framebuffer);

+

+  if (!init_offscreen_shadowfb (view, cogl_context, width, height, &error))

+    {

+      g_warning ("Failed to initialize single buffered shadow fb for %s: %s",

+                 priv->name, error->message);

+    }

+  else

+    {

+      g_message ("Initialized single buffered shadow fb for %s", priv->name);

+    }

+}

+

 void

 clutter_stage_view_blit_offscreen (ClutterStageView            *view,

                                    const cairo_rectangle_int_t *rect)

@@ -354,8 +429,8 @@ clutter_stage_view_get_property (GObject    *object,

     case PROP_OFFSCREEN:

       g_value_set_boxed (value, priv->offscreen);

       break;

-    case PROP_SHADOWFB:

-      g_value_set_boxed (value, priv->shadowfb);

+    case PROP_USE_SHADOWFB:

+      g_value_set_boolean (value, priv->use_shadowfb);

       break;

     case PROP_SCALE:

       g_value_set_float (value, priv->scale);

@@ -405,8 +480,8 @@ clutter_stage_view_set_property (GObject      *object,

     case PROP_OFFSCREEN:

       priv->offscreen = g_value_dup_boxed (value);

       break;

-    case PROP_SHADOWFB:

-      priv->shadowfb = g_value_dup_boxed (value);

+    case PROP_USE_SHADOWFB:

+      priv->use_shadowfb = g_value_get_boolean (value);

       break;

     case PROP_SCALE:

       priv->scale = g_value_get_float (value);

@@ -416,6 +491,19 @@ clutter_stage_view_set_property (GObject      *object,

     }

 }

+static void

+clutter_stage_view_constructed (GObject *object)

+{

+  ClutterStageView *view = CLUTTER_STAGE_VIEW (object);

+  ClutterStageViewPrivate *priv =

+    clutter_stage_view_get_instance_private (view);

+

+  if (priv->use_shadowfb)

+    init_shadowfb (view);

+

+  G_OBJECT_CLASS (clutter_stage_view_parent_class)->constructed (object);

+}

+

 static void

 clutter_stage_view_dispose (GObject *object)

 {

@@ -454,6 +542,7 @@ clutter_stage_view_class_init (ClutterStageViewClass *klass)

   object_class->get_property = clutter_stage_view_get_property;

   object_class->set_property = clutter_stage_view_set_property;

+  object_class->constructed = clutter_stage_view_constructed;

   object_class->dispose = clutter_stage_view_dispose;

   obj_props[PROP_NAME] =

@@ -491,14 +580,14 @@ clutter_stage_view_class_init (ClutterStageViewClass *klass)

                         G_PARAM_CONSTRUCT_ONLY |

                         G_PARAM_STATIC_STRINGS);

-  obj_props[PROP_SHADOWFB] =

-    g_param_spec_boxed ("shadowfb",

-                        "Shadow framebuffer",

-                        "Framebuffer used as intermediate shadow buffer",

-                        COGL_TYPE_HANDLE,

-                        G_PARAM_READWRITE |

-                        G_PARAM_CONSTRUCT_ONLY |

-                        G_PARAM_STATIC_STRINGS);

+  obj_props[PROP_USE_SHADOWFB] =

+    g_param_spec_boolean ("use-shadowfb",

+                          "Use shadowfb",

+                          "Whether to use one or more shadow framebuffers",

+                          FALSE,

+                          G_PARAM_READWRITE |

+                          G_PARAM_CONSTRUCT_ONLY |

+                          G_PARAM_STATIC_STRINGS);

   obj_props[PROP_SCALE] =

     g_param_spec_float ("scale",

diff --git a/src/backends/native/meta-renderer-native.c b/src/backends/native/meta-renderer-native.c

index d3fb5b3c55..463dddd3a7 100644

--- a/src/backends/native/meta-renderer-native.c

+++ b/src/backends/native/meta-renderer-native.c

@@ -3685,7 +3685,7 @@ meta_renderer_native_create_view (MetaRenderer       *renderer,

   MetaMonitorTransform view_transform;

   CoglOnscreen *onscreen = NULL;

   CoglOffscreen *offscreen = NULL;

-  CoglOffscreen *shadowfb = NULL;

+  gboolean use_shadowfb;

   float scale;

   int width, height;

   MetaRendererView *view;

@@ -3724,24 +3724,8 @@ meta_renderer_native_create_view (MetaRenderer       *renderer,

     }

-  if (should_force_shadow_fb (renderer_native,

-                              renderer_native->primary_gpu_kms))

-    {

-      int shadow_width;

-      int shadow_height;

-

-      /* The shadowfb must be the same size as the on-screen framebuffer */

-      shadow_width = cogl_framebuffer_get_width (COGL_FRAMEBUFFER (onscreen));

-      shadow_height = cogl_framebuffer_get_height (COGL_FRAMEBUFFER (onscreen));

-

-      shadowfb = meta_renderer_native_create_offscreen (renderer_native,

-                                                        cogl_context,

-                                                        shadow_width,

-                                                        shadow_height,

-                                                        &error);

-      if (!shadowfb)

-        g_error ("Failed to allocate shadow buffer texture: %s", error->message);

-    }

+  use_shadowfb = should_force_shadow_fb (renderer_native,

+                                         renderer_native->primary_gpu_kms);

   monitor = meta_logical_monitor_get_monitors (logical_monitor)->data;

   view = g_object_new (META_TYPE_RENDERER_VIEW,

@@ -3750,12 +3734,11 @@ meta_renderer_native_create_view (MetaRenderer       *renderer,

                        "scale", scale,

                        "framebuffer", onscreen,

                        "offscreen", offscreen,

-                       "shadowfb", shadowfb,

+                       "use-shadowfb", use_shadowfb,

                        "logical-monitor", logical_monitor,

                        "transform", view_transform,

                        NULL);

   g_clear_pointer (&offscreen, cogl_object_unref);

-  g_clear_pointer (&shadowfb, cogl_object_unref);

   meta_onscreen_native_set_view (onscreen, view);

-- 

2.28.0

From f79b37583e575d34edb4b7965cb0e48eb2736749 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>

Date: Thu, 30 Apr 2020 18:19:30 +0200

Subject: [PATCH 04/20] clutter/stage-view: Move shadowfb struct fields into

 anonymous struct

With the aim to collect shadow buffer related things in one place, place

them in an anonymous struct.

https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1237

(cherry picked from commit 310ca695d90b48074a06327e87bd7e924f49cb7f)

---

 clutter/clutter/clutter-stage-view.c | 32 +++++++++++++++-------------

 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/clutter/clutter/clutter-stage-view.c b/clutter/clutter/clutter-stage-view.c

index db0067297c..9bbe158f36 100644

--- a/clutter/clutter/clutter-stage-view.c

+++ b/clutter/clutter/clutter-stage-view.c

@@ -51,8 +51,10 @@ typedef struct _ClutterStageViewPrivate

   CoglPipeline *offscreen_pipeline;

   gboolean use_shadowfb;

-  CoglOffscreen *shadowfb;

-  CoglPipeline *shadowfb_pipeline;

+  struct {

+    CoglOffscreen *framebuffer;

+    CoglPipeline *pipeline;

+  } shadow;

   guint dirty_viewport   : 1;

   guint dirty_projection : 1;

@@ -86,8 +88,8 @@ clutter_stage_view_get_framebuffer (ClutterStageView *view)

   if (priv->offscreen)

     return priv->offscreen;

-  else if (priv->shadowfb)

-    return priv->shadowfb;

+  else if (priv->shadow.framebuffer)

+    return priv->shadow.framebuffer;

   else

     return priv->framebuffer;

 }

@@ -153,11 +155,11 @@ clutter_stage_view_ensure_shadowfb_blit_pipeline (ClutterStageView *view)

   ClutterStageViewPrivate *priv =

     clutter_stage_view_get_instance_private (view);

-  if (priv->shadowfb_pipeline)

+  if (priv->shadow.pipeline)

     return;

-  priv->shadowfb_pipeline =

-    clutter_stage_view_create_framebuffer_pipeline (priv->shadowfb);

+  priv->shadow.pipeline =

+    clutter_stage_view_create_framebuffer_pipeline (priv->shadow.framebuffer);

 }

 void

@@ -252,7 +254,7 @@ init_offscreen_shadowfb (ClutterStageView  *view,

   if (!offscreen)

     return FALSE;

-  priv->shadowfb = offscreen;

+  priv->shadow.framebuffer = offscreen;

   return TRUE;

 }

@@ -297,13 +299,13 @@ clutter_stage_view_blit_offscreen (ClutterStageView            *view,

       clutter_stage_view_get_offscreen_transformation_matrix (view, &matrix);

       can_blit = cogl_matrix_is_identity (&matrix);

-      if (priv->shadowfb)

+      if (priv->shadow.framebuffer)

         {

           clutter_stage_view_copy_to_framebuffer (view,

                                                   rect,

                                                   priv->offscreen_pipeline,

                                                   priv->offscreen,

-                                                  priv->shadowfb,

+                                                  priv->shadow.framebuffer,

                                                   can_blit);

         }

       else

@@ -317,13 +319,13 @@ clutter_stage_view_blit_offscreen (ClutterStageView            *view,

         }

     }

-  if (priv->shadowfb)

+  if (priv->shadow.framebuffer)

     {

       clutter_stage_view_ensure_shadowfb_blit_pipeline (view);

       clutter_stage_view_copy_to_framebuffer (view,

                                               rect,

-                                              priv->shadowfb_pipeline,

-                                              priv->shadowfb,

+                                              priv->shadow.pipeline,

+                                              priv->shadow.framebuffer,

                                               priv->framebuffer,

                                               TRUE);

     }

@@ -513,10 +515,10 @@ clutter_stage_view_dispose (GObject *object)

   g_clear_pointer (&priv->name, g_free);

   g_clear_pointer (&priv->framebuffer, cogl_object_unref);

-  g_clear_pointer (&priv->shadowfb, cogl_object_unref);

+  g_clear_pointer (&priv->shadow.framebuffer, cogl_object_unref);

+  g_clear_pointer (&priv->shadow.pipeline, cogl_object_unref);

   g_clear_pointer (&priv->offscreen, cogl_object_unref);

   g_clear_pointer (&priv->offscreen_pipeline, cogl_object_unref);

-  g_clear_pointer (&priv->shadowfb_pipeline, cogl_object_unref);

   G_OBJECT_CLASS (clutter_stage_view_parent_class)->dispose (object);

 }

-- 

2.28.0

From 7bf71e7b5f39fcf34c4a636640636f9452b4b06c Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>

Date: Thu, 30 Apr 2020 21:51:10 +0200

Subject: [PATCH 05/20] clutter/stage-view: Move fb viewport and projection

 setting to here

The stage would fetch the front framebuffer and set the viewport and

projection matrix, but if we are going to more than one front buffer,

that won't work, so let the stage just pass the viewport and projection

matrix to the view and have the view deal with the framebuffer(s).

https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1237

(cherry picked from commit c79bcf0d7e35cf9e85864cf72ea53659a6b8d8a7)