[gegl] buffer: add gegl_tile_handler_damage_tile(); use in GeglTile

[Ell <ell src gnome org>]

commit 637f458cc28140f235c30966f0c9ffeda0bbc240
Author: Ell <ell_se yahoo com>
Date:   Wed Nov 28 03:52:07 2018 -0500

    buffer: add gegl_tile_handler_damage_tile(); use in GeglTile
    
    Move the single-tile pyramid-damaging code from GeglTile to a new
    gegl_tile_handler_damage_tile() function, to complement
    gegl_tile_handler_damage_rect(), so that we can damage the pyramid
    using a damage mask without having an actual GeglTile object.

 gegl/buffer/gegl-tile-handler.c | 54 +++++++++++++++++++++++++++++++++++++++++
 gegl/buffer/gegl-tile-handler.h |  5 ++++
 gegl/buffer/gegl-tile.c         | 52 +++------------------------------------
 3 files changed, 62 insertions(+), 49 deletions(-)
---
diff --git a/gegl/buffer/gegl-tile-handler.c b/gegl/buffer/gegl-tile-handler.c
index 86318b869..1748d38ef 100644
--- a/gegl/buffer/gegl-tile-handler.c
+++ b/gegl/buffer/gegl-tile-handler.c
@@ -222,6 +222,60 @@ gegl_tile_handler_dup_tile (GeglTileHandler *handler,
   return tile;
 }
 
+void
+gegl_tile_handler_damage_tile (GeglTileHandler *handler,
+                               gint             x,
+                               gint             y,
+                               gint             z,
+                               guint64          damage)
+{
+  GeglTileSource *source;
+
+  g_return_if_fail (GEGL_IS_TILE_HANDLER (handler));
+
+  if (z != 0                        ||
+      ! damage                      ||
+      ! handler->priv->tile_storage ||
+      ! handler->priv->tile_storage->seen_zoom)
+    {
+      return;
+    }
+
+  source = GEGL_TILE_SOURCE (handler);
+
+  g_rec_mutex_lock (&handler->priv->tile_storage->mutex);
+
+  while (z < handler->priv->tile_storage->seen_zoom)
+    {
+      guint new_damage;
+      guint mask;
+      gint  i;
+
+      damage |= damage >> 1;
+      damage |= damage >> 2;
+
+      new_damage = 0;
+      mask       = 1;
+
+      for (i = 0; i < 16; i++)
+        {
+          new_damage |= damage & mask;
+          damage >>= 3;
+          mask   <<= 1;
+        }
+
+      damage = (guint64) new_damage << (32 * (y & 1) + 16 * (x & 1));
+
+      x >>= 1;
+      y >>= 1;
+      z++;
+
+      gegl_tile_source_command (source, GEGL_TILE_VOID, x, y, z, &damage);
+    }
+
+  g_rec_mutex_unlock (&handler->priv->tile_storage->mutex);
+}
+
 void
 gegl_tile_handler_damage_rect (GeglTileHandler     *handler,
                                const GeglRectangle *rect)
diff --git a/gegl/buffer/gegl-tile-handler.h b/gegl/buffer/gegl-tile-handler.h
index 72e77a05e..2134c1f38 100644
--- a/gegl/buffer/gegl-tile-handler.h
+++ b/gegl/buffer/gegl-tile-handler.h
@@ -101,6 +101,11 @@ GeglTile * gegl_tile_handler_dup_tile    (GeglTileHandler *handler,
                                           gint             y,
                                           gint             z);
 
+void       gegl_tile_handler_damage_tile (GeglTileHandler     *handler,
+                                          gint                 x,
+                                          gint                 y,
+                                          gint                 z,
+                                          guint64              damage);
 void       gegl_tile_handler_damage_rect (GeglTileHandler     *handler,
                                           const GeglRectangle *rect);
 
diff --git a/gegl/buffer/gegl-tile.c b/gegl/buffer/gegl-tile.c
index eeab7e73f..b7dc76f2d 100644
--- a/gegl/buffer/gegl-tile.c
+++ b/gegl/buffer/gegl-tile.c
@@ -295,44 +295,6 @@ gegl_tile_lock (GeglTile *tile)
     }
 }
 
-static inline void
-_gegl_tile_void_pyramid (GeglTileSource *source,
-                         gint            x,
-                         gint            y,
-                         gint            z,
-                         guint64         damage)
-{
-  guint new_damage;
-  guint mask;
-  gint  i;
-
-  if (z >= ((GeglTileStorage*)source)->seen_zoom)
-    return;
-
-  damage |= damage >> 1;
-  damage |= damage >> 2;
-
-  new_damage = 0;
-  mask       = 1;
-
-  for (i = 0; i < 16; i++)
-    {
-      new_damage |= damage & mask;
-      damage >>= 3;
-      mask   <<= 1;
-    }
-
-  damage = (guint64) new_damage << (32 * (y & 1) + 16 * (x & 1));
-
-  x >>= 1;
-  y >>= 1;
-  z++;
-
-  gegl_tile_source_command (source, GEGL_TILE_VOID, x, y, z, &damage);
-
-  _gegl_tile_void_pyramid (source, x, y, z, damage);
-}
-
 static inline void
 gegl_tile_void_pyramid (GeglTile *tile,
                         guint64   damage)
@@ -341,17 +303,9 @@ gegl_tile_void_pyramid (GeglTile *tile,
       tile->tile_storage->seen_zoom &&
       tile->z == 0) /* we only accepting voiding the base level */
     {
-      g_rec_mutex_lock (&tile->tile_storage->mutex);
-
-      _gegl_tile_void_pyramid (GEGL_TILE_SOURCE (tile->tile_storage),
-                               tile->x,
-                               tile->y,
-                               tile->z,
-                               damage);
-
-      g_rec_mutex_unlock (&tile->tile_storage->mutex);
-
-      return;
+      gegl_tile_handler_damage_tile (GEGL_TILE_HANDLER (tile->tile_storage),
+                                     tile->x, tile->y, tile->z,
+                                     damage);
     }
 }