From: Benjamin Otte <otte@redhat.com>
Date: Tue, 9 May 2023 20:30:49 +0000 (+0200)
Subject: vulkan: Make quarks global variables
X-Git-Tag: archive/raspbian/4.12.3+ds-1+rpi1~1^2^2^2~22^2~1^2~185^2~56
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=34f4493c3607302c450d57df1ef5c915d4bf7f24;p=gtk4.git

vulkan: Make quarks global variables

I don't want to ensure there's a RenderPass available everywhere and
recreate the quarks in each, I just want to use them.
---

diff --git a/gsk/vulkan/gskvulkanrenderpass.c b/gsk/vulkan/gskvulkanrenderpass.c
index ab2713c699..0710222dc4 100644
--- a/gsk/vulkan/gskvulkanrenderpass.c
+++ b/gsk/vulkan/gskvulkanrenderpass.c
@@ -125,11 +125,13 @@ struct _GskVulkanRenderPass
   VkSemaphore signal_semaphore;
   GArray *wait_semaphores;
   GskVulkanBuffer *vertex_data;
-
-  GQuark fallback_pixels;
-  GQuark texture_pixels;
 };
 
+#ifdef G_ENABLE_DEBUG
+static GQuark fallback_pixels_quark;
+static GQuark texture_pixels_quark;
+#endif
+
 GskVulkanRenderPass *
 gsk_vulkan_render_pass_new (GdkVulkanContext  *context,
                             GskVulkanImage    *target,
@@ -209,8 +211,11 @@ gsk_vulkan_render_pass_new (GdkVulkanContext  *context,
   self->vertex_data = NULL;
 
 #ifdef G_ENABLE_DEBUG
-  self->fallback_pixels = g_quark_from_static_string ("fallback-pixels");
-  self->texture_pixels = g_quark_from_static_string ("texture-pixels");
+  if (fallback_pixels_quark == 0)
+    {
+      fallback_pixels_quark = g_quark_from_static_string ("fallback-pixels");
+      texture_pixels_quark = g_quark_from_static_string ("texture-pixels");
+    }
 #endif
 
   return self;
@@ -1033,7 +1038,7 @@ gsk_vulkan_render_pass_render_offscreen (GdkVulkanContext      *vulkan,
   {
     GskProfiler *profiler = gsk_renderer_get_profiler (gsk_vulkan_render_get_renderer (render));
     gsk_profiler_counter_add (profiler,
-                              g_quark_from_static_string ("texture-pixels"),
+                              texture_pixels_quark,
                               view.size.width * view.size.height);
   }
 #endif
@@ -1141,7 +1146,7 @@ gsk_vulkan_render_pass_get_node_as_texture (GskVulkanRenderPass   *self,
   {
     GskProfiler *profiler = gsk_renderer_get_profiler (gsk_vulkan_render_get_renderer (render));
     gsk_profiler_counter_add (profiler,
-                              self->fallback_pixels,
+                              fallback_pixels_quark,
                               ceil (node->bounds.size.width) * ceil (node->bounds.size.height));
   }
 #endif
@@ -1195,7 +1200,7 @@ gsk_vulkan_render_pass_upload_fallback (GskVulkanRenderPass  *self,
   {
     GskProfiler *profiler = gsk_renderer_get_profiler (gsk_vulkan_render_get_renderer (render));
     gsk_profiler_counter_add (profiler,
-                              self->fallback_pixels,
+                              fallback_pixels_quark,
                               ceil (node->bounds.size.width) * ceil (node->bounds.size.height));
   }
 #endif