isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-23 00:20:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

journal: Don't push and pop the framebuffer when flushing

Browse Source 
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 <robert@linux.intel.com>
This commit is contained in:
Neil Roberts 2012-03-16 17:31:03 +00:00
parent ff48f3b174
commit a5f2f0fe2d
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cogl/cogl-journal.c
View File

@ -1381,8 +1381,6 @@ _cogl_journal_flush (CoglJournal *journal)
* that the timer isn't started recursively. */ * that the timer isn't started recursively. */
COGL_TIMER_START (_cogl_uprof_context, flush_timer); COGL_TIMER_START (_cogl_uprof_context, flush_timer);
cogl_push_framebuffer (journal->framebuffer);
if (G_UNLIKELY (COGL_DEBUG_ENABLED (COGL_DEBUG_BATCHING))) if (G_UNLIKELY (COGL_DEBUG_ENABLED (COGL_DEBUG_BATCHING)))
g_print ("BATCHING: journal len = %d\n", journal->entries->len); g_print ("BATCHING: journal len = %d\n", journal->entries->len);
@ -1465,8 +1463,6 @@ _cogl_journal_flush (CoglJournal *journal)
_cogl_journal_discard (journal); _cogl_journal_discard (journal);
cogl_pop_framebuffer ();
COGL_TIMER_STOP (_cogl_uprof_context, flush_timer); COGL_TIMER_STOP (_cogl_uprof_context, flush_timer);
} }