cogl: Replace RectangleMapEntry with MtkRectangle

Avoids exposing the former in the next commit even if MtkRectangle
uses signed integers compared to RectangleMapEntry. But as
those rectangles are defined inside of Cogl, it should be okay
I guess?

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3909>

cogl/cogl-pango/cogl-pango-glyph-cache.c

@@ -186,7 +186,7 @@ cogl_pango_glyph_cache_free (CoglPangoGlyphCache *cache)
 static void
 cogl_pango_glyph_cache_update_position_cb (void               *user_data,
                                            CoglTexture        *new_texture,
-                                           const CoglRectangleMapEntry *rect)
+                                           const MtkRectangle *rect)
 {
   CoglPangoGlyphCacheValue *value = user_data;
   float tex_width, tex_height;

cogl/cogl/cogl-atlas-texture-private.h

@@ -46,7 +46,7 @@ struct _CoglAtlasTexture
 
   /* The rectangle that was used to add this texture to the
      atlas. This includes the 1-pixel border */
-  CoglRectangleMapEntry rectangle;
+  MtkRectangle rectangle;
 
   /* The atlas that this texture is in. If the texture is no longer in
      an atlas then this will be NULL. A reference is taken on the

cogl/cogl/cogl-atlas-texture.c

@@ -78,7 +78,7 @@ cogl_atlas_texture_dispose (GObject *object)
 
 static CoglTexture *
 _cogl_atlas_texture_create_sub_texture (CoglTexture        *full_texture,
-                                        const CoglRectangleMapEntry *rectangle)
+                                        const MtkRectangle *rectangle)
 {
   CoglContext *ctx = cogl_texture_get_context (full_texture);
   /* Create a subtexture for the given rectangle not including the
@@ -94,7 +94,7 @@ _cogl_atlas_texture_create_sub_texture (CoglTexture *full_texture,
 static void
 _cogl_atlas_texture_update_position_cb (void               *user_data,
                                         CoglTexture        *new_texture,
-                                        const CoglRectangleMapEntry *rectangle)
+                                        const MtkRectangle *rectangle)
 {
   CoglAtlasTexture *atlas_tex = user_data;
 
@@ -110,7 +110,7 @@ _cogl_atlas_texture_update_position_cb (void *user_data,
 
 static void
 _cogl_atlas_texture_pre_reorganize_foreach_cb
-                                         (const CoglRectangleMapEntry *entry,
+                                         (const MtkRectangle *entry,
                                           void *rectangle_data,
                                           void *user_data)
 {
@@ -154,7 +154,7 @@ typedef struct
 } CoglAtlasTextureGetRectanglesData;
 
 static void
-_cogl_atlas_texture_get_rectangles_cb (const CoglRectangleMapEntry *entry,
+_cogl_atlas_texture_get_rectangles_cb (const MtkRectangle *entry,
                                        void *rectangle_data,
                                        void *user_data)
 {

cogl/cogl/cogl-atlas.c

@@ -106,8 +106,8 @@ typedef struct _CoglAtlasRepositionData
   /* The current user data for this texture */
   void *user_data;
   /* The old and new positions of the texture */
-  CoglRectangleMapEntry old_position;
+  MtkRectangle old_position;
-  CoglRectangleMapEntry new_position;
+  MtkRectangle new_position;
 } CoglAtlasRepositionData;
 
 static void
@@ -165,7 +165,7 @@ typedef struct _CoglAtlasGetRectanglesData
 } CoglAtlasGetRectanglesData;
 
 static void
-_cogl_atlas_get_rectangles_cb (const CoglRectangleMapEntry *rectangle,
+_cogl_atlas_get_rectangles_cb (const MtkRectangle *rectangle,
                                void               *rect_data,
                                void               *user_data)
 {
@@ -393,7 +393,7 @@ cogl_atlas_reserve_space (CoglAtlas             *atlas,
   CoglTexture *new_tex;
   unsigned int map_width = 0, map_height = 0;
   gboolean ret;
-  CoglRectangleMapEntry new_position;
+  MtkRectangle new_position;
 
   /* Check if we can fit the rectangle into the existing map */
   if (atlas->map &&
@@ -557,7 +557,7 @@ cogl_atlas_reserve_space (CoglAtlas             *atlas,
 
 void
 _cogl_atlas_remove (CoglAtlas          *atlas,
-                    const CoglRectangleMapEntry *rectangle)
+                    const MtkRectangle *rectangle)
 {
   _cogl_rectangle_map_remove (atlas->map, rectangle);
 

cogl/cogl/cogl-atlas.h

@@ -34,7 +34,7 @@
 typedef void
 (* CoglAtlasUpdatePositionCallback) (void               *user_data,
                                      CoglTexture        *new_texture,
-                                     const CoglRectangleMapEntry *rect);
+                                     const MtkRectangle *rect);
 
 typedef enum
 {
@@ -84,7 +84,7 @@ cogl_atlas_reserve_space (CoglAtlas             *atlas,
 
 void
 _cogl_atlas_remove (CoglAtlas          *atlas,
-                    const CoglRectangleMapEntry *rectangle);
+                    const MtkRectangle *rectangle);
 
 CoglTexture *
 _cogl_atlas_copy_rectangle (CoglAtlas *atlas,

cogl/cogl/cogl-rectangle-map.c

@@ -79,7 +79,7 @@ struct _CoglRectangleMapNode
 {
   CoglRectangleMapNodeType type;
 
-  CoglRectangleMapEntry rectangle;
+  MtkRectangle rectangle;
 
   unsigned int largest_gap;
 
@@ -264,7 +264,7 @@ _cogl_rectangle_map_add (CoglRectangleMap *map,
                          unsigned int      width,
                          unsigned int      height,
                          void             *data,
-                         CoglRectangleMapEntry *rectangle)
+                         MtkRectangle     *rectangle)
 {
   unsigned int rectangle_size = width * height;
   /* Stack of nodes to search in */
@@ -380,7 +380,7 @@ _cogl_rectangle_map_add (CoglRectangleMap *map,
 
 void
 _cogl_rectangle_map_remove (CoglRectangleMap   *map,
-                            const CoglRectangleMapEntry *rectangle)
+                            const MtkRectangle *rectangle)
 {
   CoglRectangleMapNode *node = map->root;
   unsigned int rectangle_size = rectangle->width * rectangle->height;

cogl/cogl/cogl-rectangle-map.h

@@ -31,20 +31,14 @@
 #include <glib.h>
 
 #include "cogl/cogl-types.h"
+#include "mtk/mtk.h"
 
 typedef struct _CoglRectangleMap      CoglRectangleMap;
-typedef struct _CoglRectangleMapEntry CoglRectangleMapEntry;
 
-typedef void (* CoglRectangleMapCallback) (const CoglRectangleMapEntry *entry,
+typedef void (* CoglRectangleMapCallback) (const MtkRectangle *entry,
                                            void               *rectangle_data,
                                            void               *user_data);
 
-struct _CoglRectangleMapEntry
-{
-  unsigned int x, y;
-  unsigned int width, height;
-};
-
 CoglRectangleMap *
 _cogl_rectangle_map_new (unsigned int width,
                          unsigned int height,
@@ -55,11 +49,11 @@ _cogl_rectangle_map_add (CoglRectangleMap *map,
                          unsigned int     width,
                          unsigned int     height,
                          void            *data,
-                         CoglRectangleMapEntry *rectangle);
+                         MtkRectangle    *rectangle);
 
 void
 _cogl_rectangle_map_remove (CoglRectangleMap   *map,
-                            const CoglRectangleMapEntry *rectangle);
+                            const MtkRectangle *rectangle);
 
 unsigned int
 _cogl_rectangle_map_get_width (CoglRectangleMap *map);