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

Rename _cogl_framebuffer_dirty to _cogl_framebuffer_mark_mid_scene

Browse Source 
In some later patches we want to be able to use the term ‘dirty’ as a
public facing concept which represents expose events from the window
system. In that case the internal concept of dirtying the framebuffer
is confusing, so this patch changes the name to instead mean that
we've doing something which causes the framebuffer to be in the middle
of a frame.

Reviewed-by: Robert Bragg <robert@linux.intel.com>

(cherry picked from commit 88eed85b52c29f66659ea112038f3522c9bd864e)
This commit is contained in:
Neil Roberts 2013-05-29 16:59:27 +01:00
parent 0b2b46ce4c
commit 2a42576fe7
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cogl/cogl-attribute.c
View File

@ -636,7 +636,7 @@ _cogl_flush_attributes_state (CoglFramebuffer *framebuffer,
* pixel and the scene is just comprised of simple rectangles still * pixel and the scene is just comprised of simple rectangles still
* in the journal. For this optimization to work we need to track * in the journal. For this optimization to work we need to track
* when the framebuffer really does get drawn to. */ * when the framebuffer really does get drawn to. */
_cogl_framebuffer_dirty (framebuffer); _cogl_framebuffer_mark_mid_scene (framebuffer);
if (G_UNLIKELY (!(flags & COGL_DRAW_SKIP_LEGACY_STATE)) && if (G_UNLIKELY (!(flags & COGL_DRAW_SKIP_LEGACY_STATE)) &&
G_UNLIKELY (ctx->legacy_state_set) && G_UNLIKELY (ctx->legacy_state_set) &&

2
cogl/cogl-framebuffer-private.h
View File

@ -233,7 +233,7 @@ _cogl_framebuffer_clear_without_flush4f (CoglFramebuffer *framebuffer,
float alpha); float alpha);
void void
_cogl_framebuffer_dirty (CoglFramebuffer *framebuffer); _cogl_framebuffer_mark_mid_scene (CoglFramebuffer *framebuffer);
CoglClipState * CoglClipState *
_cogl_framebuffer_get_clip_state (CoglFramebuffer *framebuffer); _cogl_framebuffer_get_clip_state (CoglFramebuffer *framebuffer);

4
cogl/cogl-framebuffer.c
View File

@ -233,7 +233,7 @@ _cogl_framebuffer_clear_without_flush4f (CoglFramebuffer *framebuffer,
} }
void void
_cogl_framebuffer_dirty (CoglFramebuffer *framebuffer) _cogl_framebuffer_mark_mid_scene (CoglFramebuffer *framebuffer)
{ {
framebuffer->clear_clip_dirty = TRUE; framebuffer->clear_clip_dirty = TRUE;
} }
@ -426,7 +426,7 @@ cleared:
} }
} }
else else
_cogl_framebuffer_dirty (framebuffer); _cogl_framebuffer_mark_mid_scene (framebuffer);
} }
/* Note: the 'buffers' and 'color' arguments were switched around on /* Note: the 'buffers' and 'color' arguments were switched around on