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

clip: make cogl_clip_ensure a NOP

Browse Source 
This api is deprecated and documented to be a NOP which wasn't actually
true. This patch actually updates the function to be a NOP. Its nice
that this gets rid of a point where we flush framebuffer state because
we are looking to add a new VirtualFramebuffer interface which will need
special consideration at each of the points we flush framebuffer state.

It was a mistake that this API was ever published, we don't believe
anyone is using the api but until we break api we have to keep the
symbol. The documented semantics are vague enough that a NOP is ok since
we never explicitly documented how the state would be flushed to GL so
there would be no way to reliably use that state anyway.

Reviewed-by: Neil Roberts <neil@linux.intel.com>
This commit is contained in:
Robert Bragg 2011-11-03 13:04:26 +00:00
parent 11d38e7ce8
commit e2c758c105
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cogl/cogl-clip-state.c
View File

@ -185,16 +185,12 @@ _cogl_clip_state_flush (CoglClipState *clip_state,
void void
cogl_clip_ensure (void) cogl_clip_ensure (void)
{ {
CoglFramebuffer *framebuffer = cogl_get_draw_framebuffer (); /* Do nothing.
CoglClipState *clip_state; *
* This API shouldn't be used by anyone and the documented semantics
clip_state = _cogl_framebuffer_get_clip_state (framebuffer); * are basically vague enough that we can get away with doing
/* Flushing the clip state doesn't cause the journal to be * nothing here.
flushed. This function may be being called by an external */
application however so it makes sense to flush the journal
here */
_cogl_framebuffer_flush_journal (framebuffer);
_cogl_clip_state_flush (clip_state, framebuffer);
} }
static void static void