[Cogl] [PATCH 2/2] journal: Don't push and pop the framebuffer when flushing

Neil Roberts neil at linux.intel.com
Fri Mar 16 10:43:38 PDT 2012


In theory none of the journal flushing code should be using anything
that relies on the global framebuffer stack because it should all be
using the new 2.0-style API which explicitly mentions the target
framebuffer. Eventually we want to get rid of the framebuffer stack so
we might as well remove the push and pop now.
---
 cogl/cogl-journal.c |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/cogl/cogl-journal.c b/cogl/cogl-journal.c
index 59a9fd8..8670471 100644
--- a/cogl/cogl-journal.c
+++ b/cogl/cogl-journal.c
@@ -1381,8 +1381,6 @@ _cogl_journal_flush (CoglJournal *journal)
    * that the timer isn't started recursively. */
   COGL_TIMER_START (_cogl_uprof_context, flush_timer);
 
-  cogl_push_framebuffer (journal->framebuffer);
-
   if (G_UNLIKELY (COGL_DEBUG_ENABLED (COGL_DEBUG_BATCHING)))
     g_print ("BATCHING: journal len = %d\n", journal->entries->len);
 
@@ -1465,8 +1463,6 @@ _cogl_journal_flush (CoglJournal *journal)
 
   _cogl_journal_discard (journal);
 
-  cogl_pop_framebuffer ();
-
   COGL_TIMER_STOP (_cogl_uprof_context, flush_timer);
 }
 
-- 
1.7.3.16.g9464b



More information about the Cogl mailing list