[mutter] cogl: Inline _cogl_framebuffer_remove_all_dependencies into its one caller



commit 640ad4718edf0fcb1863f39ea2cbbc94983b18e8
Author: Adam Jackson <ajax redhat com>
Date:   Tue Jan 21 14:43:26 2020 -0500

    cogl: Inline _cogl_framebuffer_remove_all_dependencies into its one caller
    
    https://gitlab.gnome.org/GNOME/mutter/merge_requests/1015

 cogl/cogl/cogl-framebuffer-private.h |  3 ---
 cogl/cogl/cogl-framebuffer.c         | 15 ++++-----------
 2 files changed, 4 insertions(+), 14 deletions(-)
---
diff --git a/cogl/cogl/cogl-framebuffer-private.h b/cogl/cogl/cogl-framebuffer-private.h
index 537056dca..041a73047 100644
--- a/cogl/cogl/cogl-framebuffer-private.h
+++ b/cogl/cogl/cogl-framebuffer-private.h
@@ -278,9 +278,6 @@ void
 _cogl_framebuffer_add_dependency (CoglFramebuffer *framebuffer,
                                   CoglFramebuffer *dependency);
 
-void
-_cogl_framebuffer_remove_all_dependencies (CoglFramebuffer *framebuffer);
-
 void
 _cogl_framebuffer_flush_journal (CoglFramebuffer *framebuffer);
 
diff --git a/cogl/cogl/cogl-framebuffer.c b/cogl/cogl/cogl-framebuffer.c
index 3abdcc039..d10ae5cc5 100644
--- a/cogl/cogl/cogl-framebuffer.c
+++ b/cogl/cogl/cogl-framebuffer.c
@@ -571,16 +571,6 @@ _cogl_framebuffer_add_dependency (CoglFramebuffer *framebuffer,
     g_list_prepend (framebuffer->deps, cogl_object_ref (dependency));
 }
 
-void
-_cogl_framebuffer_remove_all_dependencies (CoglFramebuffer *framebuffer)
-{
-  GList *l;
-  for (l = framebuffer->deps; l; l = l->next)
-    cogl_object_unref (l->data);
-  g_list_free (framebuffer->deps);
-  framebuffer->deps = NULL;
-}
-
 void
 _cogl_framebuffer_flush_journal (CoglFramebuffer *framebuffer)
 {
@@ -593,7 +583,10 @@ _cogl_framebuffer_flush_dependency_journals (CoglFramebuffer *framebuffer)
   GList *l;
   for (l = framebuffer->deps; l; l = l->next)
     _cogl_framebuffer_flush_journal (l->data);
-  _cogl_framebuffer_remove_all_dependencies (framebuffer);
+  for (l = framebuffer->deps; l; l = l->next)
+    cogl_object_unref (l->data);
+  g_list_free (framebuffer->deps);
+  framebuffer->deps = NULL;
 }
 
 CoglOffscreen *


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