[Cogl] [PATCH 1/2] Rename _cogl_framebuffer_dirty to _cogl_framebuffer_mark_mid_scene

Neil Roberts neil at linux.intel.com
Wed May 29 09:44:37 PDT 2013


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.
---
 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 0929170..60ce52c 100644
--- a/cogl/cogl-attribute.c
+++ b/cogl/cogl-attribute.c
@@ -635,7 +635,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);
 
   ctx->driver_vtable->flush_attributes_state (framebuffer,
                                               pipeline,
diff --git a/cogl/cogl-framebuffer-private.h b/cogl/cogl-framebuffer-private.h
index cd2739a..bc1b4c9 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 883b37b..a6a9a8d 100644
--- a/cogl/cogl-framebuffer.c
+++ b/cogl/cogl-framebuffer.c
@@ -225,7 +225,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;
 }
@@ -381,7 +381,7 @@ cleared:
         }
     }
   else
-    _cogl_framebuffer_dirty (framebuffer);
+    _cogl_framebuffer_mark_mid_scene (framebuffer);
 }
 
 /* Note: the 'buffers' and 'color' arguments were switched around on
-- 
1.7.11.3.g3c3efa5



More information about the Cogl mailing list