gsk: Use the new debug macros

diff --git a/gsk/gl/gskgltexturelibrary.c b/gsk/gl/gskgltexturelibrary.c
index 24d3c5ab12524662ab1552458536f4a7e43e8e03..c2ec0f84ab1ee2166c812dd681b47ec3ebbc4439 100644 (file)
--- a/gsk/gl/gskgltexturelibrary.c
+++ b/gsk/gl/gskgltexturelibrary.c
@@ -74,9 +74,9 @@ gsk_gl_texture_library_real_compact (GskGLTextureLibrary *self,
 
       if (gsk_gl_texture_atlas_get_unused_ratio (atlas) > MAX_OLD_RATIO)
         {
-          GSK_NOTE (GLYPH_CACHE,
-                    g_message ("Dropping atlas %d (%g.2%% old)", i,
-                               100.0 * gsk_gl_texture_atlas_get_unused_ratio (atlas)));
+          GSK_DEBUG (GLYPH_CACHE,
+                     "Dropping atlas %d (%g.2%% old)", i,
+                     100.0 * gsk_gl_texture_atlas_get_unused_ratio (atlas));
           if (removed == NULL)
             removed = g_ptr_array_new_with_free_func ((GDestroyNotify)gsk_gl_texture_atlas_free);
           g_ptr_array_add (removed, g_ptr_array_steal_index (self->atlases, i - 1));
@@ -122,14 +122,14 @@ gsk_gl_texture_library_real_compact (GskGLTextureLibrary *self,
             }
         }
 
-      GSK_NOTE (GLYPH_CACHE, g_message ("%s: Dropped %d individual items",
-                                        G_OBJECT_TYPE_NAME (self),
-                                        dropped);
-                             g_message ("%s: %d items cached (%d atlased, %d individually)",
-                                        G_OBJECT_TYPE_NAME (self),
-                                        g_hash_table_size (self->hash_table),
-                                        atlased,
-                                        g_hash_table_size (self->hash_table) - atlased));
+      GSK_DEBUG (GLYPH_CACHE, "%s: Dropped %d individual items",
+                              G_OBJECT_TYPE_NAME (self),
+                              dropped);
+      GSK_DEBUG (GLYPH_CACHE, "%s: %d items cached (%d atlased, %d individually)",
+                              G_OBJECT_TYPE_NAME (self),
+                              g_hash_table_size (self->hash_table),
+                              atlased,
+                              g_hash_table_size (self->hash_table) - atlased);
 
       if (dropped > 0)
         gsk_gl_texture_library_clear_cache (self);
@@ -139,17 +139,20 @@ gsk_gl_texture_library_real_compact (GskGLTextureLibrary *self,
       g_clear_pointer (&removed, g_ptr_array_unref);
     }
 
-  GSK_NOTE (GLYPH_CACHE, {
-    static gint64 last_message;
-    gint64 now = g_get_monotonic_time ();
-    if (now - last_message > G_USEC_PER_SEC)
-      {
-        last_message = now;
-        g_message ("%s contains %d atlases",
-                   G_OBJECT_TYPE_NAME (self),
-                   self->atlases->len);
-      }
-  });
+#ifdef G_ENABLE_DEBUG
+  if (GSK_DEBUG_CHECK (GLYPH_CACHE))
+    {
+      static gint64 last_message;
+      gint64 now = g_get_monotonic_time ();
+      if (now - last_message > G_USEC_PER_SEC)
+        {
+          last_message = now;
+          gdk_debug_message ("%s contains %d atlases",
+                             G_OBJECT_TYPE_NAME (self),
+                             self->atlases->len);
+        }
+    }
+#endif
 
   return ret;
 }

diff --git a/gsk/gskdebug.c b/gsk/gskdebug.c
index 83a3619fe738bdec81ed4b5a5b400549b41029cf..cda64af2fae2f10c51e35b70dd0afb1b3d5300fb 100644 (file)
--- a/gsk/gskdebug.c
+++ b/gsk/gskdebug.c
@@ -1,3 +1,5 @@
+#include "config.h"
+
 #include "gskdebugprivate.h"
 #include "gdk/gdk-private.h"
 

diff --git a/gsk/gskrenderer.c b/gsk/gskrenderer.c
index a3ceb0172b154ee57cec07f69d07fe3a2da74dde..eeb640850654ddf47d3b97bea19b9373244296c1 100644 (file)
--- a/gsk/gskrenderer.c
+++ b/gsk/gskrenderer.c
@@ -648,10 +648,10 @@ gsk_renderer_new_for_surface (GdkSurface *surface)
 
       if (gsk_renderer_realize (renderer, surface, &error))
         {
-          GSK_RENDERER_NOTE (renderer, RENDERER,
-              g_message ("Using renderer of type '%s' for surface '%s'\n",
-                         G_OBJECT_TYPE_NAME (renderer),
-                         G_OBJECT_TYPE_NAME (surface)));
+          GSK_RENDERER_DEBUG (renderer, RENDERER,
+                              "Using renderer of type '%s' for surface '%s'",
+                              G_OBJECT_TYPE_NAME (renderer),
+                              G_OBJECT_TYPE_NAME (surface));
           return renderer;
         }
 

diff --git a/gsk/gskrendernode.c b/gsk/gskrendernode.c
index 14a29c358c65cd9017a1a5efffab409c2df731de..1587ab61b3289612830c920712a5ed8d58ce09fa 100644 (file)
--- a/gsk/gskrendernode.c
+++ b/gsk/gskrendernode.c
@@ -439,9 +439,9 @@ gsk_render_node_draw (GskRenderNode *node,
 
   cairo_save (cr);
 
-  GSK_NOTE (CAIRO, g_message ("Rendering node %s[%p]",
-                              g_type_name_from_instance ((GTypeInstance *) node),
-                              node));
+  GSK_DEBUG (CAIRO, "Rendering node %s[%p]",
+                    g_type_name_from_instance ((GTypeInstance *) node),
+                    node);
 
   GSK_RENDER_NODE_GET_CLASS (node)->draw (node, cr);
 

diff --git a/gsk/gskrendernodeimpl.c b/gsk/gskrendernodeimpl.c
index c43a4636c1561863d558364a100c3e75507ede7b..ef5158313f42a883f7502d3829dffce8d3960830 100644 (file)
--- a/gsk/gskrendernodeimpl.c
+++ b/gsk/gskrendernodeimpl.c
@@ -2881,10 +2881,10 @@ gsk_transform_node_draw (GskRenderNode *node,
 
   gsk_transform_to_2d (self->transform, &xx, &yx, &xy, &yy, &dx, &dy);
   cairo_matrix_init (&ctm, xx, yx, xy, yy, dx, dy);
-  GSK_NOTE (CAIRO, g_message ("CTM = { .xx = %g, .yx = %g, .xy = %g, .yy = %g, .x0 = %g, .y0 = %g }",
-                            ctm.xx, ctm.yx,
-                            ctm.xy, ctm.yy,
-                            ctm.x0, ctm.y0));
+  GSK_DEBUG (CAIRO, "CTM = { .xx = %g, .yx = %g, .xy = %g, .yy = %g, .x0 = %g, .y0 = %g }",
+                    ctm.xx, ctm.yx,
+                    ctm.xy, ctm.yy,
+                    ctm.x0, ctm.y0);
   if (xx * yy == xy * yx)
     {
       /* broken matrix here. This can happen during transitions

diff --git a/gsk/vulkan/gskvulkanglyphcache.c b/gsk/vulkan/gskvulkanglyphcache.c
index 830b4d70c9e0efab26e0a72bd9ab48c0bd99920f..f1adefafca61a623fafb6ebc1edb2ff8e3a6f32f 100644 (file)
--- a/gsk/vulkan/gskvulkanglyphcache.c
+++ b/gsk/vulkan/gskvulkanglyphcache.c
@@ -309,8 +309,8 @@ upload_dirty_glyphs (GskVulkanGlyphCache *cache,
   for (l = atlas->dirty_glyphs, i = 0; l; l = l->next, i++)
     render_glyph (atlas, (DirtyGlyph *)l->data, &regions[i]);
 
-  GSK_RENDERER_NOTE (cache->renderer, GLYPH_CACHE,
-            g_message ("uploading %d glyphs to cache", num_regions));
+  GSK_RENDERER_DEBUG (cache->renderer, GLYPH_CACHE,
+                      "uploading %d glyphs to cache", num_regions);
 
   gsk_vulkan_image_upload_regions (atlas->image, uploader, num_regions, regions);
 
@@ -471,8 +471,9 @@ gsk_vulkan_glyph_cache_begin_frame (GskVulkanGlyphCache *cache)
 
       if (atlas->old_pixels > MAX_OLD * atlas->width * atlas->height)
         {
-          GSK_RENDERER_NOTE(cache->renderer, GLYPH_CACHE,
-                   g_message ("Dropping atlas %d (%g.2%% old)", i, 100.0 * (double)atlas->old_pixels / (double)(atlas->width * atlas->height)));
+          GSK_RENDERER_DEBUG (cache->renderer, GLYPH_CACHE,
+                              "Dropping atlas %d (%g.2%% old)",
+                              i, 100.0 * (double)atlas->old_pixels / (double)(atlas->width * atlas->height));
           g_ptr_array_remove_index (cache->atlases, i);
 
           drops[i] = 1;
@@ -501,5 +502,5 @@ gsk_vulkan_glyph_cache_begin_frame (GskVulkanGlyphCache *cache)
         }
     }
 
-  GSK_RENDERER_NOTE(cache->renderer, GLYPH_CACHE, g_message ("Dropped %d glyphs", dropped));
+  GSK_RENDERER_DEBUG (cache->renderer, GLYPH_CACHE, "Dropped %d glyphs", dropped);
 }

diff --git a/gsk/vulkan/gskvulkanpipelineprivate.h b/gsk/vulkan/gskvulkanpipelineprivate.h
index cd41f822b373f65b65dbcba7491ccc1eb378518a..9adf44a1b643010d4016541c9ffcfaac51eadd38 100644 (file)
--- a/gsk/vulkan/gskvulkanpipelineprivate.h
+++ b/gsk/vulkan/gskvulkanpipelineprivate.h
@@ -25,7 +25,7 @@ gsk_vulkan_handle_result (VkResult    res,
 {
   if (res != VK_SUCCESS)
     {
-      GSK_NOTE (VULKAN,g_printerr ("%s(): %s (%d)\n", called_function, gdk_vulkan_strerror (res), res));
+      GSK_DEBUG (VULKAN, "%s(): %s (%d)", called_function, gdk_vulkan_strerror (res), res);
     }
   return res;
 }

diff --git a/gsk/vulkan/gskvulkanrenderpass.c b/gsk/vulkan/gskvulkanrenderpass.c
index 34b035245a1fd078462aa0c250fea8dee7cea5ce..48127e20b981d63ec0e4df2ae09a7a017c5b9deb 100644 (file)
--- a/gsk/vulkan/gskvulkanrenderpass.c
+++ b/gsk/vulkan/gskvulkanrenderpass.c
@@ -235,7 +235,7 @@ gsk_vulkan_render_pass_free (GskVulkanRenderPass *self)
 }
 
 #define FALLBACK(...) G_STMT_START { \
-  GSK_RENDERER_NOTE (gsk_vulkan_render_get_renderer (render), FALLBACK, g_message (__VA_ARGS__)); \
+  GSK_RENDERER_DEBUG (gsk_vulkan_render_get_renderer (render), FALLBACK, __VA_ARGS__); \
   goto fallback; \
 }G_STMT_END
 
@@ -763,9 +763,9 @@ gsk_vulkan_render_pass_get_node_as_texture (GskVulkanRenderPass   *self,
       }
    }
 
-  GSK_RENDERER_NOTE (gsk_vulkan_render_get_renderer (render), FALLBACK, g_message ("Node as texture not implemented for this case. Using %gx%g fallback surface",
-                               ceil (bounds->size.width),
-                               ceil (bounds->size.height)));
+  GSK_RENDERER_DEBUG (gsk_vulkan_render_get_renderer (render), FALLBACK, "Node as texture not implemented for this case. Using %gx%g fallback surface",
+                      ceil (bounds->size.width),
+                      ceil (bounds->size.height));
 #ifdef G_ENABLE_DEBUG
   {
     GskProfiler *profiler = gsk_renderer_get_profiler (gsk_vulkan_render_get_renderer (render));
@@ -816,13 +816,13 @@ gsk_vulkan_render_pass_upload_fallback (GskVulkanRenderPass  *self,
 
   node = op->node;
 
-  GSK_RENDERER_NOTE (gsk_vulkan_render_get_renderer (render), FALLBACK,
-            g_message ("Upload op=%s, node %s[%p], bounds %gx%g",
-                     op->type == GSK_VULKAN_OP_FALLBACK_CLIP ? "fallback-clip" :
-                     (op->type == GSK_VULKAN_OP_FALLBACK_ROUNDED_CLIP ? "fallback-rounded-clip" : "fallback"),
-                     g_type_name_from_instance ((GTypeInstance *) node), node,
-                     ceil (node->bounds.size.width),
-                     ceil (node->bounds.size.height)));
+  GSK_RENDERER_DEBUG (gsk_vulkan_render_get_renderer (render), FALLBACK,
+                      "Upload op=%s, node %s[%p], bounds %gx%g",
+                      op->type == GSK_VULKAN_OP_FALLBACK_CLIP ? "fallback-clip" :
+                      (op->type == GSK_VULKAN_OP_FALLBACK_ROUNDED_CLIP ? "fallback-rounded-clip" : "fallback"),
+                      g_type_name_from_instance ((GTypeInstance *) node), node,
+                      ceil (node->bounds.size.width),
+                      ceil (node->bounds.size.height));
 #ifdef G_ENABLE_DEBUG
   {
     GskProfiler *profiler = gsk_renderer_get_profiler (gsk_vulkan_render_get_renderer (render));

diff --git a/gsk/vulkan/gskvulkanshader.c b/gsk/vulkan/gskvulkanshader.c
index 0446412ea7852fa3cb482e70aaf3cf9b6c8bd92e..bd7475a7f07d7624e8c577ab0bef7038b404e0b1 100644 (file)
--- a/gsk/vulkan/gskvulkanshader.c
+++ b/gsk/vulkan/gskvulkanshader.c
@@ -65,7 +65,7 @@ gsk_vulkan_shader_new_from_resource (GdkVulkanContext     *context,
   g_free (path);
   if (bytes == NULL)
     {
-      GSK_NOTE (VULKAN, g_message ("Error loading shader data: %s", local_error->message));
+      GSK_DEBUG (VULKAN, "Error loading shader data: %s", local_error->message);
       g_propagate_error (error, local_error);
       return NULL;
     }