[mutter] Revert "renderer-native: Destroy monitor framebuffers when suspending"



commit dd4ad4efc419e9f1f00477116fbfee8fba7fff25
Author: Jonas Ådahl <jadahl gmail com>
Date:   Mon Sep 4 22:36:44 2017 +0800

    Revert "renderer-native: Destroy monitor framebuffers when suspending"
    
    The reverted commit seems to cause
    https://bugzilla.gnome.org/show_bug.cgi?id=787240 for some reason. Lets
    be safe and revert it for now, as the code freeze is just around the
    corner.
    
    This partly (it doesn't reintroduce a whitespace issue) reverts commit
    dbc63430d879c927f7e308e29e4570993eccbfde.

 clutter/clutter/clutter-stage-view.c       |    4 +---
 src/backends/native/meta-backend-native.c  |    3 ---
 src/backends/native/meta-renderer-native.c |   18 ------------------
 src/backends/native/meta-renderer-native.h |    2 --
 4 files changed, 1 insertions(+), 26 deletions(-)
---
diff --git a/clutter/clutter/clutter-stage-view.c b/clutter/clutter/clutter-stage-view.c
index e2792a0..cd6cd35 100644
--- a/clutter/clutter/clutter-stage-view.c
+++ b/clutter/clutter/clutter-stage-view.c
@@ -267,7 +267,6 @@ clutter_stage_view_set_property (GObject      *object,
       priv->layout = *layout;
       break;
     case PROP_FRAMEBUFFER:
-      g_clear_pointer (&priv->framebuffer, cogl_object_unref);
       priv->framebuffer = g_value_dup_boxed (value);
 #ifndef G_DISABLE_CHECKS
       if (priv->framebuffer)
@@ -285,7 +284,6 @@ clutter_stage_view_set_property (GObject      *object,
 #endif
       break;
     case PROP_OFFSCREEN:
-      g_clear_pointer (&priv->offscreen, cogl_object_unref);
       priv->offscreen = g_value_dup_boxed (value);
       break;
     case PROP_SCALE:
@@ -357,7 +355,7 @@ clutter_stage_view_class_init (ClutterStageViewClass *klass)
                         "Framebuffer used as intermediate buffer",
                         COGL_TYPE_HANDLE,
                         G_PARAM_READWRITE |
-                        G_PARAM_CONSTRUCT |
+                        G_PARAM_CONSTRUCT_ONLY |
                         G_PARAM_STATIC_STRINGS);
 
   obj_props[PROP_SCALE] =
diff --git a/src/backends/native/meta-backend-native.c b/src/backends/native/meta-backend-native.c
index 7a5c2b6..d68aca9 100644
--- a/src/backends/native/meta-backend-native.c
+++ b/src/backends/native/meta-backend-native.c
@@ -682,14 +682,11 @@ meta_backend_native_pause (MetaBackendNative *native)
     meta_backend_get_monitor_manager (backend);
   MetaMonitorManagerKms *monitor_manager_kms =
     META_MONITOR_MANAGER_KMS (monitor_manager);
-  MetaRendererNative *renderer_native =
-    META_RENDERER_NATIVE (meta_backend_get_renderer (backend));
 
   clutter_evdev_release_devices ();
   clutter_egl_freeze_master_clock ();
 
   meta_monitor_manager_kms_pause (monitor_manager_kms);
-  meta_renderer_native_pause (renderer_native);
 }
 
 void meta_backend_native_resume (MetaBackendNative *native)
diff --git a/src/backends/native/meta-renderer-native.c b/src/backends/native/meta-renderer-native.c
index 869ede4..7559708 100644
--- a/src/backends/native/meta-renderer-native.c
+++ b/src/backends/native/meta-renderer-native.c
@@ -1786,24 +1786,6 @@ meta_renderer_native_get_frame_counter (MetaRendererNative *renderer_native)
   return renderer_native->frame_counter;
 }
 
-void
-meta_renderer_native_pause (MetaRendererNative *renderer_native)
-{
-  GList *views;
-  GList *l;
-
-  views = meta_renderer_get_views (META_RENDERER (renderer_native));
-  for (l = views; l; l = l->next)
-    {
-      ClutterStageView *stage_view = l->data;
-
-      g_object_set (G_OBJECT (stage_view),
-                    "framebuffer", NULL,
-                    "offscreen", NULL,
-                    NULL);
-    }
-}
-
 static void
 meta_renderer_native_get_property (GObject    *object,
                                    guint       prop_id,
diff --git a/src/backends/native/meta-renderer-native.h b/src/backends/native/meta-renderer-native.h
index 8a88476..24cfdd3 100644
--- a/src/backends/native/meta-renderer-native.h
+++ b/src/backends/native/meta-renderer-native.h
@@ -71,6 +71,4 @@ void meta_renderer_native_finish_frame (MetaRendererNative *renderer_native);
 
 int64_t meta_renderer_native_get_frame_counter (MetaRendererNative *renderer_native);
 
-void meta_renderer_native_pause (MetaRendererNative *renderer_native);
-
 #endif /* META_RENDERER_NATIVE_H */


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