diff options
| author | Robert Bragg <robert@linux.intel.com> | 2011-11-03 13:04:26 +0000 |
|---|---|---|
| committer | Robert Bragg <robert@linux.intel.com> | 2011-11-03 13:57:06 +0000 |
| commit | e2c758c105c044f16e3834a34c28a957c5da1596 (patch) | |
| tree | 2ddb50a9c2e54f8dfb3c8f57e45b2a164e057c58 | |
| parent | 11d38e7ce85d43a45ec29004b02cb29a8b5ce4dc (diff) | |
| download | cogl-e2c758c105c044f16e3834a34c28a957c5da1596.tar.gz | |
clip: make cogl_clip_ensure a NOP
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>
| -rw-r--r-- | cogl/cogl-clip-state.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/cogl/cogl-clip-state.c b/cogl/cogl-clip-state.c index 9de2a8f4..a68a2f00 100644 --- a/cogl/cogl-clip-state.c +++ b/cogl/cogl-clip-state.c @@ -185,16 +185,12 @@ _cogl_clip_state_flush (CoglClipState *clip_state, void cogl_clip_ensure (void) { - CoglFramebuffer *framebuffer = cogl_get_draw_framebuffer (); - CoglClipState *clip_state; - - clip_state = _cogl_framebuffer_get_clip_state (framebuffer); - /* Flushing the clip state doesn't cause the journal to be - 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); + /* Do nothing. + * + * This API shouldn't be used by anyone and the documented semantics + * are basically vague enough that we can get away with doing + * nothing here. + */ } static void |