[cogl/cogl-1.16] Rename _cogl_framebuffer_dirty to _cogl_framebuffer_mark_mid_scene

[Neil Roberts <nroberts src gnome org>]

commit 2a42576fe70dae3f1438545858991743f1113d2d
Author: Neil Roberts <neil linux intel com>
Date:   Wed May 29 16:59:27 2013 +0100

    Rename _cogl_framebuffer_dirty to _cogl_framebuffer_mark_mid_scene
    
    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)

 cogl/cogl-attribute.c           |    2 +-
 cogl/cogl-framebuffer-private.h |    2 +-
 cogl/cogl-framebuffer.c         |    4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/cogl/cogl-attribute.c b/cogl/cogl-attribute.c
index 8b7f3d5..b0ac790 100644
--- a/cogl/cogl-attribute.c
+++ b/cogl/cogl-attribute.c
@@ -636,7 +636,7 @@ _cogl_flush_attributes_state (CoglFramebuffer *framebuffer,
    * pixel and the scene is just comprised of simple rectangles still
    * in the journal. For this optimization to work we need to track
    * 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)) &&
       G_UNLIKELY (ctx->legacy_state_set) &&
diff --git a/cogl/cogl-framebuffer-private.h b/cogl/cogl-framebuffer-private.h
index 267dbf6..21f0d24 100644
--- a/cogl/cogl-framebuffer-private.h
+++ b/cogl/cogl-framebuffer-private.h
@@ -233,7 +233,7 @@ _cogl_framebuffer_clear_without_flush4f (CoglFramebuffer *framebuffer,
                                          float alpha);
 
 void
-_cogl_framebuffer_dirty (CoglFramebuffer *framebuffer);
+_cogl_framebuffer_mark_mid_scene (CoglFramebuffer *framebuffer);
 
 CoglClipState *
 _cogl_framebuffer_get_clip_state (CoglFramebuffer *framebuffer);
diff --git a/cogl/cogl-framebuffer.c b/cogl/cogl-framebuffer.c
index 4fc8e33..740154a 100644
--- a/cogl/cogl-framebuffer.c
+++ b/cogl/cogl-framebuffer.c
@@ -233,7 +233,7 @@ _cogl_framebuffer_clear_without_flush4f (CoglFramebuffer *framebuffer,
 }
 
 void
-_cogl_framebuffer_dirty (CoglFramebuffer *framebuffer)
+_cogl_framebuffer_mark_mid_scene (CoglFramebuffer *framebuffer)
 {
   framebuffer->clear_clip_dirty = TRUE;
 }
@@ -426,7 +426,7 @@ cleared:
         }
     }
   else
-    _cogl_framebuffer_dirty (framebuffer);
+    _cogl_framebuffer_mark_mid_scene (framebuffer);
 }
 
 /* Note: the 'buffers' and 'color' arguments were switched around on