brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

journal: start uprof flush timer after flushing fb deps

Browse Source 
This avoids us recursively starting the _cogl_journal_flush uprof timer
by only starting it after flushing the journals of dependency
framebuffers.
This commit is contained in:
Robert Bragg 2011-01-21 17:38:14 +00:00
parent f9d4846d6a
commit 1973168bba
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
clutter/cogl/cogl/cogl-journal.c
View File

@ -1292,14 +1292,16 @@ _cogl_journal_flush (CoglJournal *journal,
if (journal->entries->len == 0) if (journal->entries->len == 0)
return; return;
COGL_TIMER_START (_cogl_uprof_context, flush_timer);
/* The entries in this journal may depend on images in other /* The entries in this journal may depend on images in other
* framebuffers which may require that we flush the journals * framebuffers which may require that we flush the journals
* associated with those framebuffers before we can flush * associated with those framebuffers before we can flush
* this journal... */ * this journal... */
_cogl_framebuffer_flush_dependency_journals (framebuffer); _cogl_framebuffer_flush_dependency_journals (framebuffer);
/* Note: we start the timer after flushing dependency journals so
* that the timer isn't started recursively. */
COGL_TIMER_START (_cogl_uprof_context, flush_timer);
cogl_push_framebuffer (framebuffer); cogl_push_framebuffer (framebuffer);
if (G_UNLIKELY (cogl_debug_flags & COGL_DEBUG_BATCHING)) if (G_UNLIKELY (cogl_debug_flags & COGL_DEBUG_BATCHING))