From a5f2f0fe2d62c72f205d9d53cbbbac75a7a322b6 Mon Sep 17 00:00:00 2001 From: Neil Roberts Date: Fri, 16 Mar 2012 17:31:03 +0000 Subject: [PATCH] journal: Don't push and pop the framebuffer when flushing 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. Reviewed-by: Robert Bragg --- cogl/cogl-journal.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/cogl/cogl-journal.c b/cogl/cogl-journal.c index 59a9fd8fc..8670471ea 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); }