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

cogl-framebuffer: Flush journal when creating fbo

Browse Source 
Since framebuffer state is not flushed prior to replaying the journal,
the trick of marking the framebuffer dirty prior to calling
glBindFramebuffer() doesn't work... the outstanding journal entries
will get replayed to the newly created framebuffer.

Fix this by flushing the journal as well.

http://bugzilla.openedhand.com/show_bug.cgi?id=2110

Signed-off-by: Robert Bragg <robert@linux.intel.com>
This commit is contained in:
Owen W. Taylor 2010-05-08 16:58:14 -04:00 committed by Robert Bragg
parent b3de036c97
commit af37a1029f
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
clutter/cogl/cogl/cogl-framebuffer.c
View File

@ -273,8 +273,11 @@ try_creating_fbo (CoglOffscreen *offscreen,
) )
return FALSE; return FALSE;
/* We are about to generate and bind a new fbo, so when next flushing the /* We are about to generate and bind a new fbo, so we pretend to change framebuffer
* journal, we will need to rebind the current framebuffer... */ * state so that the old framebuffer will be rebound again before drawing.
* The framebuffer state can't be changed while their are active entries, so flush
* first. */
_cogl_journal_flush ();
ctx->dirty_bound_framebuffer = 1; ctx->dirty_bound_framebuffer = 1;
/* Generate framebuffer */ /* Generate framebuffer */