widget-factory: add example on styling tooltip window

by using new api: gtk_tooltip_set_css_class() GtkWidget signals 'tooltip-show' and 'tooltip-hide' Part of #5925
GtkWidget: add new signals 'tooltip-show' and 'tooltip-hide'
2023-07-09 17:07:09 -04:00 · 2023-07-09 17:07:09 -04:00 · 2023-07-09 17:07:09 -04:00 · 2023-07-07 01:15:56 +00:00 · 2023-07-06 23:57:16 +00:00 · 2023-07-06 16:24:29 -07:00
95 changed files with 2222 additions and 1685 deletions
@@ -0,0 +1,2 @@
+[flake8]
+ignore = E501
@@ -1,4 +1,7 @@
-Overview of Changes in 4.11.4, xx-xx-xxxx
+Overview of Changes in 4.11.5, xx-xx-xxxx
+=========================================
+
+Overview of Changes in 4.11.4, 03-07-2023
 =========================================

 * GtkFileChooser:
@@ -20,16 +23,31 @@ Overview of Changes in 4.11.4, xx-xx-xxxx
 * GtkWindow:
 - Clear the resize cursors to avoid artifacts

+* GtkFileDialog:
+ - Always set initial-folder
+
+* GtkDropDown:
+ - Update on expression changes
+
+* GtkMapListModel:
+ - Implement GtkSectionModel
+
 * Accessibility:
 - Improvements all over the place: GtkButton, GtkPasswordEntry,
   GtkFontChooserDialog, GtkColorChooserDialog, GtkShortcutsWindow,
   GtkMenuButton, GtkAboutDialog, GtkFileChooserDialog, GtkStackSidebar,
-   GtkMediaControls, GtkColorDialogButton, GtkDropDown, GtkInfoBar,
-   GtkNotebook, GtkPrintUnixDialog, GtkModelButton
+   GtkStackSwitcher, GtkMediaControls, GtkColorDialogButton, GtkDropDown,
+   GtkInfoBar, GtkNotebook, GtkPrintUnixDialog, GtkModelButton
 - Make name computation follow the ARIA spec more closely
+ - Adapt name computation for the common 'nested button' scenario
 - Change many containers to use `generic` instead of `group`
 - Use `generic` as the default role
 - Use `application` instead of `window` for windows
+ - Add properties for accessible names of not directly exposed
+   widgets in GtkListView, GtkGridView and GtkColumnView
+
+* DND:
+ - Fix criticals when drops are rejected

 * X11:
 - Fix regressions in GLX setup
@@ -42,19 +60,31 @@ Overview of Changes in 4.11.4, xx-xx-xxxx
 - Do less work on clipped away nodes
 - Redo image uploading
 - Support different image depths and formats
+ - Add a pipeline cache

 * Demos:
 - gtk4-demo: Improve window sizing
 - gtk4-demo: Improve focus behavior
 - gtk4-demo: Add many missing a11y properties
-`
+
+* Tools:
+ - gtk4-builder-tool: Make render an alias screenshot
+
 * Inspector:
 - Show more information in the a11y tab
 - Add an accessibility overlay with warnings and recommendations
 - Limit the width of the a11y tab

+* Build:
+ - Require GLib 2.76
+ - Make asan builds work again
+ - Fix the build if ld is not ld.bdf
+
 * Translation updates:
+ Brazilian Portuguese
+ Catalan
 Czech
+ Georgian


 Overview of Changes in 4.11.3, 05-06-2023
@@ -162,27 +162,39 @@ click_done (GtkGesture *gesture)
    gtk_widget_insert_after (item, canvas, last_child);
 }

+/* GtkSettings treats `GTK_THEME=foo:dark` as theme name `foo`, variant `dark`,
+ * and our embedded CSS files let `foo-dark` work as an alias for `foo:dark`. */
+static gboolean
+has_dark_suffix (const char *theme)
+{
+  return g_str_has_suffix (theme, ":dark") ||
+         g_str_has_suffix (theme, "-dark");
+}
+
+/* So we can make a good guess whether the current theme is dark by checking for
+ * either: it is suffixed `[:-]dark`, or Settings:…prefer-dark-theme is TRUE. */
 static gboolean
 theme_is_dark (void)
 {
+  const char *env_theme;
  GtkSettings *settings;
  char *theme;
  gboolean prefer_dark;
  gboolean dark;

+  /* Like GtkSettings, 1st see if theme is overridden by environment variable */
+  env_theme = g_getenv ("GTK_THEME");
+  if (env_theme != NULL)
+    return has_dark_suffix (env_theme);
+
+  /* If not, test Settings:…theme-name in the same way OR :…prefer-dark-theme */
  settings = gtk_settings_get_default ();
  g_object_get (settings,
                "gtk-theme-name", &theme,
                "gtk-application-prefer-dark-theme", &prefer_dark,
                NULL);
-
-  if ((strcmp (theme, "Adwaita") == 0 && prefer_dark) || strcmp (theme, "HighContrastInverse") == 0)
-    dark = TRUE;
-  else
-    dark = FALSE;
-
+  dark = prefer_dark || has_dark_suffix (theme);
  g_free (theme);
-
  return dark;
 }

@@ -158,17 +158,7 @@ demos_h = custom_target('gtk4 demo header',
  command: [ find_program('geninclude.py'), '@OUTPUT@', '@INPUT@' ],
 )

-objcopy_supports_add_symbol = false
-objcopy = find_program('objcopy', required : false)
-if objcopy.found()
-  objcopy_supports_add_symbol = run_command(objcopy, '--help', check: false).stdout().contains('--add-symbol')
-endif
-
-ld = find_program('ld', required : false)
-
-if not meson.is_cross_build() and build_machine.cpu_family() != 'arm' and build_machine.system() == 'linux' and objcopy.found() and objcopy_supports_add_symbol and ld.found()
-  glib_compile_resources = find_program('glib-compile-resources')
-
+if can_use_objcopy_for_resources
  # Create the resource blob
  gtkdemo_gresource = custom_target('gtkdemo.gresource',
      input : 'demo.gresource.xml',
@@ -1,16 +1,6 @@
 # demos/widget-factory

-objcopy_supports_add_symbol = false
-objcopy = find_program('objcopy', required : false)
-if objcopy.found()
-  objcopy_supports_add_symbol = run_command(objcopy, '--help', check: false).stdout().contains('--add-symbol')
-endif
-
-ld = find_program('ld', required : false)
-
-if not meson.is_cross_build() and build_machine.cpu_family() != 'arm' and build_machine.system() == 'linux' and objcopy.found() and objcopy_supports_add_symbol and ld.found()
-  glib_compile_resources = find_program('glib-compile-resources')
-
+if can_use_objcopy_for_resources
  # Create the resource blob
  widgetfactory_gresource = custom_target('widgetfactory.gresource',
      input : 'widget-factory.gresource.xml',
@@ -153,6 +153,35 @@ get_busy (GSimpleAction *action,
  gtk_widget_set_sensitive (window, FALSE);
 }

+static void
+search_button_tooltip_show (GtkWidget  *self,
+                            GtkTooltip *tooltip)
+{
+  static int style = 0;
+
+  if (style == 0)
+    {
+       gtk_tooltip_set_css_class (tooltip, "red-tooltip");
+       style++;
+    }
+  else if (style == 1)
+    {
+       gtk_tooltip_set_css_class (tooltip, "yellow-tooltip");
+       style++;
+    }
+  else
+    {
+       style = 0;
+    }
+}
+
+static void
+search_button_tooltip_hide (GtkWidget  *self,
+                            GtkTooltip *tooltip)
+{
+  gtk_tooltip_set_css_class (tooltip, NULL);
+}
+
 static int current_page = 0;
 static gboolean
 on_page (int i)
@@ -2221,6 +2250,8 @@ activate (GApplication *app)
  gtk_builder_cscope_add_callback (scope, level_scale_value_changed);
  gtk_builder_cscope_add_callback (scope, transition_speed_changed);
  gtk_builder_cscope_add_callback (scope, reset_icon_size);
+  gtk_builder_cscope_add_callback (scope, search_button_tooltip_show);
+  gtk_builder_cscope_add_callback (scope, search_button_tooltip_hide);
  gtk_builder_set_scope (builder, scope);
  g_object_unref (scope);
  if (!gtk_builder_add_from_resource (builder, "/org/gtk/WidgetFactory4/widget-factory.ui", &error))
@@ -6,3 +6,12 @@
 .toolbar {
  -gtk-icon-style: symbolic;
 }
+
+.red-tooltip {
+  background-color: red;
+}
+
+.yellow-tooltip {
+  background-color: yellow;
+  color: black;
+}
@@ -257,7 +257,9 @@
  </object>
  <object class="GtkTextBuffer" id="textbuffer1">
    <property name="tag-table">tags</property>
-    <property name="text">Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+    <property name="text">Search button above will display its tooltip in an alternating red, yellow and default style.
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit.
 Nullam fringilla, est ut feugiat ultrices, elit lacus ultricies nibh, id commodo tortor nisi id elit.
 Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos.
 Morbi vel elit erat. Maecenas dignissim, dui et pharetra rutrum, tellus lectus rutrum mi, a convallis libero nisi quis tellus.
@@ -1921,6 +1923,8 @@ microphone-sensitivity-medium-symbolic</property>
                                            <property name="icon-name">edit-find</property>
                                            <property name="action-name">win.search</property>
                                            <property name="tooltip-text" translatable="1">Search for it</property>
+                                            <signal name="tooltip-show" handler="search_button_tooltip_show"/>
+                                            <signal name="tooltip-hide" handler="search_button_tooltip_hide"/>
                                          </object>
                                        </child>
                                        <child>
@@ -16,6 +16,7 @@ SYNOPSIS
 |   **gtk4-builder-tool** enumerate [OPTIONS...] <FILE>
 |   **gtk4-builder-tool** simplify [OPTIONS...] <FILE>
 |   **gtk4-builder-tool** preview [OPTIONS...] <FILE>
+|   **gtk4-builder-tool** render [OPTIONS...] <FILE>
 |   **gtk4-builder-tool** screenshot [OPTIONS...] <FILE>

 DESCRIPTION
@@ -69,12 +70,11 @@ file to use.

  Load style information from the given CSS file.

-Screenshot
-^^^^^^^^^^
+Render
+^^^^^^

-The ``screenshot`` command saves a rendering of the UI definition file
-as a png image or node file. The name of the file to write can be specified as
-a second FILE argument.
+The ``render`` command saves a rendering of the UI definition file as a png image
+or node file. The name of the file to write can be specified as a second FILE argument.

 This command accepts options to specify the ID of the toplevel object and a CSS
 file to use.
@@ -96,6 +96,11 @@ file to use.

  Overwrite an existing file.

+Screenshot
+^^^^^^^^^^
+
+The ``screenshot`` command is an alias for ``render``.
+
 Simplification
 ^^^^^^^^^^^^^^

@@ -30,12 +30,12 @@ Views display data from a **_model_**. Models implement the [`iface@Gio.ListMode
 interface and can be provided in a variety of ways:

 * List model implementations for many specific types of data already exist, for
-   example `GtkDirectoryList` or `GtkStringList`.
+   example [`class@Gtk.DirectoryList`] or [`class@Gtk.StringList`].

- * There are generic list model implementations like`GListStore` that allow building
+ * There are generic list model implementations like [`class@Gio.ListStore`] that allow building
   lists of arbitrary objects.

- * Wrapping list models like `GtkFilterListModel` or `GtkSortListModel`
+ * Wrapping list models like [`class@Gtk.FilterListModel`] or [`class@Gtk.SortListModel`]
   modify, adapt or combine other models.

 * Last but not least, developers are encouraged to create their own `GListModel`
@@ -133,8 +133,8 @@ tradeoffs of those and experiment with them.

 GTK offers a wide variety of wrapping models which change or supplement an
 existing model (or models) in some way. But when it comes to storing your
-actual data, there are only a few ready-made choices available: [`class@Gio.ListStore`]
-and [`class@Gtk.StringList`].
+actual data, there are only a few ready-made choices available:
+[`class@Gio.ListStore`], [`class@Gtk.StringList`], and [`class@Gtk.DirectoryList`].

 `GListStore` is backed by a balanced tree and has performance characteristics
 that are expected for that data structure. It works reasonably well for dataset
@@ -147,6 +147,10 @@ that are expected for that data structure. `GtkStringList` is a good fit for any
 place where you would otherwise use `char*[]` and works best if the dataset
 is not very dynamic.

+`GtkDirectoryList` is a list model that wraps [`method@Gio.File.enumerate_children_async`].
+It presents a `GListModel` and fills it asynchronously with the [`iface@Gio.File`]s
+returned from that function.
+
 If these models don't fit your use case or scalability requirements, you
 should make a custom `GListModel` implementation. It is a small interface and
 not very hard to implement.
@@ -199,7 +203,7 @@ the `.data-table` style class.
 ## Sections

 List models can optionally group their items into **_sections_**, by implementing
-the `GtkSectionModel` interface. Both `GtkListView` and `GtkGridView` can
+the `GtkSectionModel` interface. `GtkListView` can
 display headers for sections, by installing a separate **_header factory_**.

 Many GTK list models support section inherently, or they pass through the
@@ -100,6 +100,10 @@ struct _GdkDisplay
  VkDevice vk_device;
  VkQueue vk_queue;
  uint32_t vk_queue_family_index;
+  VkPipelineCache vk_pipeline_cache;
+  gsize vk_pipeline_cache_size;
+  char *vk_pipeline_cache_etag;
+  guint vk_save_pipeline_cache_source;

  guint vulkan_refcount;
 #endif /* GDK_RENDERING_VULKAN */
@@ -1552,7 +1552,7 @@ gdk_gl_context_check_extensions (GdkGLContext *context)

  priv->has_sync = gdk_gl_context_check_version (context, "3.2", "3.0") ||
                   epoxy_has_gl_extension ("GL_ARB_sync") ||
-                   epoxy_has_gl_extension ("GK_APPLE_sync");
+                   epoxy_has_gl_extension ("GL_APPLE_sync");

 #ifdef G_ENABLE_DEBUG
  {
@@ -25,7 +25,8 @@
 * multiple frames, and will be used for a long time.
 *
 * There are various ways to create `GdkTexture` objects from a
- * [class@GdkPixbuf.Pixbuf], or a Cairo surface, or other pixel data.
+ * [class@GdkPixbuf.Pixbuf], or from bytes stored in memory, a file, or a
+ * [struct@Gio.Resource].
 *
 * The ownership of the pixel data is transferred to the `GdkTexture`
 * instance; you can only make a copy of it, via [method@Gdk.Texture.download].
@@ -931,6 +931,216 @@ gdk_vulkan_context_get_queue_family_index (GdkVulkanContext *context)
  return gdk_draw_context_get_display (GDK_DRAW_CONTEXT (context))->vk_queue_family_index;
 }

+static char *
+gdk_vulkan_get_pipeline_cache_dirname (void)
+{
+  return g_build_filename (g_get_user_cache_dir (), "gtk-4.0", "vulkan-pipeline-cache", NULL);
+}
+
+static GFile *
+gdk_vulkan_get_pipeline_cache_file (GdkDisplay *display)
+{
+  VkPhysicalDeviceProperties props;
+  char *dirname, *basename, *path;
+  GFile *result;
+
+  vkGetPhysicalDeviceProperties (display->vk_physical_device, &props);
+
+  dirname = gdk_vulkan_get_pipeline_cache_dirname ();
+  basename = g_strdup_printf ("%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x"
+                              "-%02x%02x%02x%02x%02x%02x.%u",
+                              props.pipelineCacheUUID[0], props.pipelineCacheUUID[1],
+                              props.pipelineCacheUUID[2], props.pipelineCacheUUID[3],
+                              props.pipelineCacheUUID[4], props.pipelineCacheUUID[5],
+                              props.pipelineCacheUUID[6], props.pipelineCacheUUID[7],
+                              props.pipelineCacheUUID[8], props.pipelineCacheUUID[9],
+                              props.pipelineCacheUUID[10], props.pipelineCacheUUID[11],
+                              props.pipelineCacheUUID[12], props.pipelineCacheUUID[13],
+                              props.pipelineCacheUUID[14], props.pipelineCacheUUID[15],
+                              props.driverVersion);
+
+  path = g_build_filename (dirname, basename, NULL);
+  result = g_file_new_for_path (path);
+
+  g_free (path);
+  g_free (basename);
+  g_free (dirname);
+
+  return result;
+}
+
+static VkPipelineCache
+gdk_display_load_pipeline_cache (GdkDisplay *display)
+{
+  GError *error = NULL;
+  VkPipelineCache result;
+  GFile *cache_file;
+  char *etag, *data;
+  gsize size;
+
+  cache_file = gdk_vulkan_get_pipeline_cache_file (display);
+  if (!g_file_load_contents (cache_file, NULL, &data, &size, &etag, &error))
+    {
+      GDK_DEBUG (VULKAN, "failed to load Vulkan pipeline cache file '%s': %s\n",
+                 g_file_peek_path (cache_file), error->message);
+      g_object_unref (cache_file);
+      g_clear_error (&error);
+      return VK_NULL_HANDLE;
+    }
+
+  if (GDK_VK_CHECK (vkCreatePipelineCache, display->vk_device,
+                                           &(VkPipelineCacheCreateInfo) {
+                                             .sType = VK_STRUCTURE_TYPE_PIPELINE_CACHE_CREATE_INFO,
+                                             .initialDataSize = size,
+                                             .pInitialData = data,
+                                           },
+                                           NULL,
+                                           &result) != VK_SUCCESS)
+    result = VK_NULL_HANDLE;
+
+  g_free (data);
+  g_free (display->vk_pipeline_cache_etag);
+  display->vk_pipeline_cache_etag = etag;
+  display->vk_pipeline_cache_size = size;
+
+  return result;
+}
+
+static gboolean
+gdk_vulkan_save_pipeline_cache (GdkDisplay *display)
+{
+  GError *error = NULL;
+  VkDevice device;
+  VkPipelineCache cache;
+  GFile *file;
+  char *path;
+  size_t size;
+  char *data, *etag;
+
+  device = display->vk_device;
+  cache = display->vk_pipeline_cache;
+
+  GDK_VK_CHECK (vkGetPipelineCacheData, device, cache, &size, NULL);
+  if (size == 0)
+    return TRUE;
+  
+  if (size == display->vk_pipeline_cache_size)
+    {
+      GDK_DEBUG (VULKAN, "pipeline cache size (%zu bytes) unchanged, skipping save", size);
+      return TRUE;
+    }
+
+
+  data = g_malloc (size);
+  if (GDK_VK_CHECK (vkGetPipelineCacheData, device, cache, &size, data) != VK_SUCCESS)
+    {
+      g_free (data);
+      return FALSE;
+    }
+
+  path = gdk_vulkan_get_pipeline_cache_dirname ();
+  if (g_mkdir_with_parents (path, 0755) != 0)
+    {
+      g_warning_once ("Failed to create pipeline cache directory");
+      g_free (path);
+      return FALSE;
+    }
+  g_free (path);
+
+  file = gdk_vulkan_get_pipeline_cache_file (display);
+
+  GDK_DEBUG (VULKAN, "Saving pipeline cache to %s", g_file_peek_path (file));
+
+  if (!g_file_replace_contents (file,
+                                data,
+                                size,
+                                display->vk_pipeline_cache_etag,
+                                FALSE,
+                                0,
+                                &etag,
+                                NULL,
+                                &error))
+    {
+      if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_WRONG_ETAG))
+        {
+          VkPipelineCache new_cache;
+          
+          GDK_DEBUG (VULKAN, "Pipeline cache file modified, merging into current");
+          new_cache = gdk_display_load_pipeline_cache (display);
+          if (new_cache)
+            {
+              GDK_VK_CHECK (vkMergePipelineCaches, device, cache, 1, &new_cache);
+              vkDestroyPipelineCache (device, new_cache, NULL);
+            }
+          else
+            {
+              g_clear_pointer (&display->vk_pipeline_cache_etag, g_free);
+            }
+          g_clear_error (&error);
+          g_object_unref (file);
+
+          /* try again */
+          return gdk_vulkan_save_pipeline_cache (display);
+        }
+
+      g_warning ("Failed to save pipeline cache: %s", error->message);
+      g_clear_error (&error);
+      g_object_unref (file);
+      return FALSE;
+    }
+
+  g_object_unref (file);
+  g_free (display->vk_pipeline_cache_etag);
+  display->vk_pipeline_cache_etag = etag;
+
+  return TRUE;
+}
+
+static gboolean
+gdk_vulkan_save_pipeline_cache_cb (gpointer data)
+{
+  GdkDisplay *display = data;
+
+  gdk_vulkan_save_pipeline_cache (display);
+
+  display->vk_save_pipeline_cache_source = 0;
+  return G_SOURCE_REMOVE;
+}
+
+void
+gdk_vulkan_context_pipeline_cache_updated (GdkVulkanContext *self)
+{
+  GdkDisplay *display = gdk_draw_context_get_display (GDK_DRAW_CONTEXT (self));
+
+  g_clear_handle_id (&display->vk_save_pipeline_cache_source, g_source_remove);
+  display->vk_save_pipeline_cache_source = g_timeout_add_seconds_full (G_PRIORITY_DEFAULT_IDLE - 10,
+                                                                       10, /* random choice that is not now */
+                                                                       gdk_vulkan_save_pipeline_cache_cb,
+                                                                       display,
+                                                                       NULL);
+}
+
+static void
+gdk_display_create_pipeline_cache (GdkDisplay *display)
+{
+  display->vk_pipeline_cache = gdk_display_load_pipeline_cache (display);
+
+  GDK_VK_CHECK (vkCreatePipelineCache, display->vk_device,
+                                       &(VkPipelineCacheCreateInfo) {
+                                         .sType = VK_STRUCTURE_TYPE_PIPELINE_CACHE_CREATE_INFO,
+                                       },
+                                       NULL,
+                                       &display->vk_pipeline_cache);
+}
+
+VkPipelineCache
+gdk_vulkan_context_get_pipeline_cache (GdkVulkanContext *self)
+{
+  g_return_val_if_fail (GDK_IS_VULKAN_CONTEXT (self), NULL);
+
+  return gdk_draw_context_get_display (GDK_DRAW_CONTEXT (self))->vk_pipeline_cache;
+}
+
 /**
 * gdk_vulkan_context_get_image_format:
 * @context: a `GdkVulkanContext`
@@ -1381,6 +1591,8 @@ gdk_display_create_vulkan_instance (GdkDisplay  *display,
      return FALSE;
    }

+  gdk_display_create_pipeline_cache (display);
+
  return TRUE;
 }

@@ -1409,6 +1621,16 @@ gdk_display_unref_vulkan (GdkDisplay *display)
  if (display->vulkan_refcount > 0)
    return;

+  if (display->vk_save_pipeline_cache_source)
+    {
+      gdk_vulkan_save_pipeline_cache_cb (display);
+      g_assert (display->vk_save_pipeline_cache_source == 0);
+    }
+  vkDestroyPipelineCache (display->vk_device, display->vk_pipeline_cache, NULL);
+  display->vk_device = VK_NULL_HANDLE;
+  g_clear_pointer (&display->vk_pipeline_cache_etag, g_free);
+  display->vk_pipeline_cache_size = 0;
+
  vkDestroyDevice (display->vk_device, NULL);
  display->vk_device = VK_NULL_HANDLE;
  if (display->vk_debug_callback != VK_NULL_HANDLE)
@@ -73,6 +73,9 @@ gboolean                gdk_display_ref_vulkan                          (GdkDisp
                                                                         GError               **error);
 void                    gdk_display_unref_vulkan                        (GdkDisplay            *display);

+VkPipelineCache         gdk_vulkan_context_get_pipeline_cache           (GdkVulkanContext      *self);
+void                    gdk_vulkan_context_pipeline_cache_updated       (GdkVulkanContext      *self);
+
 GdkMemoryFormat         gdk_vulkan_context_get_offscreen_format         (GdkVulkanContext      *context,
                                                                         GdkMemoryDepth         depth);

@@ -3064,9 +3064,9 @@ tablet_tool_handle_button (void                      *data,
  tablet->pointer_info.press_serial = serial;

  if (button == BTN_STYLUS)
-    n_button = GDK_BUTTON_SECONDARY;
-  else if (button == BTN_STYLUS2)
    n_button = GDK_BUTTON_MIDDLE;
+  else if (button == BTN_STYLUS2)
+    n_button = GDK_BUTTON_SECONDARY;
  else if (button == BTN_STYLUS3)
    n_button = 8; /* Back */
  else
@@ -139,7 +139,6 @@ static GSourceFuncs event_funcs = {

 static GdkSurface *mouse_window = NULL;
 static GdkSurface *mouse_window_ignored_leave = NULL;
-static int current_x, current_y;
 static int current_root_x, current_root_y;

 static UINT got_gdk_events_message;
@@ -1522,14 +1521,15 @@ generate_button_event (GdkEventType      type,
  GdkEvent *event;
  GdkDeviceManagerWin32 *device_manager;
  GdkWin32Surface *impl = GDK_WIN32_SURFACE (window);
+  double x, y;

  if (_gdk_input_ignore_core > 0)
    return;

  device_manager = GDK_DEVICE_MANAGER_WIN32 (_gdk_device_manager);

-  current_x = (gint16) GET_X_LPARAM (msg->lParam) / impl->surface_scale;
-  current_y = (gint16) GET_Y_LPARAM (msg->lParam) / impl->surface_scale;
+  x = (double) GET_X_LPARAM (msg->lParam) / impl->surface_scale;
+  y = (double) GET_Y_LPARAM (msg->lParam) / impl->surface_scale;

  _gdk_device_virtual_set_active (_gdk_device_manager->core_pointer,
                                  _gdk_device_manager->system_pointer);
@@ -1541,10 +1541,10 @@ generate_button_event (GdkEventType      type,
                                _gdk_win32_get_next_tick (msg->time),
                                build_pointer_event_state (msg),
                                button,
-                                current_x,
-                                current_y,
+                                x,
+                                y,
                                NULL);
-                                
+
  _gdk_win32_append_event (event);
 }

@@ -2350,19 +2350,19 @@ gdk_event_translate (MSG *msg,
       * sends WM_MOUSEMOVE messages after a new window is shown under
       * the mouse, even if the mouse hasn't moved. This disturbs gtk.
       */
-      if (msg->pt.x / impl->surface_scale == current_root_x &&
-          msg->pt.y / impl->surface_scale == current_root_y)
+      if (msg->pt.x == current_root_x &&
+          msg->pt.y == current_root_y)
        break;

-      current_root_x = msg->pt.x / impl->surface_scale;
-      current_root_y = msg->pt.y / impl->surface_scale;
+      current_root_x = msg->pt.x;
+      current_root_y = msg->pt.y;

      if (impl->drag_move_resize_context.op != GDK_WIN32_DRAGOP_NONE)
-        gdk_win32_surface_do_move_resize_drag (window, current_root_x, current_root_y);
+        gdk_win32_surface_do_move_resize_drag (window, msg->pt.x, msg->pt.y);
      else if (_gdk_input_ignore_core == 0)
 	{
-	  current_x = (gint16) GET_X_LPARAM (msg->lParam) / impl->surface_scale;
-	  current_y = (gint16) GET_Y_LPARAM (msg->lParam) / impl->surface_scale;
+          double x = (double) GET_X_LPARAM (msg->lParam) / impl->surface_scale;
+          double y = (double) GET_Y_LPARAM (msg->lParam) / impl->surface_scale;

          _gdk_device_virtual_set_active (_gdk_device_manager->core_pointer,
                                          _gdk_device_manager->system_pointer);
@@ -2372,8 +2372,8 @@ gdk_event_translate (MSG *msg,
                                        NULL,
                                        _gdk_win32_get_next_tick (msg->time),
 	                                build_pointer_event_state (msg),
-                                        current_x,
-                                        current_y,
+                                        x,
+                                        y,
                                        NULL);

 	  _gdk_win32_append_event (event);
@@ -271,9 +271,10 @@ winpointer_make_event (GdkDeviceWinpointer *device,
  y /= impl->surface_scale;

  state = 0;
-  if (info->dwKeyStates & POINTER_MOD_CTRL)
+  /* Note that info->dwKeyStates is not reliable, use GetKeyState() */
+  if (GetKeyState (VK_CONTROL) < 0)
    state |= GDK_CONTROL_MASK;
-  if (info->dwKeyStates & POINTER_MOD_SHIFT)
+  if (GetKeyState (VK_SHIFT) < 0)
    state |= GDK_SHIFT_MASK;
  if (GetKeyState (VK_MENU) < 0)
    state |= GDK_ALT_MASK;
@@ -3535,6 +3535,8 @@ setup_drag_move_resize_context (GdkSurface                  *surface,
  context->button = button;
  context->start_root_x = root_x;
  context->start_root_y = root_y;
+  context->current_root_x = root_x;
+  context->current_root_y = root_y;
  context->timestamp = timestamp;
  context->start_rect = rect;

@@ -3650,6 +3652,16 @@ gdk_win32_surface_do_move_resize_drag (GdkSurface *window,
  if (!_gdk_win32_get_window_rect (window, &rect))
    return;

+  x /= impl->surface_scale;
+  y /= impl->surface_scale;
+
+  if (context->current_root_x == x &&
+      context->current_root_y == y)
+    return;
+
+  context->current_root_x = x;
+  context->current_root_y = y;
+
  new_rect = context->start_rect;
  diffx = (x - context->start_root_x) * impl->surface_scale;
  diffy = (y - context->start_root_y) * impl->surface_scale;
@@ -137,6 +137,12 @@ struct _GdkW32DragMoveResizeContext
  int                start_root_x;
  int                start_root_y;

+  /* Last processed cursor position. Values are divided by the window
+   * scale.
+   */
+  int                current_root_x;
+  int                current_root_y;
+
  /* Initial window rectangle (position and size).
   * The window is resized/moved relative to this (see start_root_*).
   */
@@ -165,7 +165,7 @@ void half_to_float4 (const guint16 h[4], float f[4]) __attribute__((ifunc ("reso
 void float_to_half (const float *f, guint16 *h, int n) __attribute__((ifunc ("resolve_float_to_half")));
 void half_to_float (const guint16 *h, float *f, int n) __attribute__((ifunc ("resolve_half_to_float")));

-static void *
+static void * __attribute__ ((no_sanitize_address))
 resolve_float_to_half4 (void)
 {
  __builtin_cpu_init ();
@@ -175,7 +175,7 @@ resolve_float_to_half4 (void)
    return float_to_half4_c;
 }

-static void *
+static void * __attribute__ ((no_sanitize_address))
 resolve_half_to_float4 (void)
 {
  __builtin_cpu_init ();
@@ -185,7 +185,7 @@ resolve_half_to_float4 (void)
    return half_to_float4_c;
 }

-static void *
+static void * __attribute__ ((no_sanitize_address))
 resolve_float_to_half (void)
 {
  __builtin_cpu_init ();
@@ -195,7 +195,7 @@ resolve_float_to_half (void)
    return float_to_half_c;
 }

-static void *
+static void * __attribute__ ((no_sanitize_address))
 resolve_half_to_float (void)
 {
  __builtin_cpu_init ();
@@ -686,17 +686,21 @@ gsk_gl_driver_cache_texture (GskGLDriver         *self,
                             const GskTextureKey *key,
                             guint                texture_id)
 {
-  GskTextureKey *k;
-
  g_assert (GSK_IS_GL_DRIVER (self));
  g_assert (key != NULL);
  g_assert (texture_id > 0);
  g_assert (g_hash_table_contains (self->textures, GUINT_TO_POINTER (texture_id)));

-  k = g_memdup (key, sizeof *key);
+  if (!g_hash_table_contains (self->key_to_texture_id, key))
+    {
+      GskTextureKey *k;

-  g_hash_table_insert (self->key_to_texture_id, k, GUINT_TO_POINTER (texture_id));
-  g_hash_table_insert (self->texture_id_to_key, GUINT_TO_POINTER (texture_id), k);
+      k = g_memdup (key, sizeof *key);
+
+      g_assert (!g_hash_table_contains (self->texture_id_to_key, GUINT_TO_POINTER (texture_id)));
+      g_hash_table_insert (self->key_to_texture_id, k, GUINT_TO_POINTER (texture_id));
+      g_hash_table_insert (self->texture_id_to_key, GUINT_TO_POINTER (texture_id), k);
+    }
 }

 /**
@@ -803,6 +803,8 @@ gsk_gl_render_job_untransform_bounds (GskGLRenderJob        *job,

  out_rect->origin.x -= job->offset_x;
  out_rect->origin.y -= job->offset_y;
+
+  gsk_transform_unref (transform);
 }

 static inline void
@@ -13,6 +13,12 @@ void main() {
 uniform int u_mode;
 uniform sampler2D u_mask;

+float
+luminance (vec3 color)
+{
+  return dot (vec3 (0.2126, 0.7152, 0.0722), color);
+}
+
 void main() {
  vec4 source = GskTexture(u_source, vUv);
  vec4 mask = GskTexture(u_mask, vUv);
@@ -23,9 +29,9 @@ void main() {
  else if (u_mode == 1)
    mask_value = 1.0 - mask.a;
  else if (u_mode == 2)
-    mask_value = (0.2126 * mask.r + 0.7152 * mask.g + 0.0722 * mask.b) * mask.a;
+    mask_value = luminance (mask.rgb);
  else if (u_mode == 3)
-    mask_value = 1.0 - (0.2126 * mask.r + 0.7152 * mask.g + 0.0722 * mask.b) * mask.a;
+    mask_value = mask.a - luminance (mask.rgb);
  else
    mask_value = 0.0;

@@ -2421,6 +2421,7 @@ gsk_inset_shadow_node_new (const GskRoundedRect *outline,

  g_return_val_if_fail (outline != NULL, NULL);
  g_return_val_if_fail (color != NULL, NULL);
+  g_return_val_if_fail (blur_radius >= 0, NULL);

  self = gsk_render_node_alloc (GSK_INSET_SHADOW_NODE);
  node = (GskRenderNode *) self;
@@ -2696,7 +2697,7 @@ gsk_outset_shadow_node_diff (GskRenderNode  *node1,

 static void
 gsk_outset_shadow_node_class_init (gpointer g_class,
-                          gpointer class_data)
+                                   gpointer class_data)
 {
  GskRenderNodeClass *node_class = g_class;

@@ -2734,6 +2735,7 @@ gsk_outset_shadow_node_new (const GskRoundedRect *outline,

  g_return_val_if_fail (outline != NULL, NULL);
  g_return_val_if_fail (color != NULL, NULL);
+  g_return_val_if_fail (blur_radius >= 0, NULL);

  self = gsk_render_node_alloc (GSK_OUTSET_SHADOW_NODE);
  node = (GskRenderNode *) self;
@@ -3700,8 +3702,7 @@ gsk_color_matrix_node_finalize (GskRenderNode *node)
 static void
 apply_color_matrix_to_pattern (cairo_pattern_t         *pattern,
                               const graphene_matrix_t *color_matrix,
-                               const graphene_vec4_t   *color_offset,
-                               gboolean                 multiply_alpha)
+                               const graphene_vec4_t   *color_offset)
 {
  cairo_surface_t *surface, *image_surface;
  guchar *data;
@@ -3739,13 +3740,6 @@ apply_color_matrix_to_pattern (cairo_pattern_t         *pattern,
              graphene_matrix_transform_vec4 (color_matrix, &pixel, &pixel);
            }

-          if (multiply_alpha)
-            graphene_vec4_init (&pixel,
-                                graphene_vec4_get_x (&pixel),
-                                graphene_vec4_get_y (&pixel),
-                                graphene_vec4_get_z (&pixel),
-                                alpha * graphene_vec4_get_w (&pixel));
-
          graphene_vec4_add (&pixel, color_offset, &pixel);

          alpha = graphene_vec4_get_w (&pixel);
@@ -3768,6 +3762,8 @@ apply_color_matrix_to_pattern (cairo_pattern_t         *pattern,

  cairo_surface_mark_dirty (image_surface);
  cairo_surface_unmap_image (surface, image_surface);
+  /* https://gitlab.freedesktop.org/cairo/cairo/-/merge_requests/487 */
+  cairo_surface_mark_dirty (surface);
 }

 static void
@@ -3789,7 +3785,7 @@ gsk_color_matrix_node_draw (GskRenderNode *node,

  pattern = cairo_pop_group (cr);

-  apply_color_matrix_to_pattern (pattern, &self->color_matrix, &self->color_offset, FALSE);
+  apply_color_matrix_to_pattern (pattern, &self->color_matrix, &self->color_offset);

  cairo_set_source (cr, pattern);
  cairo_paint (cr);
@@ -5650,6 +5646,50 @@ gsk_mask_node_finalize (GskRenderNode *node)
  parent_class->finalize (node);
 }

+static void
+apply_luminance_to_pattern (cairo_pattern_t *pattern,
+                            gboolean         invert_luminance)
+{
+  cairo_surface_t *surface, *image_surface;
+  guchar *data;
+  gsize x, y, width, height, stride;
+  int red, green, blue, alpha, luminance;
+  guint32* pixel_data;
+
+  cairo_pattern_get_surface (pattern, &surface);
+  image_surface = cairo_surface_map_to_image (surface, NULL);
+
+  data = cairo_image_surface_get_data (image_surface);
+  width = cairo_image_surface_get_width (image_surface);
+  height = cairo_image_surface_get_height (image_surface);
+  stride = cairo_image_surface_get_stride (image_surface);
+
+  for (y = 0; y < height; y++)
+    {
+      pixel_data = (guint32 *) data;
+      for (x = 0; x < width; x++)
+        {
+          alpha = (pixel_data[x] >> 24) & 0xFF;
+          red   = (pixel_data[x] >> 16) & 0xFF;
+          green = (pixel_data[x] >>  8) & 0xFF;
+          blue  = (pixel_data[x] >>  0) & 0xFF;
+
+          luminance = 2126 * red + 7152 * green + 722 * blue;
+          if (invert_luminance)
+            luminance = 10000 * alpha - luminance;
+          luminance = (luminance + 5000) / 10000;
+
+          pixel_data[x] = luminance * 0x1010101;
+        }
+      data += stride;
+    }
+
+  cairo_surface_mark_dirty (image_surface);
+  cairo_surface_unmap_image (surface, image_surface);
+  /* https://gitlab.freedesktop.org/cairo/cairo/-/merge_requests/487 */
+  cairo_surface_mark_dirty (surface);
+}
+
 static void
 gsk_mask_node_draw (GskRenderNode *node,
                    cairo_t       *cr)
@@ -5672,28 +5712,18 @@ gsk_mask_node_draw (GskRenderNode *node,
    case GSK_MASK_MODE_ALPHA:
      break;
    case GSK_MASK_MODE_INVERTED_ALPHA:
-      graphene_matrix_init_from_float (&color_matrix, (float[]){ 1, 0, 0, 0,
-                                                                 0, 1, 0, 0,
-                                                                 0, 0, 1, 0,
-                                                                 0, 0, 0, -1 });
-      graphene_vec4_init (&color_offset, 0, 0, 0, 1);
-      apply_color_matrix_to_pattern (mask_pattern, &color_matrix, &color_offset, FALSE);
+      graphene_matrix_init_from_float (&color_matrix, (float[]){  0,  0,  0,  0,
+                                                                  0,  0,  0,  0,
+                                                                  0,  0,  0,  0,
+                                                                 -1, -1, -1, -1 });
+      graphene_vec4_init (&color_offset, 1, 1, 1, 1);
+      apply_color_matrix_to_pattern (mask_pattern, &color_matrix, &color_offset);
      break;
    case GSK_MASK_MODE_LUMINANCE:
-      graphene_matrix_init_from_float (&color_matrix, (float[]){ 1, 0, 0, 0.2126,
-                                                                 0, 1, 0, 0.7152,
-                                                                 0, 0, 1, 0.0722,
-                                                                 0, 0, 0, 0 });
-      graphene_vec4_init (&color_offset, 0, 0, 0, 0);
-      apply_color_matrix_to_pattern (mask_pattern, &color_matrix, &color_offset, TRUE);
+      apply_luminance_to_pattern (mask_pattern, FALSE);
      break;
    case GSK_MASK_MODE_INVERTED_LUMINANCE:
-      graphene_matrix_init_from_float (&color_matrix, (float[]){ 1, 0, 0, -0.2126,
-                                                                 0, 1, 0, -0.7152,
-                                                                 0, 0, 1, -0.0722,
-                                                                 0, 0, 0,  0 });
-      graphene_vec4_init (&color_offset, 0, 0, 0, 1);
-      apply_color_matrix_to_pattern (mask_pattern, &color_matrix, &color_offset, TRUE);
+      apply_luminance_to_pattern (mask_pattern, TRUE);
      break;
    default:
      g_assert_not_reached ();
@@ -5703,6 +5733,8 @@ gsk_mask_node_draw (GskRenderNode *node,
  cairo_clip (cr);

  cairo_mask (cr, mask_pattern);
+
+  cairo_pattern_destroy (mask_pattern);
 }

 static void
@@ -5713,6 +5745,12 @@ gsk_mask_node_diff (GskRenderNode  *node1,
  GskMaskNode *self1 = (GskMaskNode *) node1;
  GskMaskNode *self2 = (GskMaskNode *) node2;

+  if (self1->mask_mode != self2->mask_mode)
+    {
+      gsk_render_node_diff_impossible (node1, node2, region);
+      return;
+    }
+
  gsk_render_node_diff (self1->source, self2->source, region);
  gsk_render_node_diff (self1->mask, self2->mask, region);
 }
@@ -453,6 +453,21 @@ parse_double (GtkCssParser *parser,
  return gtk_css_parser_consume_number (parser, out_double);
 }

+static gboolean
+parse_positive_double (GtkCssParser *parser,
+                       Context      *context,
+                       gpointer      out_double)
+{
+  if (gtk_css_parser_has_token (parser, GTK_CSS_TOKEN_SIGNED_NUMBER)
+      || gtk_css_parser_has_token (parser, GTK_CSS_TOKEN_SIGNED_INTEGER))
+    {
+      gtk_css_parser_error_syntax (parser, "Expected a positive number");
+      return FALSE;
+    }
+
+  return gtk_css_parser_consume_number (parser, out_double);
+}
+
 static gboolean
 parse_point (GtkCssParser *parser,
             Context      *context,
@@ -1242,10 +1257,10 @@ parse_radial_gradient_node_internal (GtkCssParser *parser,
  const Declaration declarations[] = {
    { "bounds", parse_rect, NULL, &bounds },
    { "center", parse_point, NULL, &center },
-    { "hradius", parse_double, NULL, &hradius },
-    { "vradius", parse_double, NULL, &vradius },
-    { "start", parse_double, NULL, &start },
-    { "end", parse_double, NULL, &end },
+    { "hradius", parse_positive_double, NULL, &hradius },
+    { "vradius", parse_positive_double, NULL, &vradius },
+    { "start", parse_positive_double, NULL, &start },
+    { "end", parse_positive_double, NULL, &end },
    { "stops", parse_stops, clear_stops, &stops },
  };
  GskRenderNode *result;
@@ -1335,7 +1350,7 @@ parse_inset_shadow_node (GtkCssParser *parser,
    { "dx", parse_double, NULL, &dx },
    { "dy", parse_double, NULL, &dy },
    { "spread", parse_double, NULL, &spread },
-    { "blur", parse_double, NULL, &blur }
+    { "blur", parse_positive_double, NULL, &blur }
  };

  parse_declarations (parser, context, declarations, G_N_ELEMENTS (declarations));
@@ -1737,7 +1752,7 @@ parse_outset_shadow_node (GtkCssParser *parser,
    { "dx", parse_double, NULL, &dx },
    { "dy", parse_double, NULL, &dy },
    { "spread", parse_double, NULL, &spread },
-    { "blur", parse_double, NULL, &blur }
+    { "blur", parse_positive_double, NULL, &blur }
  };

  parse_declarations (parser, context, declarations, G_N_ELEMENTS (declarations));
@@ -2017,7 +2032,7 @@ parse_blur_node (GtkCssParser *parser,
  GskRenderNode *child = NULL;
  double blur_radius = 1.0;
  const Declaration declarations[] = {
-    { "blur", parse_double, NULL, &blur_radius },
+    { "blur", parse_positive_double, NULL, &blur_radius },
    { "child", parse_node, clear_node, &child },
  };
  GskRenderNode *result;
@@ -2477,6 +2492,15 @@ printer_init (Printer       *self,
  printer_init_duplicates_for_node (self, node);
 }

+static void
+printer_clear (Printer *self)
+{
+  if (self->str)
+    g_string_free (self->str, TRUE);
+  g_hash_table_unref (self->named_nodes);
+  g_hash_table_unref (self->named_textures);
+}
+
 #define IDENT_LEVEL 2 /* Spaces per level */
 static void
 _indent (Printer *self)
@@ -3686,6 +3710,7 @@ GBytes *
 gsk_render_node_serialize (GskRenderNode *node)
 {
  Printer p;
+  GBytes *res;

  printer_init (&p, node);

@@ -3705,5 +3730,9 @@ gsk_render_node_serialize (GskRenderNode *node)
      render_node_print (&p, node);
    }

-  return g_string_free_to_bytes (p.str);
+  res = g_string_free_to_bytes (g_steal_pointer (&p.str));
+
+  printer_clear (&p);
+
+  return res;
 }
@@ -103,6 +103,7 @@ gsk_private_vulkan_shaders = []
 # on constantly regenerated files.
 gsk_private_vulkan_compiled_shaders = []
 gsk_private_vulkan_compiled_shaders_deps = []
+gsk_private_vulkan_shader_headers = []

 if have_vulkan
  gsk_private_sources += files([
@@ -197,6 +198,7 @@ libgsk = static_library('gsk',
    gsk_private_sources,
    gsk_enums,
    gskresources,
+    gsk_private_vulkan_shader_headers,
  ],
  dependencies: gsk_deps,
  include_directories: [ confinc, ],
@@ -2,6 +2,8 @@

 #include "gskvulkanblendmodepipelineprivate.h"

+#include "vulkan/resources/blend-mode.vert.h"
+
 struct _GskVulkanBlendModePipeline
 {
  GObject parent_instance;
@@ -9,89 +11,12 @@ struct _GskVulkanBlendModePipeline

 typedef struct _GskVulkanBlendModeInstance GskVulkanBlendModeInstance;

-struct _GskVulkanBlendModeInstance
-{
-  float rect[4];
-  float top_rect[4];
-  float bottom_rect[4];
-  float top_tex_rect[4];
-  float bottom_tex_rect[4];
-  guint32 top_tex_id[2];
-  guint32 bottom_tex_id[2];
-  guint32 blend_mode;
-};
-
 G_DEFINE_TYPE (GskVulkanBlendModePipeline, gsk_vulkan_blend_mode_pipeline, GSK_TYPE_VULKAN_PIPELINE)

 static const VkPipelineVertexInputStateCreateInfo *
 gsk_vulkan_blend_mode_pipeline_get_input_state_create_info (GskVulkanPipeline *self)
 {
-  static const VkVertexInputBindingDescription vertexBindingDescriptions[] = {
-      {
-          .binding = 0,
-          .stride = sizeof (GskVulkanBlendModeInstance),
-          .inputRate = VK_VERTEX_INPUT_RATE_INSTANCE
-      }
-  };
-  static const VkVertexInputAttributeDescription vertexInputAttributeDescription[] = {
-      {
-          .location = 0,
-          .binding = 0,
-          .format = VK_FORMAT_R32G32B32A32_SFLOAT,
-          .offset = 0,
-      },
-      {
-          .location = 1,
-          .binding = 0,
-          .format = VK_FORMAT_R32G32B32A32_SFLOAT,
-          .offset = G_STRUCT_OFFSET (GskVulkanBlendModeInstance, top_rect),
-      },
-      {
-          .location = 2,
-          .binding = 0,
-          .format = VK_FORMAT_R32G32B32A32_SFLOAT,
-          .offset = G_STRUCT_OFFSET (GskVulkanBlendModeInstance, bottom_rect),
-      },
-      {
-          .location = 3,
-          .binding = 0,
-          .format = VK_FORMAT_R32G32B32A32_SFLOAT,
-          .offset = G_STRUCT_OFFSET (GskVulkanBlendModeInstance, top_tex_rect),
-      },
-      {
-          .location = 4,
-          .binding = 0,
-          .format = VK_FORMAT_R32G32B32A32_SFLOAT,
-          .offset = G_STRUCT_OFFSET (GskVulkanBlendModeInstance, bottom_tex_rect),
-      },
-      {
-          .location = 5,
-          .binding = 0,
-          .format = VK_FORMAT_R32_UINT,
-          .offset = G_STRUCT_OFFSET (GskVulkanBlendModeInstance, top_tex_id),
-      },
-      {
-          .location = 6,
-          .binding = 0,
-          .format = VK_FORMAT_R32G32_UINT,
-          .offset = G_STRUCT_OFFSET (GskVulkanBlendModeInstance, bottom_tex_id),
-      },
-      {
-          .location = 7,
-          .binding = 0,
-          .format = VK_FORMAT_R32G32_UINT,
-          .offset = G_STRUCT_OFFSET (GskVulkanBlendModeInstance, blend_mode),
-      }
-  };
-  static const VkPipelineVertexInputStateCreateInfo info = {
-      .sType = VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO,
-      .vertexBindingDescriptionCount = G_N_ELEMENTS (vertexBindingDescriptions),
-      .pVertexBindingDescriptions = vertexBindingDescriptions,
-      .vertexAttributeDescriptionCount = G_N_ELEMENTS (vertexInputAttributeDescription),
-      .pVertexAttributeDescriptions = vertexInputAttributeDescription
-  };
-
-  return &info;
+  return &gsk_vulkan_blend_mode_info;
 }

 static void
@@ -2,68 +2,19 @@

 #include "gskvulkanblurpipelineprivate.h"

+#include "vulkan/resources/blur.vert.h"
+
 struct _GskVulkanBlurPipeline
 {
  GObject parent_instance;
 };

-typedef struct _GskVulkanBlurInstance GskVulkanBlurInstance;
-
-struct _GskVulkanBlurInstance
-{
-  float rect[4];
-  float tex_rect[4];
-  float blur_radius;
-  guint32 tex_id[2];
-};
-
 G_DEFINE_TYPE (GskVulkanBlurPipeline, gsk_vulkan_blur_pipeline, GSK_TYPE_VULKAN_PIPELINE)

 static const VkPipelineVertexInputStateCreateInfo *
 gsk_vulkan_blur_pipeline_get_input_state_create_info (GskVulkanPipeline *self)
 {
-  static const VkVertexInputBindingDescription vertexBindingDescriptions[] = {
-      {
-          .binding = 0,
-          .stride = sizeof (GskVulkanBlurInstance),
-          .inputRate = VK_VERTEX_INPUT_RATE_INSTANCE
-      }
-  };
-  static const VkVertexInputAttributeDescription vertexInputAttributeDescription[] = {
-      {
-          .location = 0,
-          .binding = 0,
-          .format = VK_FORMAT_R32G32B32A32_SFLOAT,
-          .offset = 0,
-      },
-      {
-          .location = 1,
-          .binding = 0,
-          .format = VK_FORMAT_R32G32B32A32_SFLOAT,
-          .offset = G_STRUCT_OFFSET (GskVulkanBlurInstance, tex_rect),
-      },
-      {
-          .location = 2,
-          .binding = 0,
-          .format = VK_FORMAT_R32_SFLOAT,
-          .offset = G_STRUCT_OFFSET (GskVulkanBlurInstance, blur_radius),
-      },
-      {
-          .location = 3,
-          .binding = 0,
-          .format = VK_FORMAT_R32G32_UINT,
-          .offset = G_STRUCT_OFFSET (GskVulkanBlurInstance, tex_id),
-      }
-  };
-  static const VkPipelineVertexInputStateCreateInfo info = {
-      .sType = VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO,
-      .vertexBindingDescriptionCount = G_N_ELEMENTS (vertexBindingDescriptions),
-      .pVertexBindingDescriptions = vertexBindingDescriptions,
-      .vertexAttributeDescriptionCount = G_N_ELEMENTS (vertexInputAttributeDescription),
-      .pVertexAttributeDescriptions = vertexInputAttributeDescription
-  };
-
-  return &info;
+  return &gsk_vulkan_blur_info;
 }

 static void
@@ -105,7 +56,7 @@ gsk_vulkan_blur_pipeline_collect_vertex_data (GskVulkanBlurPipeline  *pipeline,
                                              const graphene_point_t *offset,
                                              const graphene_rect_t  *rect,
                                              const graphene_rect_t  *tex_rect,
-                                              double                  blur_radius)
+                                              double                  radius)
 {
  GskVulkanBlurInstance *instance = (GskVulkanBlurInstance *) data;

@@ -117,7 +68,7 @@ gsk_vulkan_blur_pipeline_collect_vertex_data (GskVulkanBlurPipeline  *pipeline,
  instance->tex_rect[1] = tex_rect->origin.y;
  instance->tex_rect[2] = tex_rect->size.width;
  instance->tex_rect[3] = tex_rect->size.height;
-  instance->blur_radius = blur_radius;
+  instance->radius = radius;
  instance->tex_id[0] = tex_id[0];
  instance->tex_id[1] = tex_id[1];
 }
@@ -4,91 +4,19 @@

 #include "gskroundedrectprivate.h"

+#include "vulkan/resources/border.vert.h"
+
 struct _GskVulkanBorderPipeline
 {
  GObject parent_instance;
 };

-typedef struct _GskVulkanBorderInstance GskVulkanBorderInstance;
-
-struct _GskVulkanBorderInstance
-{
-  float rect[12];
-  float widths[4];
-  float colors[16];
-};
-
 G_DEFINE_TYPE (GskVulkanBorderPipeline, gsk_vulkan_border_pipeline, GSK_TYPE_VULKAN_PIPELINE)

 static const VkPipelineVertexInputStateCreateInfo *
 gsk_vulkan_border_pipeline_get_input_state_create_info (GskVulkanPipeline *self)
 {
-  static const VkVertexInputBindingDescription vertexBindingDescriptions[] = {
-      {
-          .binding = 0,
-          .stride = sizeof (GskVulkanBorderInstance),
-          .inputRate = VK_VERTEX_INPUT_RATE_INSTANCE
-      }
-  };
-  static const VkVertexInputAttributeDescription vertexInputAttributeDescription[] = {
-      {
-          .location = 0,
-          .binding = 0,
-          .format = VK_FORMAT_R32G32B32A32_SFLOAT,
-          .offset = G_STRUCT_OFFSET (GskVulkanBorderInstance, rect),
-      },
-      {
-          .location = 1,
-          .binding = 0,
-          .format = VK_FORMAT_R32G32B32A32_SFLOAT,
-          .offset = G_STRUCT_OFFSET (GskVulkanBorderInstance, rect) + 4 * sizeof (float),
-      },
-      {
-          .location = 2,
-          .binding = 0,
-          .format = VK_FORMAT_R32G32B32A32_SFLOAT,
-          .offset = G_STRUCT_OFFSET (GskVulkanBorderInstance, rect) + 8 * sizeof (float),
-      },
-      {
-          .location = 3,
-          .binding = 0,
-          .format = VK_FORMAT_R32G32B32A32_SFLOAT,
-          .offset = G_STRUCT_OFFSET (GskVulkanBorderInstance, widths),
-      },
-      {
-          .location = 4,
-          .binding = 0,
-          .format = VK_FORMAT_R32G32B32A32_SFLOAT,
-          .offset = G_STRUCT_OFFSET (GskVulkanBorderInstance, colors),
-      },
-      {
-          .location = 5,
-          .binding = 0,
-          .format = VK_FORMAT_R32G32B32A32_SFLOAT,
-          .offset = G_STRUCT_OFFSET (GskVulkanBorderInstance, colors) + 4 * sizeof (float),
-      },
-      {
-          .location = 6,
-          .binding = 0,
-          .format = VK_FORMAT_R32G32B32A32_SFLOAT,
-          .offset = G_STRUCT_OFFSET (GskVulkanBorderInstance, colors) + 8 * sizeof (float),
-      },
-      {
-          .location = 7,
-          .binding = 0,
-          .format = VK_FORMAT_R32G32B32A32_SFLOAT,
-          .offset = G_STRUCT_OFFSET (GskVulkanBorderInstance, colors) + 12 * sizeof (float),
-      }
-  };
-  static const VkPipelineVertexInputStateCreateInfo info = {
-      .sType = VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO,
-      .vertexBindingDescriptionCount = G_N_ELEMENTS (vertexBindingDescriptions),
-      .pVertexBindingDescriptions = vertexBindingDescriptions,
-      .vertexAttributeDescriptionCount = G_N_ELEMENTS (vertexInputAttributeDescription),
-      .pVertexAttributeDescriptions = vertexInputAttributeDescription
-  };
-
-  return &info;
+  return &gsk_vulkan_border_info;
 }

 static void
@@ -137,11 +65,11 @@ gsk_vulkan_border_pipeline_collect_vertex_data (GskVulkanBorderPipeline *pipelin
  gsk_rounded_rect_to_float (rect, offset, instance->rect);
  for (i = 0; i < 4; i++)
    {
-      instance->widths[i] = widths[i];
-      instance->colors[4 * i + 0] = colors[i].red;
-      instance->colors[4 * i + 1] = colors[i].green;
-      instance->colors[4 * i + 2] = colors[i].blue;
-      instance->colors[4 * i + 3] = colors[i].alpha;
+      instance->border_widths[i] = widths[i];
+      instance->border_colors[4 * i + 0] = colors[i].red;
+      instance->border_colors[4 * i + 1] = colors[i].green;
+      instance->border_colors[4 * i + 2] = colors[i].blue;
+      instance->border_colors[4 * i + 3] = colors[i].alpha;
    }
 }

@@ -2,6 +2,8 @@

 #include "gskvulkanboxshadowpipelineprivate.h"

+#include "vulkan/resources/inset-shadow.vert.h"
+
 #include "gskroundedrectprivate.h"

 struct _GskVulkanBoxShadowPipeline
@@ -9,82 +11,12 @@ struct _GskVulkanBoxShadowPipeline
  GObject parent_instance;
 };

-typedef struct _GskVulkanBoxShadowInstance GskVulkanBoxShadowInstance;
-
-struct _GskVulkanBoxShadowInstance
-{
-  float outline[12];
-  float color[4];
-  float offset[2];
-  float spread;
-  float blur_radius;
-};
-
 G_DEFINE_TYPE (GskVulkanBoxShadowPipeline, gsk_vulkan_box_shadow_pipeline, GSK_TYPE_VULKAN_PIPELINE)

 static const VkPipelineVertexInputStateCreateInfo *
 gsk_vulkan_box_shadow_pipeline_get_input_state_create_info (GskVulkanPipeline *self)
 {
-  static const VkVertexInputBindingDescription vertexBindingDescriptions[] = {
-      {
-          .binding = 0,
-          .stride = sizeof (GskVulkanBoxShadowInstance),
-          .inputRate = VK_VERTEX_INPUT_RATE_INSTANCE
-      }
-  };
-  static const VkVertexInputAttributeDescription vertexInputAttributeDescription[] = {
-      {
-          .location = 0,
-          .binding = 0,
-          .format = VK_FORMAT_R32G32B32A32_SFLOAT,
-          .offset = G_STRUCT_OFFSET (GskVulkanBoxShadowInstance, outline),
-      },
-      {
-          .location = 1,
-          .binding = 0,
-          .format = VK_FORMAT_R32G32B32A32_SFLOAT,
-          .offset = G_STRUCT_OFFSET (GskVulkanBoxShadowInstance, outline) + 4 * sizeof (float),
-      },
-      {
-          .location = 2,
-          .binding = 0,
-          .format = VK_FORMAT_R32G32B32A32_SFLOAT,
-          .offset = G_STRUCT_OFFSET (GskVulkanBoxShadowInstance, outline) + 8 * sizeof (float),
-      },
-      {
-          .location = 3,
-          .binding = 0,
-          .format = VK_FORMAT_R32G32B32A32_SFLOAT,
-          .offset = G_STRUCT_OFFSET (GskVulkanBoxShadowInstance, color),
-      },
-      {
-          .location = 4,
-          .binding = 0,
-          .format = VK_FORMAT_R32G32_SFLOAT,
-          .offset = G_STRUCT_OFFSET (GskVulkanBoxShadowInstance, offset),
-      },
-      {
-          .location = 5,
-          .binding = 0,
-          .format = VK_FORMAT_R32_SFLOAT,
-          .offset = G_STRUCT_OFFSET (GskVulkanBoxShadowInstance, spread),
-      },
-      {
-          .location = 6,
-          .binding = 0,
-          .format = VK_FORMAT_R32_SFLOAT,
-          .offset = G_STRUCT_OFFSET (GskVulkanBoxShadowInstance, blur_radius),
-      }
-  };
-  static const VkPipelineVertexInputStateCreateInfo info = {
-      .sType = VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO,
-      .vertexBindingDescriptionCount = G_N_ELEMENTS (vertexBindingDescriptions),
-      .pVertexBindingDescriptions = vertexBindingDescriptions,
-      .vertexAttributeDescriptionCount = G_N_ELEMENTS (vertexInputAttributeDescription),
-      .pVertexAttributeDescriptions = vertexInputAttributeDescription
-  };
-
-  return &info;
+  return &gsk_vulkan_inset_shadow_info;
 }

 static void
@@ -130,7 +62,7 @@ gsk_vulkan_box_shadow_pipeline_collect_vertex_data (GskVulkanBoxShadowPipeline *
                                                    float                      spread,
                                                    float                      blur_radius)
 {
-  GskVulkanBoxShadowInstance *instance = (GskVulkanBoxShadowInstance *) data;
+  GskVulkanInsetShadowInstance *instance = (GskVulkanInsetShadowInstance *) data;

  gsk_rounded_rect_to_float (outline, offset, instance->outline);
  instance->color[0] = color->red;
@@ -2,54 +2,19 @@

 #include "gskvulkancolorpipelineprivate.h"

+#include "vulkan/resources/color.vert.h"
+
 struct _GskVulkanColorPipeline
 {
  GObject parent_instance;
 };

-typedef struct _GskVulkanColorInstance GskVulkanColorInstance;
-
-struct _GskVulkanColorInstance
-{
-  float rect[4];
-  float color[4];
-};
-
 G_DEFINE_TYPE (GskVulkanColorPipeline, gsk_vulkan_color_pipeline, GSK_TYPE_VULKAN_PIPELINE)

 static const VkPipelineVertexInputStateCreateInfo *
 gsk_vulkan_color_pipeline_get_input_state_create_info (GskVulkanPipeline *self)
 {
-  static const VkVertexInputBindingDescription vertexBindingDescriptions[] = {
-      {
-          .binding = 0,
-          .stride = sizeof (GskVulkanColorInstance),
-          .inputRate = VK_VERTEX_INPUT_RATE_INSTANCE
-      }
-  };
-  static const VkVertexInputAttributeDescription vertexInputAttributeDescription[] = {
-      {
-          .location = 0,
-          .binding = 0,
-          .format = VK_FORMAT_R32G32B32A32_SFLOAT,
-          .offset = 0,
-      },
-      {
-          .location = 1,
-          .binding = 0,
-          .format = VK_FORMAT_R32G32B32A32_SFLOAT,
-          .offset = G_STRUCT_OFFSET (GskVulkanColorInstance, color),
-      }
-  };
-  static const VkPipelineVertexInputStateCreateInfo info = {
-      .sType = VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO,
-      .vertexBindingDescriptionCount = G_N_ELEMENTS (vertexBindingDescriptions),
-      .pVertexBindingDescriptions = vertexBindingDescriptions,
-      .vertexAttributeDescriptionCount = G_N_ELEMENTS (vertexInputAttributeDescription),
-      .pVertexAttributeDescriptions = vertexInputAttributeDescription
-  };
-
-  return &info;
+  return &gsk_vulkan_color_info;
 }

 static void
@@ -2,61 +2,19 @@

 #include "gskvulkancolortextpipelineprivate.h"

+#include "vulkan/resources/texture.vert.h"
+
 struct _GskVulkanColorTextPipeline
 {
  GObject parent_instance;
 };

-typedef struct _GskVulkanColorTextInstance GskVulkanColorTextInstance;
-
-struct _GskVulkanColorTextInstance
-{
-  float rect[4];
-  float tex_rect[4];
-  guint32 tex_id[2];
-};
-
 G_DEFINE_TYPE (GskVulkanColorTextPipeline, gsk_vulkan_color_text_pipeline, GSK_TYPE_VULKAN_PIPELINE)

 static const VkPipelineVertexInputStateCreateInfo *
 gsk_vulkan_color_text_pipeline_get_input_state_create_info (GskVulkanPipeline *self)
 {
-  static const VkVertexInputBindingDescription vertexBindingDescriptions[] = {
-      {
-          .binding = 0,
-          .stride = sizeof (GskVulkanColorTextInstance),
-          .inputRate = VK_VERTEX_INPUT_RATE_INSTANCE
-      }
-  };
-  static const VkVertexInputAttributeDescription vertexInputAttributeDescription[] = {
-      {
-          .location = 0,
-          .binding = 0,
-          .format = VK_FORMAT_R32G32B32A32_SFLOAT,
-          .offset = G_STRUCT_OFFSET (GskVulkanColorTextInstance, rect),
-      },
-      {
-          .location = 1,
-          .binding = 0,
-          .format = VK_FORMAT_R32G32B32A32_SFLOAT,
-          .offset = G_STRUCT_OFFSET (GskVulkanColorTextInstance, tex_rect),
-      },
-      {
-          .location = 2,
-          .binding = 0,
-          .format = VK_FORMAT_R32G32_UINT,
-          .offset = G_STRUCT_OFFSET (GskVulkanColorTextInstance, tex_id),
-      }
-  };
-  static const VkPipelineVertexInputStateCreateInfo info = {
-      .sType = VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO,
-      .vertexBindingDescriptionCount = G_N_ELEMENTS (vertexBindingDescriptions),
-      .pVertexBindingDescriptions = vertexBindingDescriptions,
-      .vertexAttributeDescriptionCount = G_N_ELEMENTS (vertexInputAttributeDescription),
-      .pVertexAttributeDescriptions = vertexInputAttributeDescription
-  };
-
-  return &info;
+  return &gsk_vulkan_texture_info;
 }

 static void
@@ -105,7 +63,7 @@ gsk_vulkan_color_text_pipeline_collect_vertex_data (GskVulkanColorTextPipeline *
                                                    guint                       num_glyphs,
                                                    float                       scale)
 {
-  GskVulkanColorTextInstance *instances = (GskVulkanColorTextInstance *) data;
+  GskVulkanTextureInstance *instances = (GskVulkanTextureInstance *) data;
  int i;
  int count = 0;
  int x_position = 0;
@@ -121,7 +79,7 @@ gsk_vulkan_color_text_pipeline_collect_vertex_data (GskVulkanColorTextPipeline *
        {
          double cx = (x_position + gi->geometry.x_offset) / PANGO_SCALE;
          double cy = gi->geometry.y_offset / PANGO_SCALE;
-          GskVulkanColorTextInstance *instance = &instances[count];
+          GskVulkanTextureInstance *instance = &instances[count];
          GskVulkanCachedGlyph *glyph;

          glyph = gsk_vulkan_renderer_get_cached_glyph (renderer,
@@ -2,96 +2,19 @@

 #include "gskvulkancrossfadepipelineprivate.h"

+#include "vulkan/resources/cross-fade.vert.h"
+
 struct _GskVulkanCrossFadePipeline
 {
  GObject parent_instance;
 };

-typedef struct _GskVulkanCrossFadeInstance GskVulkanCrossFadeInstance;
-
-struct _GskVulkanCrossFadeInstance
-{
-  float rect[4];
-  float start_rect[4];
-  float end_rect[4];
-  float start_tex_rect[4];
-  float end_tex_rect[4];
-  guint32 start_tex_id[2];
-  guint32 end_tex_id[2];
-  float progress;
-};
-
 G_DEFINE_TYPE (GskVulkanCrossFadePipeline, gsk_vulkan_cross_fade_pipeline, GSK_TYPE_VULKAN_PIPELINE)

 static const VkPipelineVertexInputStateCreateInfo *
 gsk_vulkan_cross_fade_pipeline_get_input_state_create_info (GskVulkanPipeline *self)
 {
-  static const VkVertexInputBindingDescription vertexBindingDescriptions[] = {
-      {
-          .binding = 0,
-          .stride = sizeof (GskVulkanCrossFadeInstance),
-          .inputRate = VK_VERTEX_INPUT_RATE_INSTANCE
-      }
-  };
-  static const VkVertexInputAttributeDescription vertexInputAttributeDescription[] = {
-      {
-          .location = 0,
-          .binding = 0,
-          .format = VK_FORMAT_R32G32B32A32_SFLOAT,
-          .offset = 0,
-      },
-      {
-          .location = 1,
-          .binding = 0,
-          .format = VK_FORMAT_R32G32B32A32_SFLOAT,
-          .offset = G_STRUCT_OFFSET (GskVulkanCrossFadeInstance, start_rect),
-      },
-      {
-          .location = 2,
-          .binding = 0,
-          .format = VK_FORMAT_R32G32B32A32_SFLOAT,
-          .offset = G_STRUCT_OFFSET (GskVulkanCrossFadeInstance, end_rect),
-      },
-      {
-          .location = 3,
-          .binding = 0,
-          .format = VK_FORMAT_R32G32B32A32_SFLOAT,
-          .offset = G_STRUCT_OFFSET (GskVulkanCrossFadeInstance, start_tex_rect),
-      },
-      {
-          .location = 4,
-          .binding = 0,
-          .format = VK_FORMAT_R32G32B32A32_SFLOAT,
-          .offset = G_STRUCT_OFFSET (GskVulkanCrossFadeInstance, end_tex_rect),
-      },
-      {
-          .location = 5,
-          .binding = 0,
-          .format = VK_FORMAT_R32G32_UINT,
-          .offset = G_STRUCT_OFFSET (GskVulkanCrossFadeInstance, start_tex_id),
-      },
-      {
-          .location = 6,
-          .binding = 0,
-          .format = VK_FORMAT_R32G32_UINT,
-          .offset = G_STRUCT_OFFSET (GskVulkanCrossFadeInstance, end_tex_id),
-      },
-      {
-          .location = 7,
-          .binding = 0,
-          .format = VK_FORMAT_R32_SFLOAT,
-          .offset = G_STRUCT_OFFSET (GskVulkanCrossFadeInstance, progress),
-      }
-  };
-  static const VkPipelineVertexInputStateCreateInfo info = {
-      .sType = VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO,
-      .vertexBindingDescriptionCount = G_N_ELEMENTS (vertexBindingDescriptions),
-      .pVertexBindingDescriptions = vertexBindingDescriptions,
-      .vertexAttributeDescriptionCount = G_N_ELEMENTS (vertexInputAttributeDescription),
-      .pVertexAttributeDescriptions = vertexInputAttributeDescription
-  };
-
-  return &info;
+  return &gsk_vulkan_cross_fade_info;
 }

 static void
@@ -2,93 +2,19 @@

 #include "gskvulkaneffectpipelineprivate.h"

+#include "vulkan/resources/color-matrix.vert.h"
+
 struct _GskVulkanEffectPipeline
 {
  GObject parent_instance;
 };

-typedef struct _GskVulkanEffectInstance GskVulkanEffectInstance;
-
-struct _GskVulkanEffectInstance
-{
-  float rect[4];
-  float tex_rect[4];
-  float color_matrix[16];
-  float color_offset[4];
-  guint32 tex_id[2];
-};
-
 G_DEFINE_TYPE (GskVulkanEffectPipeline, gsk_vulkan_effect_pipeline, GSK_TYPE_VULKAN_PIPELINE)

 static const VkPipelineVertexInputStateCreateInfo *
 gsk_vulkan_effect_pipeline_get_input_state_create_info (GskVulkanPipeline *self)
 {
-  static const VkVertexInputBindingDescription vertexBindingDescriptions[] = {
-      {
-          .binding = 0,
-          .stride = sizeof (GskVulkanEffectInstance),
-          .inputRate = VK_VERTEX_INPUT_RATE_INSTANCE
-      }
-  };
-  static const VkVertexInputAttributeDescription vertexInputAttributeDescription[] = {
-      {
-          .location = 0,
-          .binding = 0,
-          .format = VK_FORMAT_R32G32B32A32_SFLOAT,
-          .offset = 0,
-      },
-      {
-          .location = 1,
-          .binding = 0,
-          .format = VK_FORMAT_R32G32B32A32_SFLOAT,
-          .offset = G_STRUCT_OFFSET (GskVulkanEffectInstance, tex_rect),
-      },
-      {
-          .location = 2,
-          .binding = 0,
-          .format = VK_FORMAT_R32G32B32A32_SFLOAT,
-          .offset = G_STRUCT_OFFSET (GskVulkanEffectInstance, color_matrix),
-      },
-      {
-          .location = 3,
-          .binding = 0,
-          .format = VK_FORMAT_R32G32B32A32_SFLOAT,
-          .offset = G_STRUCT_OFFSET (GskVulkanEffectInstance, color_matrix) + sizeof (float) * 4,
-      },
-      {
-          .location = 4,
-          .binding = 0,
-          .format = VK_FORMAT_R32G32B32A32_SFLOAT,
-          .offset = G_STRUCT_OFFSET (GskVulkanEffectInstance, color_matrix) + sizeof (float) * 8,
-      },
-      {
-          .location = 5,
-          .binding = 0,
-          .format = VK_FORMAT_R32G32B32A32_SFLOAT,
-          .offset = G_STRUCT_OFFSET (GskVulkanEffectInstance, color_matrix) + sizeof (float) * 12,
-      },
-      {
-          .location = 6,
-          .binding = 0,
-          .format = VK_FORMAT_R32G32B32A32_SFLOAT,
-          .offset = G_STRUCT_OFFSET (GskVulkanEffectInstance, color_offset),
-      },
-      {
-          .location = 7,
-          .binding = 0,
-          .format = VK_FORMAT_R32G32_UINT,
-          .offset = G_STRUCT_OFFSET (GskVulkanEffectInstance, tex_id),
-      }
-  };
-  static const VkPipelineVertexInputStateCreateInfo info = {
-      .sType = VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO,
-      .vertexBindingDescriptionCount = G_N_ELEMENTS (vertexBindingDescriptions),
-      .pVertexBindingDescriptions = vertexBindingDescriptions,
-      .vertexAttributeDescriptionCount = G_N_ELEMENTS (vertexInputAttributeDescription),
-      .pVertexAttributeDescriptions = vertexInputAttributeDescription
-  };
-
-  return &info;
+  return &gsk_vulkan_color_matrix_info;
 }

 static void
@@ -133,7 +59,7 @@ gsk_vulkan_effect_pipeline_collect_vertex_data (GskVulkanEffectPipeline *pipelin
                                                const graphene_matrix_t *color_matrix,
                                                const graphene_vec4_t   *color_offset)
 {
-  GskVulkanEffectInstance *instance = (GskVulkanEffectInstance *) data;
+  GskVulkanColorMatrixInstance *instance = (GskVulkanColorMatrixInstance *) data;

  instance->rect[0] = rect->origin.x + offset->x;
  instance->rect[1] = rect->origin.y + offset->y;
@@ -2,82 +2,19 @@

 #include "gskvulkanlineargradientpipelineprivate.h"

+#include "vulkan/resources/linear.vert.h"
+
 struct _GskVulkanLinearGradientPipeline
 {
  GObject parent_instance;
 };

-typedef struct _GskVulkanLinearGradientInstance GskVulkanLinearGradientInstance;
-
-struct _GskVulkanLinearGradientInstance
-{
-  float rect[4];
-  float start[2];
-  float end[2];
-  gint32 repeating;
-  gint32 offset;
-  gint32 stop_count;
-};
-
 G_DEFINE_TYPE (GskVulkanLinearGradientPipeline, gsk_vulkan_linear_gradient_pipeline, GSK_TYPE_VULKAN_PIPELINE)

 static const VkPipelineVertexInputStateCreateInfo *
 gsk_vulkan_linear_gradient_pipeline_get_input_state_create_info (GskVulkanPipeline *self)
 {
-  static const VkVertexInputBindingDescription vertexBindingDescriptions[] = {
-      {
-          .binding = 0,
-          .stride = sizeof (GskVulkanLinearGradientInstance),
-          .inputRate = VK_VERTEX_INPUT_RATE_INSTANCE
-      }
-  };
-  static const VkVertexInputAttributeDescription vertexInputAttributeDescription[] = {
-      {
-          .location = 0,
-          .binding = 0,
-          .format = VK_FORMAT_R32G32B32A32_SFLOAT,
-          .offset = 0,
-      },
-      {
-          .location = 1,
-          .binding = 0,
-          .format = VK_FORMAT_R32G32_SFLOAT,
-          .offset = G_STRUCT_OFFSET (GskVulkanLinearGradientInstance, start),
-      },
-      {
-          .location = 2,
-          .binding = 0,
-          .format = VK_FORMAT_R32G32_SFLOAT,
-          .offset = G_STRUCT_OFFSET (GskVulkanLinearGradientInstance, end),
-      },
-      {
-          .location = 3,
-          .binding = 0,
-          .format = VK_FORMAT_R32_SINT,
-          .offset = G_STRUCT_OFFSET (GskVulkanLinearGradientInstance, repeating),
-      },
-      {
-          .location = 4,
-          .binding = 0,
-          .format = VK_FORMAT_R32_SINT,
-          .offset = G_STRUCT_OFFSET (GskVulkanLinearGradientInstance, offset),
-      },
-      {
-          .location = 5,
-          .binding = 0,
-          .format = VK_FORMAT_R32_SINT,
-          .offset = G_STRUCT_OFFSET (GskVulkanLinearGradientInstance, stop_count),
-      }
-  };
-  static const VkPipelineVertexInputStateCreateInfo info = {
-      .sType = VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO,
-      .vertexBindingDescriptionCount = G_N_ELEMENTS (vertexBindingDescriptions),
-      .pVertexBindingDescriptions = vertexBindingDescriptions,
-      .vertexAttributeDescriptionCount = G_N_ELEMENTS (vertexInputAttributeDescription),
-      .pVertexAttributeDescriptions = vertexInputAttributeDescription
-  };
-
-  return &info;
+  return &gsk_vulkan_linear_info;
 }

 static void
@@ -123,7 +60,7 @@ gsk_vulkan_linear_gradient_pipeline_collect_vertex_data (GskVulkanLinearGradient
                                                         gsize                            gradient_offset,
                                                         gsize                            n_stops)
 {
-  GskVulkanLinearGradientInstance *instance = (GskVulkanLinearGradientInstance *) data;
+  GskVulkanLinearInstance *instance = (GskVulkanLinearInstance *) data;

  instance->rect[0] = rect->origin.x + offset->x;
  instance->rect[1] = rect->origin.y + offset->y;
@@ -134,7 +71,7 @@ gsk_vulkan_linear_gradient_pipeline_collect_vertex_data (GskVulkanLinearGradient
  instance->end[0] = end->x + offset->x;
  instance->end[1] = end->y + offset->y;
  instance->repeating = repeating;
-  instance->offset = gradient_offset;
+  instance->stop_offset = gradient_offset;
  instance->stop_count = n_stops;
 }

@@ -5,6 +5,8 @@
 #include "gskvulkanpushconstantsprivate.h"
 #include "gskvulkanshaderprivate.h"

+#include "gdk/gdkvulkancontextprivate.h"
+
 #include <graphene.h>

 typedef struct _GskVulkanPipelinePrivate GskVulkanPipelinePrivate;
@@ -87,7 +89,7 @@ gsk_vulkan_pipeline_new (GType             pipeline_type,
  priv->vertex_stride = vertex_input_state->pVertexBindingDescriptions[0].stride;

  GSK_VK_CHECK (vkCreateGraphicsPipelines, device,
-                                           VK_NULL_HANDLE,
+                                           gdk_vulkan_context_get_pipeline_cache (context),
                                           1,
                                           &(VkGraphicsPipelineCreateInfo) {
                                               .sType = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO,
@@ -160,6 +162,8 @@ gsk_vulkan_pipeline_new (GType             pipeline_type,
                                           NULL,
                                           &priv->pipeline);

+  gdk_vulkan_context_pipeline_cache_updated (context);
+
  return self;
 }

@@ -418,12 +418,12 @@ gsk_vulkan_render_get_pipeline (GskVulkanRender       *self,
    { "texture",                    1, gsk_vulkan_color_text_pipeline_new },
    { "texture-clip",               1, gsk_vulkan_color_text_pipeline_new },
    { "texture-clip-rounded",       1, gsk_vulkan_color_text_pipeline_new },
-    { "crossfade",                  2, gsk_vulkan_cross_fade_pipeline_new },
-    { "crossfade-clip",             2, gsk_vulkan_cross_fade_pipeline_new },
-    { "crossfade-clip-rounded",     2, gsk_vulkan_cross_fade_pipeline_new },
-    { "blendmode",                  2, gsk_vulkan_blend_mode_pipeline_new },
-    { "blendmode-clip",             2, gsk_vulkan_blend_mode_pipeline_new },
-    { "blendmode-clip-rounded",     2, gsk_vulkan_blend_mode_pipeline_new },
+    { "cross-fade",                 2, gsk_vulkan_cross_fade_pipeline_new },
+    { "cross-fade-clip",            2, gsk_vulkan_cross_fade_pipeline_new },
+    { "cross-fade-clip-rounded",    2, gsk_vulkan_cross_fade_pipeline_new },
+    { "blend-mode",                 2, gsk_vulkan_blend_mode_pipeline_new },
+    { "blend-mode-clip",            2, gsk_vulkan_blend_mode_pipeline_new },
+    { "blend-mode-clip-rounded",    2, gsk_vulkan_blend_mode_pipeline_new },
  };

  g_return_val_if_fail (type < GSK_VULKAN_N_PIPELINES, NULL);
@@ -2,68 +2,19 @@

 #include "gskvulkantextpipelineprivate.h"

+#include "vulkan/resources/mask.vert.h"
+
 struct _GskVulkanTextPipeline
 {
  GObject parent_instance;
 };

-typedef struct _GskVulkanTextInstance GskVulkanTextInstance;
-
-struct _GskVulkanTextInstance
-{
-  float rect[4];
-  float tex_rect[4];
-  float color[4];
-  guint32 tex_id[2];
-};
-
 G_DEFINE_TYPE (GskVulkanTextPipeline, gsk_vulkan_text_pipeline, GSK_TYPE_VULKAN_PIPELINE)

 static const VkPipelineVertexInputStateCreateInfo *
 gsk_vulkan_text_pipeline_get_input_state_create_info (GskVulkanPipeline *self)
 {
-  static const VkVertexInputBindingDescription vertexBindingDescriptions[] = {
-      {
-          .binding = 0,
-          .stride = sizeof (GskVulkanTextInstance),
-          .inputRate = VK_VERTEX_INPUT_RATE_INSTANCE
-      }
-  };
-  static const VkVertexInputAttributeDescription vertexInputAttributeDescription[] = {
-      {
-          .location = 0,
-          .binding = 0,
-          .format = VK_FORMAT_R32G32B32A32_SFLOAT,
-          .offset = G_STRUCT_OFFSET (GskVulkanTextInstance, rect),
-      },
-      {
-          .location = 1,
-          .binding = 0,
-          .format = VK_FORMAT_R32G32B32A32_SFLOAT,
-          .offset = G_STRUCT_OFFSET (GskVulkanTextInstance, tex_rect),
-      },
-      {
-          .location = 2,
-          .binding = 0,
-          .format = VK_FORMAT_R32G32B32A32_SFLOAT,
-          .offset = G_STRUCT_OFFSET (GskVulkanTextInstance, color),
-      },
-      {
-          .location = 3,
-          .binding = 0,
-          .format = VK_FORMAT_R32G32_UINT,
-          .offset = G_STRUCT_OFFSET (GskVulkanTextInstance, tex_id),
-      }
-  };
-  static const VkPipelineVertexInputStateCreateInfo info = {
-      .sType = VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO,
-      .vertexBindingDescriptionCount = G_N_ELEMENTS (vertexBindingDescriptions),
-      .pVertexBindingDescriptions = vertexBindingDescriptions,
-      .vertexAttributeDescriptionCount = G_N_ELEMENTS (vertexInputAttributeDescription),
-      .pVertexAttributeDescriptions = vertexInputAttributeDescription
-  };
-
-  return &info;
+  return &gsk_vulkan_mask_info;
 }

 static void
@@ -113,7 +64,7 @@ gsk_vulkan_text_pipeline_collect_vertex_data (GskVulkanTextPipeline  *pipeline,
                                              guint                   num_glyphs,
                                              float                   scale)
 {
-  GskVulkanTextInstance *instances = (GskVulkanTextInstance *) data;
+  GskVulkanMaskInstance *instances = (GskVulkanMaskInstance *) data;
  int i;
  int count = 0;
  int x_position = 0;
@@ -129,7 +80,7 @@ gsk_vulkan_text_pipeline_collect_vertex_data (GskVulkanTextPipeline  *pipeline,
        {
          double cx = (x_position + gi->geometry.x_offset) / PANGO_SCALE;
          double cy = gi->geometry.y_offset / PANGO_SCALE;
-          GskVulkanTextInstance *instance = &instances[count];
+          GskVulkanMaskInstance *instance = &instances[count];
          GskVulkanCachedGlyph *glyph;

          glyph = gsk_vulkan_renderer_get_cached_glyph (renderer,
@@ -2,61 +2,19 @@

 #include "gskvulkantexturepipelineprivate.h"

+#include "vulkan/resources/texture.vert.h"
+
 struct _GskVulkanTexturePipeline
 {
  GObject parent_instance;
 };

-typedef struct _GskVulkanTextureInstance GskVulkanTextureInstance;
-
-struct _GskVulkanTextureInstance
-{
-  float rect[4];
-  float tex_rect[4];
-  guint32 tex_id[2];
-};
-
 G_DEFINE_TYPE (GskVulkanTexturePipeline, gsk_vulkan_texture_pipeline, GSK_TYPE_VULKAN_PIPELINE)

 static const VkPipelineVertexInputStateCreateInfo *
 gsk_vulkan_texture_pipeline_get_input_state_create_info (GskVulkanPipeline *self)
 {
-  static const VkVertexInputBindingDescription vertexBindingDescriptions[] = {
-      {
-          .binding = 0,
-          .stride = sizeof (GskVulkanTextureInstance),
-          .inputRate = VK_VERTEX_INPUT_RATE_INSTANCE
-      }
-  };
-  static const VkVertexInputAttributeDescription vertexInputAttributeDescription[] = {
-      {
-          .location = 0,
-          .binding = 0,
-          .format = VK_FORMAT_R32G32B32A32_SFLOAT,
-          .offset = G_STRUCT_OFFSET (GskVulkanTextureInstance, rect),
-      },
-      {
-          .location = 1,
-          .binding = 0,
-          .format = VK_FORMAT_R32G32B32A32_SFLOAT,
-          .offset = G_STRUCT_OFFSET (GskVulkanTextureInstance, tex_rect),
-      },
-      {
-          .location = 2,
-          .binding = 0,
-          .format = VK_FORMAT_R32G32_UINT,
-          .offset = G_STRUCT_OFFSET (GskVulkanTextureInstance, tex_id),
-      }
-  };
-  static const VkPipelineVertexInputStateCreateInfo info = {
-      .sType = VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO,
-      .vertexBindingDescriptionCount = G_N_ELEMENTS (vertexBindingDescriptions),
-      .pVertexBindingDescriptions = vertexBindingDescriptions,
-      .vertexAttributeDescriptionCount = G_N_ELEMENTS (vertexInputAttributeDescription),
-      .pVertexAttributeDescriptions = vertexInputAttributeDescription
-  };
-
-  return &info;
+  return &gsk_vulkan_texture_info;
 }

 static void
@@ -3,9 +3,7 @@
 #include "clip.vert.glsl"
 #include "rounded-rect.glsl"

-layout(location = 0) in vec4 inRect;
-layout(location = 1) in vec4 inCornerWidths;
-layout(location = 2) in vec4 inCornerHeights;
+layout(location = 0) in mat3x4 inRect;
 layout(location = 3) in vec4 inBorderWidths;
 layout(location = 4) in mat4 inBorderColors;

@@ -44,47 +42,47 @@ void main() {
  int slice_index = gl_VertexIndex / 6;
  int vert_index = gl_VertexIndex % 6;

-  vec4 corner_widths = max (inCornerWidths, inBorderWidths.wyyw);
-  vec4 corner_heights = max (inCornerHeights, inBorderWidths.xxzz);
+  vec4 corner_widths = max (inRect[1], inBorderWidths.wyyw);
+  vec4 corner_heights = max (inRect[2], inBorderWidths.xxzz);

  Rect rect;

  switch (slice_index)
    {
    case SLICE_TOP_LEFT:
-      rect = rect_from_gsk (vec4(inRect.xy, corner_widths[TOP_LEFT], corner_heights[TOP_LEFT]));
+      rect = rect_from_gsk (vec4(inRect[0].xy, corner_widths[TOP_LEFT], corner_heights[TOP_LEFT]));
      rect = rect_round_larger (rect);
      vert_index = (vert_index + 3) % 6;
      break;
    case SLICE_TOP:
-      rect = rect_from_gsk (vec4(inRect.x + corner_widths[TOP_LEFT], inRect.y, inRect.z - corner_widths[TOP_LEFT] - corner_widths[TOP_RIGHT], inBorderWidths[TOP]));
+      rect = rect_from_gsk (vec4(inRect[0].x + corner_widths[TOP_LEFT], inRect[0].y, inRect[0].z - corner_widths[TOP_LEFT] - corner_widths[TOP_RIGHT], inBorderWidths[TOP]));
      rect = rect_round_smaller_larger (rect);
      outColor = inBorderColors[TOP];
      break;
    case SLICE_TOP_RIGHT:
-      rect = rect_from_gsk (vec4(inRect.x + inRect.z - corner_widths[TOP_RIGHT], inRect.y, corner_widths[TOP_RIGHT], corner_heights[TOP_RIGHT]));
+      rect = rect_from_gsk (vec4(inRect[0].x + inRect[0].z - corner_widths[TOP_RIGHT], inRect[0].y, corner_widths[TOP_RIGHT], corner_heights[TOP_RIGHT]));
      rect = rect_round_larger (rect);
      break;
    case SLICE_RIGHT:
-      rect = rect_from_gsk (vec4(inRect.x + inRect.z - inBorderWidths[RIGHT], inRect.y + corner_heights[TOP_RIGHT], inBorderWidths[RIGHT], inRect.w - corner_heights[TOP_RIGHT] - corner_heights[BOTTOM_RIGHT]));
+      rect = rect_from_gsk (vec4(inRect[0].x + inRect[0].z - inBorderWidths[RIGHT], inRect[0].y + corner_heights[TOP_RIGHT], inBorderWidths[RIGHT], inRect[0].w - corner_heights[TOP_RIGHT] - corner_heights[BOTTOM_RIGHT]));
      rect = rect_round_larger_smaller (rect);
      outColor = inBorderColors[RIGHT];
      break;
    case SLICE_BOTTOM_RIGHT:
-      rect = rect_from_gsk (vec4(inRect.x + inRect.z - corner_widths[BOTTOM_RIGHT], inRect.y + inRect.w - corner_heights[BOTTOM_RIGHT], corner_widths[BOTTOM_RIGHT], corner_heights[BOTTOM_RIGHT]));
+      rect = rect_from_gsk (vec4(inRect[0].x + inRect[0].z - corner_widths[BOTTOM_RIGHT], inRect[0].y + inRect[0].w - corner_heights[BOTTOM_RIGHT], corner_widths[BOTTOM_RIGHT], corner_heights[BOTTOM_RIGHT]));
      rect = rect_round_larger (rect);
      break;
    case SLICE_BOTTOM:
-      rect = rect_from_gsk (vec4(inRect.x + corner_widths[BOTTOM_LEFT], inRect.y + inRect.w - inBorderWidths[BOTTOM], inRect.z - corner_widths[BOTTOM_LEFT] - corner_widths[BOTTOM_RIGHT], inBorderWidths[BOTTOM]));
+      rect = rect_from_gsk (vec4(inRect[0].x + corner_widths[BOTTOM_LEFT], inRect[0].y + inRect[0].w - inBorderWidths[BOTTOM], inRect[0].z - corner_widths[BOTTOM_LEFT] - corner_widths[BOTTOM_RIGHT], inBorderWidths[BOTTOM]));
      rect = rect_round_smaller_larger (rect);
      break;
    case SLICE_BOTTOM_LEFT:
-      rect = rect_from_gsk (vec4(inRect.x, inRect.y + inRect.w - corner_heights[BOTTOM_LEFT], corner_widths[BOTTOM_LEFT], corner_heights[BOTTOM_LEFT]));
+      rect = rect_from_gsk (vec4(inRect[0].x, inRect[0].y + inRect[0].w - corner_heights[BOTTOM_LEFT], corner_widths[BOTTOM_LEFT], corner_heights[BOTTOM_LEFT]));
      vert_index = (vert_index + 3) % 6;
      rect = rect_round_larger (rect);
      break;
    case SLICE_LEFT:
-      rect = rect_from_gsk (vec4(inRect.x, inRect.y + corner_heights[TOP_LEFT], inBorderWidths[LEFT], inRect.w - corner_heights[TOP_LEFT] - corner_heights[BOTTOM_LEFT]));
+      rect = rect_from_gsk (vec4(inRect[0].x, inRect[0].y + corner_heights[TOP_LEFT], inBorderWidths[LEFT], inRect[0].w - corner_heights[TOP_LEFT] - corner_heights[BOTTOM_LEFT]));
      rect = rect_round_larger_smaller (rect);
      break;
    }
@@ -99,7 +97,7 @@ void main() {
  gl_Position = push.mvp * vec4 (pos, 0.0, 1.0);
  outColor = inBorderColors[((gl_VertexIndex / 3 + 15) / 4) % 4];
  outPos = pos;
-  outRect = RoundedRect(inRect.xyxy + vec4(0,0,inRect.zw), inCornerWidths, inCornerHeights);
+  outRect = RoundedRect(inRect[0].xyxy + vec4(0,0,inRect[0].zw), inRect[1], inRect[2]);
  outRect = rounded_rect_scale (outRect, push.scale);
  outBorderWidths = inBorderWidths * push.scale.yxyx;
 }
@@ -0,0 +1,174 @@
+#!/usr/bin/env python3
+
+import sys
+import re
+import os
+
+name = os.path.splitext(os.path.basename(sys.argv[1]))[0]
+var_name = "gsk_vulkan_" + name.replace('-', '_')
+struct_name = "GskVulkan" + name.title().replace('-', '') + "Instance"
+
+with open(sys.argv[1]) as f:
+    lines = f.readlines()
+    matches = []
+
+    for line in lines:
+        match = re.search(r"^layout\(location = ([0-9]+)\) in ([a-z0-9]+) ([a-zA-Z0-9]+);$", line)
+        if not match:
+            if re.search(r"layout.*\sin\s.*", line):
+                raise Exception("Failed to parse file")
+            continue
+        if not match.group(3).startswith('in'):
+            raise Exception("Variable doesn't start with 'in'")
+        matches.append({'name': ''.join('_' + char.lower() if char.isupper() else char for char in match.group(3))[3:],
+                        'location': int(match.group(1)),
+                        'type': match.group(2)})
+
+print(f'''/* This file is auto-generated; any change will not be preserved */
+#pragma once
+
+typedef struct _{struct_name} {struct_name};
+
+struct _{struct_name} {{''')
+
+expected = 0
+for match in matches:
+    if expected != int(match['location']):
+        raise Exception(f"Should be layout location {expected} but is {match['location']}")  # noqa
+
+    if match['type'] == 'float':
+        print(f"  float {match['name']};")
+        expected += 1
+    elif match['type'] == 'int':
+        print(f"  gint32 {match['name']};")
+        expected += 1
+    elif match['type'] == 'uint':
+        print(f"  guint32 {match['name']};")
+        expected += 1
+    elif match['type'] == 'uvec2':
+        print(f"  guint32 {match['name']}[2];")
+        expected += 1
+    elif match['type'] == 'vec2':
+        print(f"  float {match['name']}[2];")
+        expected += 1
+    elif match['type'] == 'vec4':
+        print(f"  float {match['name']}[4];")
+        expected += 1
+    elif match['type'] == 'mat3x4':
+        print(f"  float {match['name']}[12];")
+        expected += 3
+    elif match['type'] == 'mat4':
+        print(f"  float {match['name']}[16];")
+        expected += 4
+    else:
+        raise Exception(f"Don't know what a {match['type']} is")
+
+print('''};
+''')
+
+print(f'''static const VkPipelineVertexInputStateCreateInfo {var_name}_info = {{
+  .sType = VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO,
+  .vertexBindingDescriptionCount = 1,
+  .pVertexBindingDescriptions = (VkVertexInputBindingDescription[1]) {{
+      {{
+        .binding = 0,
+        .stride = sizeof ({struct_name}),
+        .inputRate = VK_VERTEX_INPUT_RATE_INSTANCE
+      }}
+  }},
+  .vertexAttributeDescriptionCount = {expected},
+  .pVertexAttributeDescriptions = (VkVertexInputAttributeDescription[{expected}]) {{''')
+
+for match in matches:
+    if match['type'] == 'float':
+        print(f'''      {{
+        .location = {match['location']},
+        .binding = 0,
+        .format = VK_FORMAT_R32_SFLOAT,
+        .offset = G_STRUCT_OFFSET({struct_name}, {match['name']}),
+      }},''')
+    elif match['type'] == 'int':
+        print(f'''      {{
+        .location = {match['location']},
+        .binding = 0,
+        .format = VK_FORMAT_R32_SINT,
+        .offset = G_STRUCT_OFFSET({struct_name}, {match['name']}),
+      }},''')
+
+    elif match['type'] == 'uint':
+        print(f'''      {{
+        .location = {match['location']},
+        .binding = 0,
+        .format = VK_FORMAT_R32_UINT,
+        .offset = G_STRUCT_OFFSET({struct_name}, {match['name']}),
+      }},''')
+    elif match['type'] == 'uvec2':
+        print(f'''      {{
+        .location = {match['location']},
+        .binding = 0,
+        .format = VK_FORMAT_R32G32_UINT,
+        .offset = G_STRUCT_OFFSET({struct_name}, {match['name']}),
+      }},''')
+    elif match['type'] == 'vec2':
+        print(f'''      {{
+        .location = {match['location']},
+        .binding = 0,
+        .format = VK_FORMAT_R32G32_SFLOAT,
+        .offset = G_STRUCT_OFFSET({struct_name}, {match['name']}),
+      }},''')
+    elif match['type'] == 'vec4':
+        print(f'''      {{
+        .location = {match['location']},
+        .binding = 0,
+        .format = VK_FORMAT_R32G32B32A32_SFLOAT,
+        .offset = G_STRUCT_OFFSET({struct_name}, {match['name']}),
+      }},''')
+    elif match['type'] == 'mat3x4':
+        print(f'''      {{
+        .location = {match['location']},
+        .binding = 0,
+        .format = VK_FORMAT_R32G32B32A32_SFLOAT,
+        .offset = G_STRUCT_OFFSET({struct_name}, {match['name']}),
+      }},
+      {{
+        .location = {int(match['location']) + 1},
+        .binding = 0,
+        .format = VK_FORMAT_R32G32B32A32_SFLOAT,
+        .offset = G_STRUCT_OFFSET({struct_name}, {match['name']}) + sizeof (float) * 4,
+      }},
+      {{
+        .location = {int(match['location']) + 2},
+        .binding = 0,
+        .format = VK_FORMAT_R32G32B32A32_SFLOAT,
+        .offset = G_STRUCT_OFFSET({struct_name}, {match['name']}) + sizeof (float) * 8,
+      }},''')
+    elif match['type'] == 'mat4':
+        print(f'''      {{
+        .location = {match['location']},
+        .binding = 0,
+        .format = VK_FORMAT_R32G32B32A32_SFLOAT,
+        .offset = G_STRUCT_OFFSET({struct_name}, {match['name']}),
+      }},
+      {{
+        .location = {int(match['location']) + 1},
+        .binding = 0,
+        .format = VK_FORMAT_R32G32B32A32_SFLOAT,
+        .offset = G_STRUCT_OFFSET({struct_name}, {match['name']}) + sizeof (float) * 4,
+      }},
+      {{
+        .location = {int(match['location']) + 2},
+        .binding = 0,
+        .format = VK_FORMAT_R32G32B32A32_SFLOAT,
+        .offset = G_STRUCT_OFFSET({struct_name}, {match['name']}) + sizeof (float) * 8,
+      }},
+      {{
+        .location = {int(match['location']) + 3},
+        .binding = 0,
+        .format = VK_FORMAT_R32G32B32A32_SFLOAT,
+        .offset = G_STRUCT_OFFSET({struct_name}, {match['name']}) + sizeof (float) * 12,
+      }},''')
+    else:
+        raise Exception(f"Don't know what a {match['type']} is")
+
+print("  },")
+print("};")
@@ -2,9 +2,7 @@

 #include "clip.vert.glsl"

-layout(location = 0) in vec4 inOutline;
-layout(location = 1) in vec4 inOutlineCornerWidths;
-layout(location = 2) in vec4 inOutlineCornerHeights;
+layout(location = 0) in mat3x4 inOutline;
 layout(location = 3) in vec4 inColor;
 layout(location = 4) in vec2 inOffset;
 layout(location = 5) in float inSpread;
@@ -26,15 +24,15 @@ vec2 offsets[6] = { vec2(0.0, 0.0),
                    vec2(1.0, 1.0) };

 void main() {
-  vec4 rect = clip (inOutline);
+  vec4 rect = clip (inOutline[0]);

  vec2 pos = rect.xy + rect.zw * offsets[gl_VertexIndex];
  gl_Position = push.mvp * vec4 (push.scale * pos, 0.0, 1.0);
  outPos = pos;

-  outOutline = inOutline;
-  outOutlineCornerWidths = inOutlineCornerWidths;
-  outOutlineCornerHeights = inOutlineCornerHeights;
+  outOutline = inOutline[0];
+  outOutlineCornerWidths = inOutline[1];
+  outOutlineCornerHeights = inOutline[2];
  outColor = inColor;
  outOffset = inOffset;
  outSpread = inSpread;
@@ -12,12 +12,12 @@ gsk_private_vulkan_include_shaders = [
 ]

 gsk_private_vulkan_fragment_shaders = [
-  'blendmode.frag',
+  'blend-mode.frag',
  'blur.frag',
  'border.frag',
  'color.frag',
  'color-matrix.frag',
-  'crossfade.frag',
+  'cross-fade.frag',
  'inset-shadow.frag',
  'linear.frag',
  'mask.frag',
@@ -26,12 +26,12 @@ gsk_private_vulkan_fragment_shaders = [
 ]

 gsk_private_vulkan_vertex_shaders = [
-  'blendmode.vert',
+  'blend-mode.vert',
  'blur.vert',
  'border.vert',
  'color.vert',
  'color-matrix.vert',
-  'crossfade.vert',
+  'cross-fade.vert',
  'inset-shadow.vert',
  'linear.vert',
  'mask.vert',
@@ -87,6 +87,19 @@ foreach shader: gsk_private_vulkan_shaders
                                                   '-o', '@OUTPUT@'
                                                 ])
    gsk_private_vulkan_compiled_shaders_deps += [compiled_shader, compiled_clip_shader, compiled_clip_rounded_shader]
+    gsk_private_vulkan_compiled_shaders += [spv_shader, clip_spv_shader, clip_rounded_spv_shader]
+  else
+    gsk_private_vulkan_compiled_shaders += files(spv_shader, clip_spv_shader, clip_rounded_spv_shader)
  endif
-  gsk_private_vulkan_compiled_shaders += files(spv_shader, clip_spv_shader, clip_rounded_spv_shader)
+endforeach
+
+foreach shader: gsk_private_vulkan_vertex_shaders
+  shader_header = configure_file(output: '@0@.h'.format(shader),
+                                 input: shader,
+                                 command: [
+                                   find_program('generate-header.py'),
+                                   '@INPUT@',
+                                 ],
+                                 capture: true)
+  gsk_private_vulkan_shader_headers += shader_header
 endforeach
@@ -2,9 +2,7 @@

 #include "clip.vert.glsl"

-layout(location = 0) in vec4 inOutline;
-layout(location = 1) in vec4 inOutlineCornerWidths;
-layout(location = 2) in vec4 inOutlineCornerHeights;
+layout(location = 0) in mat3x4 inOutline;
 layout(location = 3) in vec4 inColor;
 layout(location = 4) in vec2 inOffset;
 layout(location = 5) in float inSpread;
@@ -31,19 +29,19 @@ float radius_pixels(float radius) {
 }

 void main() {
-  vec4 rect = inOutline;
+  vec4 rect = inOutline[0];
  float spread = inSpread + radius_pixels(inBlurRadius);
  rect += vec4(inOffset - spread, vec2(2 * spread));
  
-  clip (inOutline);
+  clip (inOutline[0]);

  vec2 pos = rect.xy + rect.zw * offsets[gl_VertexIndex];
  gl_Position = push.mvp * vec4 (push.scale * pos, 0.0, 1.0);
  outPos = pos;

-  outOutline = inOutline;
-  outOutlineCornerWidths = inOutlineCornerWidths;
-  outOutlineCornerHeights = inOutlineCornerHeights;
+  outOutline = inOutline[0];
+  outOutlineCornerWidths = inOutline[1];
+  outOutlineCornerHeights = inOutline[2];
  outColor = inColor;
  outOffset = inOffset;
  outSpread = inSpread;
@@ -733,7 +733,7 @@ gtk_alert_dialog_choose (GtkAlertDialog      *self,
 * and returns the index of the button that was clicked.
 *
 * Returns: the index of the button that was clicked, or -1 if
- *   the dialog was cancelled and `[property@Gtk.AlertDialog:cancel-button]
+ *   the dialog was cancelled and [property@Gtk.AlertDialog:cancel-button]
 *   is not set
 *
 * Since: 4.10
@@ -1333,6 +1333,8 @@ gtk_at_context_get_text_accumulate (GtkATContext          *self,
              GtkATContext *rel_context = gtk_accessible_get_at_context (rel);

              gtk_at_context_get_text_accumulate (rel_context, nodes, s, property, relation, FALSE, TRUE);
+
+              g_object_unref (rel_context);
            }

           if (s->len > 0)
@@ -44,6 +44,7 @@
 #include "gtkbuilderprivate.h"
 #include "gtkstringlist.h"
 #include "gtkbox.h"
+#include "gtktypebuiltins.h"

 /**
 * GtkDropDown:
@@ -104,6 +105,8 @@ struct _GtkDropDown
 {
  GtkWidget parent_instance;

+  gboolean uses_default_factory;
+  gboolean uses_default_list_factory;
  GtkListItemFactory *factory;
  GtkListItemFactory *list_factory;
  GtkListItemFactory *header_factory;
@@ -124,6 +127,8 @@ struct _GtkDropDown
  GtkWidget *search_entry;

  GtkExpression *expression;
+  
+  GtkStringFilterMatchMode search_match_mode;

  guint enable_search : 1;
  guint show_arrow : 1;
@@ -146,6 +151,7 @@ enum
  PROP_ENABLE_SEARCH,
  PROP_EXPRESSION,
  PROP_SHOW_ARROW,
+  PROP_SEARCH_MATCH_MODE,

  N_PROPS
 };
@@ -279,7 +285,7 @@ update_filter (GtkDropDown *self)
      if (self->expression)
        {
          filter = GTK_FILTER (gtk_string_filter_new (gtk_expression_ref (self->expression)));
-          gtk_string_filter_set_match_mode (GTK_STRING_FILTER (filter), GTK_STRING_FILTER_MATCH_MODE_PREFIX);
+          gtk_string_filter_set_match_mode (GTK_STRING_FILTER (filter), self->search_match_mode);
        }
      else
        filter = GTK_FILTER (gtk_every_filter_new ());
@@ -388,6 +394,10 @@ gtk_drop_down_get_property (GObject    *object,
    case PROP_SHOW_ARROW:
      g_value_set_boolean (value, gtk_drop_down_get_show_arrow (self));
      break;
+      
+    case PROP_SEARCH_MATCH_MODE:
+      g_value_set_enum (value, gtk_drop_down_get_search_match_mode (self));
+      break;

    default:
      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
@@ -436,6 +446,11 @@ gtk_drop_down_set_property (GObject      *object,
    case PROP_SHOW_ARROW:
      gtk_drop_down_set_show_arrow (self, g_value_get_boolean (value));
      break;
+      
+    case PROP_SEARCH_MATCH_MODE:
+      gtk_drop_down_set_search_match_mode (self, g_value_get_enum (value));
+      break;
+

    default:
      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
@@ -641,7 +656,20 @@ gtk_drop_down_class_init (GtkDropDownClass *klass)
    g_param_spec_boolean  ("show-arrow", NULL, NULL,
                           TRUE,
                           G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);
-
+                           
+  /**
+   * GtkDropDown:search-match-mode: (attributes org.gtk.Property.get=gtk_drop_down_get_search_match_mode org.gtk.Property.set=gtk_drop_down_set_search_match_mode)
+   *
+   * The match mode for the search filter.
+   *
+   * Since: 4.12
+   */
+  properties[PROP_SEARCH_MATCH_MODE] =
+    g_param_spec_enum  ("search-match-mode", NULL, NULL,
+                           GTK_TYPE_STRING_FILTER_MATCH_MODE,
+                           GTK_STRING_FILTER_MATCH_MODE_PREFIX,
+                           G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);
+                           
  g_object_class_install_properties (gobject_class, N_PROPS, properties);

  /**
@@ -794,6 +822,10 @@ set_default_factory (GtkDropDown *self)
  g_signal_connect (factory, "unbind", G_CALLBACK (unbind_item), self);

  gtk_drop_down_set_factory (self, factory);
+  self->uses_default_factory = TRUE;
+
+  if (self->uses_default_list_factory)
+    gtk_drop_down_set_list_factory (self, NULL);

  g_object_unref (factory);
 }
@@ -809,6 +841,8 @@ gtk_drop_down_init (GtkDropDown *self)
  self->show_arrow = gtk_widget_get_visible (self->arrow);

  set_default_factory (self);
+ 
+  self->search_match_mode = GTK_STRING_FILTER_MATCH_MODE_PREFIX;
 }

 /**
@@ -972,7 +1006,12 @@ gtk_drop_down_set_factory (GtkDropDown        *self,
    gtk_list_factory_widget_set_factory (GTK_LIST_FACTORY_WIDGET (self->button_item), factory);

  if (self->list_factory == NULL)
-    gtk_list_view_set_factory (GTK_LIST_VIEW (self->popup_list), factory);
+    {
+      gtk_list_view_set_factory (GTK_LIST_VIEW (self->popup_list), factory);
+      self->uses_default_list_factory = TRUE;
+    }
+
+  self->uses_default_factory = factory != NULL;

  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_FACTORY]);
 }
@@ -1057,6 +1096,8 @@ gtk_drop_down_set_list_factory (GtkDropDown        *self,
  else
    gtk_list_view_set_factory (GTK_LIST_VIEW (self->popup_list), self->factory);

+  self->uses_default_list_factory = factory != NULL;
+
  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_LIST_FACTORY]);
 }

@@ -1194,6 +1235,9 @@ gtk_drop_down_set_expression (GtkDropDown   *self,
  if (self->expression)
    gtk_expression_ref (self->expression);

+  if (self->uses_default_factory)
+    set_default_factory (self);
+
  update_filter (self);

  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_EXPRESSION]);
@@ -1260,3 +1304,46 @@ gtk_drop_down_get_show_arrow (GtkDropDown *self)

  return self->show_arrow;
 }
+
+/**
+ * gtk_drop_down_set_search_match_mode: (attributes org.gtk.Method.set_property=search-match-mode)
+ * @self: a `GtkDropDown`
+ * @search_match_mode: the new match mode
+ *
+ * Sets the match mode for the search filter.
+ * 
+ * Since: 4.12
+ */
+void
+gtk_drop_down_set_search_match_mode (GtkDropDown *self,
+                                     GtkStringFilterMatchMode search_match_mode)
+{
+  g_return_if_fail (GTK_IS_DROP_DOWN (self));
+
+  if (self->search_match_mode == search_match_mode)
+    return;
+
+  self->search_match_mode = search_match_mode;
+
+  update_filter (self);
+
+  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_SEARCH_MATCH_MODE]);
+}
+
+/**
+ * gtk_drop_down_get_search_match_mode: (attributes org.gtk.Method.get_property=search-match-mode)
+ * @self: a `GtkDropDown`
+ *
+ * Returns the match mode that the search filter is using.
+ *
+ * Returns: the match mode of the search filter
+ * 
+ * Since: 4.12
+ */
+GtkStringFilterMatchMode
+gtk_drop_down_get_search_match_mode (GtkDropDown *self)
+{
+  g_return_val_if_fail (GTK_IS_DROP_DOWN (self), GTK_STRING_FILTER_MATCH_MODE_PREFIX);
+
+  return self->search_match_mode;
+}
@@ -21,6 +21,7 @@

 #include <gtk/gtkwidget.h>
 #include <gtk/gtkexpression.h>
+#include "gtk/gtkstringfilter.h"

 G_BEGIN_DECLS

@@ -83,11 +84,19 @@ void            gtk_drop_down_set_enable_search                 (GtkDropDown
                                                                 gboolean                enable_search);
 GDK_AVAILABLE_IN_ALL
 gboolean        gtk_drop_down_get_enable_search                 (GtkDropDown            *self);
+
 GDK_AVAILABLE_IN_4_6
 void            gtk_drop_down_set_show_arrow                    (GtkDropDown            *self,
                                                                 gboolean                show_arrow);
 GDK_AVAILABLE_IN_4_6
 gboolean        gtk_drop_down_get_show_arrow                    (GtkDropDown            *self);

+GDK_AVAILABLE_IN_4_12
+void            gtk_drop_down_set_search_match_mode             (GtkDropDown            *self,
+                                                                 GtkStringFilterMatchMode search_match_mode);
+GDK_AVAILABLE_IN_4_12
+GtkStringFilterMatchMode
+                gtk_drop_down_get_search_match_mode             (GtkDropDown            *self);
+
 G_END_DECLS

@@ -507,13 +507,19 @@ gtk_drop_target_handle_crossing (GtkEventController    *controller,
      graphene_point_init (&self->coords, x, y);
      gtk_drop_target_start_drop (self, crossing->drop);

-      g_signal_emit (self, signals[ENTER], 0, x, y, &preferred);
-        if (!gdk_drag_action_is_unique (preferred))
-          {
-            g_critical ("Handler for GtkDropTarget::enter on %s %p did not return a unique preferred action",
-                        G_OBJECT_TYPE_NAME (widget), widget);
-            preferred = make_action_unique (preferred);
-          }
+      /* start_drop ends w/ thaw_notify, where handler may reject, so recheck */
+      if (self->drop != NULL)
+        g_signal_emit (self, signals[ENTER], 0, x, y, &preferred);
+      else
+        preferred = 0;
+
+      if (!gdk_drag_action_is_unique (preferred))
+        {
+          g_critical ("Handler for GtkDropTarget::enter on %s %p did not return a unique preferred action",
+                      G_OBJECT_TYPE_NAME (widget), widget);
+          preferred = make_action_unique (preferred);
+        }
+
      if (preferred &&
          gtk_drop_status (self->drop, self->actions, preferred))
        {
@@ -533,6 +539,7 @@ gtk_drop_target_handle_crossing (GtkEventController    *controller,
      g_signal_emit (self, signals[LEAVE], 0);
      if (!self->dropping)
        gtk_drop_target_end_drop (self);
+
      gtk_widget_unset_state_flags (widget, GTK_STATE_FLAG_DROP_ACTIVE);
    }
 }
@@ -181,7 +181,7 @@ gtk_image_class_init (GtkImageClass *class)
  /**
   * GtkImage:file: (attributes org.gtk.Property.set=gtk_image_set_from_file)
   *
-   * The `GFile to display.
+   * The `GFile` to display.
   */
  image_props[PROP_FILE] =
      g_param_spec_string ("file", NULL, NULL,
@@ -762,6 +762,7 @@ gtk_image_set_from_icon_name  (GtkImage    *image,
    _gtk_icon_helper_set_icon_name (image->icon_helper, icon_name);

  g_object_notify_by_pspec (G_OBJECT (image), image_props[PROP_ICON_NAME]);
+  g_object_notify_by_pspec (G_OBJECT (image), image_props[PROP_STORAGE_TYPE]);

  g_object_thaw_notify (G_OBJECT (image));
 }
@@ -795,6 +796,7 @@ gtk_image_set_from_gicon  (GtkImage       *image,
    }

  g_object_notify_by_pspec (G_OBJECT (image), image_props[PROP_GICON]);
+  g_object_notify_by_pspec (G_OBJECT (image), image_props[PROP_STORAGE_TYPE]);

  g_object_thaw_notify (G_OBJECT (image));
 }
@@ -857,6 +859,7 @@ gtk_image_set_from_paintable (GtkImage     *image,
    }

  g_object_notify_by_pspec (G_OBJECT (image), image_props[PROP_PAINTABLE]);
+  g_object_notify_by_pspec (G_OBJECT (image), image_props[PROP_STORAGE_TYPE]);

  g_object_thaw_notify (G_OBJECT (image));
 }
@@ -1079,6 +1082,8 @@ gtk_image_set_from_definition (GtkImage           *image,
      gtk_image_notify_for_storage_type (image, gtk_image_definition_get_storage_type (def));
    }

+  g_object_notify_by_pspec (G_OBJECT (image), image_props[PROP_STORAGE_TYPE]);
+
  g_object_thaw_notify (G_OBJECT (image));
 }

@@ -2249,7 +2249,7 @@ gtk_list_base_set_anchor (GtkListBase *self,
 * in front of it.
 *
 * Addditionally, there will be @above_below widgets allocated both
- * before and after the sencter widgets, so the total number of
+ * before and after the center widgets, so the total number of
 * widgets kept alive is 2 * above_below + center + 1.
 **/
 void
@@ -1356,6 +1356,7 @@ gtk_list_item_manager_ensure_items (GtkListItemManager *self,
                                             position + i,
                                             item,
                                             gtk_selection_model_is_selected (self->model, position + i));
+                  g_object_unref (item);
                  gtk_widget_insert_after (tile->widget, self->widget, insert_after);
                }
              else
@@ -22,6 +22,7 @@
 #include "gtkmaplistmodel.h"

 #include "gtkrbtreeprivate.h"
+#include "gtksectionmodel.h"
 #include "gtkprivate.h"

 /**
@@ -54,6 +55,8 @@
 *
 * `GtkMapListModel` will attempt to discard the mapped objects as soon as
 * they are no longer needed and recreate them if necessary.
+ *
+ * `GtkMapListModel` passes through sections from the underlying model.
 */

 enum {
@@ -207,8 +210,43 @@ gtk_map_list_model_model_init (GListModelInterface *iface)
  iface->get_item = gtk_map_list_model_get_item;
 }

+static void
+gtk_map_list_model_get_section (GtkSectionModel *model,
+                                guint            position,
+                                guint           *out_start,
+                                guint           *out_end)
+{
+  GtkMapListModel *self = GTK_MAP_LIST_MODEL (model);
+
+  if (GTK_IS_SECTION_MODEL (self->model))
+    {
+      gtk_section_model_get_section (GTK_SECTION_MODEL (self->model), position, out_start, out_end);
+      return;
+    }
+
+  *out_start = 0;
+  *out_end = self->model ? g_list_model_get_n_items (self->model) : 0;
+}
+
+static void
+gtk_map_list_model_sections_changed_cb (GtkSectionModel *model,
+                                        unsigned int     position,
+                                        unsigned int     n_items,
+                                        gpointer         user_data)
+{
+  gtk_section_model_sections_changed (GTK_SECTION_MODEL (user_data), position, n_items);
+}
+
+
+static void
+gtk_map_list_model_section_model_init (GtkSectionModelInterface *iface)
+{
+  iface->get_section = gtk_map_list_model_get_section;
+}
+
 G_DEFINE_TYPE_WITH_CODE (GtkMapListModel, gtk_map_list_model, G_TYPE_OBJECT,
-                         G_IMPLEMENT_INTERFACE (G_TYPE_LIST_MODEL, gtk_map_list_model_model_init))
+                         G_IMPLEMENT_INTERFACE (G_TYPE_LIST_MODEL, gtk_map_list_model_model_init)
+                         G_IMPLEMENT_INTERFACE (GTK_TYPE_SECTION_MODEL, gtk_map_list_model_section_model_init))

 static void
 gtk_map_list_model_items_changed_cb (GListModel      *model,
@@ -337,6 +375,7 @@ gtk_map_list_model_clear_model (GtkMapListModel *self)
  if (self->model == NULL)
    return;

+  g_signal_handlers_disconnect_by_func (self->model, gtk_map_list_model_sections_changed_cb, self);
  g_signal_handlers_disconnect_by_func (self->model, gtk_map_list_model_items_changed_cb, self);
  g_clear_object (&self->model);
 }
@@ -608,6 +647,9 @@ gtk_map_list_model_set_model (GtkMapListModel *self,
      self->model = g_object_ref (model);
      g_signal_connect (model, "items-changed", G_CALLBACK (gtk_map_list_model_items_changed_cb), self);
      added = g_list_model_get_n_items (model);
+
+      if (GTK_IS_SECTION_MODEL (model))
+        g_signal_connect (model, "sections-changed", G_CALLBACK (gtk_map_list_model_sections_changed_cb), self);
    }
  else
    {
@@ -755,6 +755,8 @@ gtk_tooltip_show_tooltip (GdkDisplay *display)

  gtk_tooltip_position (tooltip, display, tooltip_widget, device);

+  g_signal_emit_by_name (tooltip_widget, "tooltip-show", tooltip);
+
  gtk_widget_set_visible (GTK_WIDGET (tooltip->window), TRUE);

  /* Now a tooltip is visible again on the display, make sure browse
@@ -771,6 +773,8 @@ gtk_tooltip_show_tooltip (GdkDisplay *display)
 static void
 gtk_tooltip_hide_tooltip (GtkTooltip *tooltip)
 {
+  GtkWidget *tooltip_widget;
+
  guint timeout = BROWSE_DISABLE_TIMEOUT;

  if (!tooltip)
@@ -785,6 +789,7 @@ gtk_tooltip_hide_tooltip (GtkTooltip *tooltip)
  if (!GTK_TOOLTIP_VISIBLE (tooltip))
    return;

+  tooltip_widget = tooltip->tooltip_widget;
  tooltip->tooltip_widget = NULL;

  /* The tooltip is gone, after (by default, should be configurable) 500ms
@@ -801,7 +806,10 @@ gtk_tooltip_hide_tooltip (GtkTooltip *tooltip)
    }

  if (tooltip->window)
-    gtk_widget_set_visible (tooltip->window, FALSE);
+    {
+      gtk_widget_set_visible (tooltip->window, FALSE);
+      g_signal_emit_by_name (tooltip_widget, "tooltip-hide", tooltip);
+    }
 }

 static int
@@ -1065,3 +1073,26 @@ gtk_tooltip_unset_surface (GtkNative *native)
  gtk_tooltip_set_surface (tooltip, NULL);
 }

+/**
+ * gtk_tooltip_set_css_class:
+ * @tooltip: a #GtkTooltip
+ * @css_class: (allow-none): a css class name, or %NULL
+ *
+ * This function allows to add a single css class
+ * to @tooltip window, that means it will remove any
+ * css class previously added by this function before
+ * adding @css_class as the currently active one.
+ *
+ * if %NULL is passed then any active css class (which
+ * was added by this function) will be cleared.
+ *
+ * Since: 4.12
+ */
+void
+gtk_tooltip_set_css_class (GtkTooltip *tooltip,
+                           const char *css_class)
+{
+  g_return_if_fail (GTK_IS_TOOLTIP (tooltip));
+
+  gtk_tooltip_window_set_css_class (GTK_TOOLTIP_WINDOW (tooltip->window), css_class);
+}
@@ -56,6 +56,9 @@ void gtk_tooltip_set_custom	         (GtkTooltip         *tooltip,
 GDK_AVAILABLE_IN_ALL
 void gtk_tooltip_set_tip_area            (GtkTooltip         *tooltip,
                                          const GdkRectangle *rect);
+GDK_AVAILABLE_IN_4_12
+void gtk_tooltip_set_css_class           (GtkTooltip *tooltip,
+                                          const char *css_class);

 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkTooltip, g_object_unref)

@@ -59,6 +59,7 @@ struct _GtkTooltipWindow
  GtkWidget *image;
  GtkWidget *label;
  GtkWidget *custom_widget;
+  char      *css_class;
 };

 struct _GtkTooltipWindowClass
@@ -392,6 +393,7 @@ static void
 gtk_tooltip_window_init (GtkTooltipWindow *self)
 {
  gtk_widget_init_template (GTK_WIDGET (self));
+  self->css_class = NULL;
 }

 GtkWidget *
@@ -520,3 +522,30 @@ gtk_tooltip_window_position (GtkTooltipWindow *window,

  gtk_tooltip_window_relayout (window);
 }
+
+/* See gtk_tooltip_set_css_class() description */
+void
+gtk_tooltip_window_set_css_class (GtkTooltipWindow *window,
+                                  const char       *css_class)
+{
+  GtkWidget *wid = GTK_WIDGET (window);
+
+  if (g_strcmp0 (window->css_class, css_class) == 0)
+    return;
+
+  if (css_class)
+    {
+      if (window->css_class)
+        {
+          gtk_widget_remove_css_class (wid, window->css_class);
+          g_free (window->css_class);
+        }
+      window->css_class = g_strdup (css_class);
+      gtk_widget_add_css_class (wid, css_class);
+    }
+  else
+    {
+      gtk_widget_remove_css_class (wid, window->css_class);
+      g_clear_pointer (&window->css_class, g_free);
+    }
+}
@@ -59,6 +59,8 @@ void            gtk_tooltip_window_position                     (GtkTooltipWindo
                                                                 GdkAnchorHints    anchor_hints,
                                                                 int               dx,
                                                                 int               dy);
+void            gtk_tooltip_window_set_css_class                (GtkTooltipWindow *window,
+                                                                 const char       *css_class);

 G_END_DECLS

@@ -502,6 +502,8 @@ enum {
  MOVE_FOCUS,
  KEYNAV_FAILED,
  QUERY_TOOLTIP,
+  TOOLTIP_SHOW,
+  TOOLTIP_HIDE,
  LAST_SIGNAL
 };

@@ -1926,6 +1928,38 @@ gtk_widget_class_init (GtkWidgetClass *klass)

  gtk_widget_class_set_css_name (klass, I_("widget"));
  klass->priv->accessible_role = GTK_ACCESSIBLE_ROLE_WIDGET;
+
+  /**
+   * GtkWidget::tooltip-show:
+   * @widget: the object which received the signal.
+   *
+   * Emitted when a tooltip is about to be shown on @widget.
+   */
+  widget_signals[TOOLTIP_SHOW] =
+    g_signal_new (I_("tooltip-show"),
+                  G_TYPE_FROM_CLASS (gobject_class),
+                  G_SIGNAL_RUN_FIRST,
+                  0,
+                  NULL, NULL,
+                  NULL,
+                  G_TYPE_NONE, 1,
+                  GTK_TYPE_TOOLTIP);
+
+  /**
+   * GtkWidget::tooltip-hide:
+   * @widget: the object which received the signal.
+   *
+   * Emitted when a tooltip on @widget has just been hidden.
+   */
+  widget_signals[TOOLTIP_HIDE] =
+    g_signal_new (I_("tooltip-hide"),
+                  G_TYPE_FROM_CLASS (gobject_class),
+                  G_SIGNAL_RUN_FIRST,
+                  0,
+                  NULL, NULL,
+                  NULL,
+                  G_TYPE_NONE, 1,
+                  GTK_TYPE_TOOLTIP);
 }

 static void
@@ -36,7 +36,7 @@
 extern IMAGE_DOS_HEADER __ImageBase;

 static inline HMODULE
-this_module ()
+this_module (void)
 {
  return (HMODULE) &__ImageBase;
 }
@@ -243,6 +243,8 @@ update_name (GtkInspectorA11y *sl)

  name = gtk_at_context_get_name (context);
  gtk_label_set_label (GTK_LABEL (sl->name), name);
+
+  g_object_unref (context);
 }

 static void
@@ -257,6 +259,8 @@ update_description (GtkInspectorA11y *sl)

  description = gtk_at_context_get_description (context);
  gtk_label_set_label (GTK_LABEL (sl->description), description);
+
+  g_object_unref (context);
 }

 static void
@@ -110,12 +110,11 @@ static struct {
 };

 static FixSeverity
-check_accessibility_errors (GtkWidget  *widget,
-                            GArray     *context_elements,
-                            char      **hint)
+check_accessibility_errors (GtkATContext       *context,
+                            GtkAccessibleRole   role,
+                            GArray             *context_elements,
+                            char              **hint)
 {
-  GtkAccessibleRole role;
-  GtkATContext *context;
  gboolean label_set;
  const char *role_name;
  GEnumClass *states;
@@ -124,11 +123,8 @@ check_accessibility_errors (GtkWidget  *widget,
  gboolean has_context;

  *hint = NULL;
-
-  role = gtk_accessible_get_accessible_role (GTK_ACCESSIBLE (widget));
  role_name = gtk_accessible_role_to_name (role, NULL);

-  context = gtk_accessible_get_at_context (GTK_ACCESSIBLE (widget));
  if (!gtk_at_context_is_realized (context))
    gtk_at_context_realize (context);

@@ -314,6 +310,23 @@ check_accessibility_errors (GtkWidget  *widget,
  return SEVERITY_GOOD;
 }

+static FixSeverity
+check_widget_accessibility_errors (GtkWidget  *widget,
+                                   GArray     *context_elements,
+                                   char      **hint)
+{
+  GtkAccessibleRole role;
+  GtkATContext *context;
+  FixSeverity ret;
+
+  role = gtk_accessible_get_accessible_role (GTK_ACCESSIBLE (widget));
+  context = gtk_accessible_get_at_context (GTK_ACCESSIBLE (widget));
+  ret = check_accessibility_errors (context, role, context_elements, hint);
+  g_object_unref (context);
+
+  return ret;
+}
+
 static void
 recurse_child_widgets (GtkA11yOverlay *self,
                       GtkWidget      *widget,
@@ -327,7 +340,7 @@ recurse_child_widgets (GtkA11yOverlay *self,
  if (!gtk_widget_get_mapped (widget))
    return;

-  severity = check_accessibility_errors (widget, self->context, &hint);
+  severity = check_widget_accessibility_errors (widget, self->context, &hint);

  if (severity != SEVERITY_GOOD)
    {
@@ -758,17 +758,7 @@ if not fs.exists('theme/Default/Default-light.css')
 endif


-objcopy_supports_add_symbol = false
-objcopy = find_program('objcopy', required : false)
-if objcopy.found()
-  objcopy_supports_add_symbol = run_command(objcopy, '--help', check: false).stdout().contains('--add-symbol')
-endif
-
-ld = find_program('ld', required : false)
-
-if not meson.is_cross_build() and build_machine.cpu_family() == 'x86_64' and build_machine.system() == 'linux' and objcopy.found() and objcopy_supports_add_symbol and ld.found()
-  glib_compile_resources = find_program('glib-compile-resources')
-
+if can_use_objcopy_for_resources
  # Create the resource blob
  gtk_gresource = custom_target('gtk.gresource',
      input : gtk_gresources_xml,
@@ -8,3 +8,4 @@ leak:libgio-2.0.so
 leak:libcairo.so
 leak:libpixman-1.so
 leak:librsvg-2.so
+leak:libxkbcommon.so
@@ -1,5 +1,5 @@
 project('gtk', 'c',
-        version: '4.11.4',
+        version: '4.11.5',
        default_options: [
          'buildtype=debugoptimized',
          'warning_level=1',
@@ -737,6 +737,27 @@ endif
 build_gir = gir.found() and (get_option('introspection').enabled() or
                             (get_option('introspection').allowed() and get_option('gtk_doc')))

+# Resource building
+glib_compile_resources = find_program('glib-compile-resources')
+
+objcopy_supports_add_symbol = false
+objcopy = find_program('objcopy', required : false)
+if objcopy.found()
+  objcopy_supports_add_symbol = run_command(objcopy, '--help', check: false).stdout().contains('--add-symbol')
+endif
+
+ld_is_bfd = false
+ld = find_program('ld', required : false)
+if ld.found()
+  ld_is_bfd = run_command(ld, '--version', check: false).stdout().contains('GNU ld')
+endif
+
+if not meson.is_cross_build() and build_machine.cpu_family() == 'x86_64' and build_machine.system() == 'linux' and objcopy.found() and objcopy_supports_add_symbol and ld.found() and ld_is_bfd
+  can_use_objcopy_for_resources = true
+else
+  can_use_objcopy_for_resources = false
+endif
+
 project_build_root = meson.current_build_dir()

 gen_visibility_macros = find_program('build-aux/meson/gen-visibility-macros.py')
@@ -6,6 +6,7 @@ static void
 test_name_content (void)
 {
  GtkWidget *window, *label1, *label2, *box, *button;
+  GtkATContext *context;
  char *name;

  label1 = gtk_label_new ("a");
@@ -21,24 +22,32 @@ test_name_content (void)
  gtk_window_set_child (GTK_WINDOW (window), button);
  gtk_window_present (GTK_WINDOW (window));

-  name = gtk_at_context_get_name (gtk_accessible_get_at_context (GTK_ACCESSIBLE (label1)));
+  context = gtk_accessible_get_at_context (GTK_ACCESSIBLE (label1));
+  name = gtk_at_context_get_name (context);
  g_assert_cmpstr (name, ==, "a");
  g_free (name);
+  g_object_unref (context);

  /* this is because generic doesn't allow naming */
-  name = gtk_at_context_get_name (gtk_accessible_get_at_context (GTK_ACCESSIBLE (box)));
+  context = gtk_accessible_get_at_context (GTK_ACCESSIBLE (box));
+  name = gtk_at_context_get_name (context);
  g_assert_cmpstr (name, ==, "");
  g_free (name);
+  g_object_unref (context);

-  name = gtk_at_context_get_name (gtk_accessible_get_at_context (GTK_ACCESSIBLE (button)));
+  context = gtk_accessible_get_at_context (GTK_ACCESSIBLE (button));
+  name = gtk_at_context_get_name (context);
  g_assert_cmpstr (name, ==, "a b");
  g_free (name);
+  g_object_unref (context);

  gtk_widget_set_visible (label2, FALSE);

-  name = gtk_at_context_get_name (gtk_accessible_get_at_context (GTK_ACCESSIBLE (button)));
+  context = gtk_accessible_get_at_context (GTK_ACCESSIBLE (button));
+  name = gtk_at_context_get_name (context);
  g_assert_cmpstr (name, ==, "a");
  g_free (name);
+  g_object_unref (context);

  gtk_window_destroy (GTK_WINDOW (window));
 }
@@ -47,6 +56,7 @@ static void
 test_name_tooltip (void)
 {
  GtkWidget *window, *image;
+  GtkATContext *context;
  char *name;

  image = gtk_image_new ();
@@ -57,10 +67,14 @@ test_name_tooltip (void)

  gtk_widget_set_tooltip_text (image, "tooltip");

-  name = gtk_at_context_get_name (gtk_accessible_get_at_context (GTK_ACCESSIBLE (image)));
+  context = gtk_accessible_get_at_context (GTK_ACCESSIBLE (image));
+
+  name = gtk_at_context_get_name (context);
  g_assert_cmpstr (name, ==, "tooltip");
  g_free (name);

+  g_object_unref (context);
+
  gtk_window_destroy (GTK_WINDOW (window));
 }

@@ -68,6 +82,7 @@ static void
 test_name_menubutton (void)
 {
  GtkWidget *window, *widget;
+  GtkATContext *context;
  char *name;

  widget = gtk_menu_button_new ();
@@ -79,10 +94,14 @@ test_name_menubutton (void)

  gtk_widget_set_tooltip_text (widget, "tooltip");

-  name = gtk_at_context_get_name (gtk_accessible_get_at_context (GTK_ACCESSIBLE (widget)));
+  context = gtk_accessible_get_at_context (GTK_ACCESSIBLE (widget));
+
+  name = gtk_at_context_get_name (context);
  g_assert_cmpstr (name, ==, "tooltip");
  g_free (name);

+  g_object_unref (context);
+
  gtk_window_destroy (GTK_WINDOW (window));
 }

@@ -90,6 +109,7 @@ static void
 test_name_label (void)
 {
  GtkWidget *window, *image;
+  GtkATContext *context;
  char *name;
  char *desc;

@@ -108,8 +128,10 @@ test_name_label (void)
                                  GTK_ACCESSIBLE_PROPERTY_LABEL, "label",
                                  -1);

-  name = gtk_at_context_get_name (gtk_accessible_get_at_context (GTK_ACCESSIBLE (image)));
-  desc = gtk_at_context_get_description (gtk_accessible_get_at_context (GTK_ACCESSIBLE (image)));
+  context = gtk_accessible_get_at_context (GTK_ACCESSIBLE (image));
+
+  name = gtk_at_context_get_name (context);
+  desc = gtk_at_context_get_description (context);

  g_assert_cmpstr (name, ==, "label");
  g_assert_cmpstr (desc, ==, "tooltip");
@@ -117,6 +139,8 @@ test_name_label (void)
  g_free (name);
  g_free (desc);

+  g_object_unref (context);
+
  gtk_window_destroy (GTK_WINDOW (window));
 }

@@ -124,6 +148,7 @@ static void
 test_name_prohibited (void)
 {
  GtkWidget *window, *widget;
+  GtkATContext *context;
  char *name;
  char *desc;

@@ -136,8 +161,10 @@ test_name_prohibited (void)
  gtk_window_set_child (GTK_WINDOW (window), widget);
  gtk_window_present (GTK_WINDOW (window));

-  name = gtk_at_context_get_name (gtk_accessible_get_at_context (GTK_ACCESSIBLE (widget)));
-  desc = gtk_at_context_get_description (gtk_accessible_get_at_context (GTK_ACCESSIBLE (widget)));
+  context = gtk_accessible_get_at_context (GTK_ACCESSIBLE (widget));
+
+  name = gtk_at_context_get_name (context);
+  desc = gtk_at_context_get_description (context);

  g_assert_cmpstr (name, ==, "");
  g_assert_cmpstr (desc, ==, "");
@@ -145,6 +172,8 @@ test_name_prohibited (void)
  g_free (name);
  g_free (desc);

+  g_object_unref (context);
+
  gtk_window_destroy (GTK_WINDOW (window));
 }

@@ -152,6 +181,7 @@ static void
 test_name_range (void)
 {
  GtkWidget *window, *scale;
+  GtkATContext *context;
  char *name;

  scale = gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, 0, 100, 10);
@@ -160,16 +190,20 @@ test_name_range (void)
  gtk_window_set_child (GTK_WINDOW (window), scale);
  gtk_window_present (GTK_WINDOW (window));

+  context = gtk_accessible_get_at_context (GTK_ACCESSIBLE (scale));
+
  g_assert_true (gtk_accessible_get_accessible_role (GTK_ACCESSIBLE (scale)) == GTK_ACCESSIBLE_ROLE_SLIDER);
-  g_assert_true (gtk_at_context_get_accessible_role (gtk_accessible_get_at_context (GTK_ACCESSIBLE (scale))) == GTK_ACCESSIBLE_ROLE_SLIDER);
+  g_assert_true (gtk_at_context_get_accessible_role (context) == GTK_ACCESSIBLE_ROLE_SLIDER);

  gtk_range_set_value (GTK_RANGE (scale), 50);

-  name = gtk_at_context_get_name (gtk_accessible_get_at_context (GTK_ACCESSIBLE (scale)));
+  name = gtk_at_context_get_name (context);
  g_assert_cmpstr (name, ==, "50");

  g_free (name);

+  g_object_unref (context);
+
  gtk_window_destroy (GTK_WINDOW (window));
 }

@@ -298,8 +298,12 @@ main (int argc, char **argv)
    {
      GskRenderNode *node2;
      GdkPixbuf *pixbuf, *pixbuf2;
+      GskTransform *transform;
+
+      transform = gsk_transform_scale (NULL, -1, 1);
+      node2 = gsk_transform_node_new (node, transform);
+      gsk_transform_unref (transform);

-      node2 = gsk_transform_node_new (node, gsk_transform_scale (NULL, -1, 1));
      save_node (node2, node_file, "-flipped.node");

      rendered_texture = gsk_renderer_render_texture (renderer, node2, NULL);
@@ -404,8 +408,12 @@ main (int argc, char **argv)
    {
      GskRenderNode *node2;
      GdkPixbuf *pixbuf, *pixbuf2;
+      GskTransform *transform;
+
+      transform = gsk_transform_rotate (NULL, 90);
+      node2 = gsk_transform_node_new (node, transform);
+      gsk_transform_unref (transform);

-      node2 = gsk_transform_node_new (node, gsk_transform_rotate (NULL, 90));
      save_node (node2, node_file, "-rotated.node");

      rendered_texture = gsk_renderer_render_texture (renderer, node2, NULL);
@@ -0,0 +1,14 @@
+clip {
+  clip: 0 0 40 40;
+  child: mask {
+    mode: inverted-alpha;
+    source: color {
+      bounds: 0 0 100 100;
+      color: rebeccapurple;
+    }
+    mask: color {
+      bounds: 40 40 60 60;
+      color: black;
+    }
+  }
+}
@@ -0,0 +1,43 @@
+mask {
+  source: color {
+    bounds: 0 0 50 50;
+    color: rgb(255,0,0);
+  }
+  mask: color {
+    bounds: 0 0 50 50;
+    color: rgba(204,204,204,0.666667);
+  }
+}
+mask {
+  mode: luminance;
+  source: color {
+    bounds: 50 0 50 50;
+    color: rgb(255,0,0);
+  }
+  mask: color {
+    bounds: 50 0 50 50;
+    color: rgba(204,204,204,0.666667);
+  }
+}
+mask {
+  mode: inverted-alpha;
+  source: color {
+    bounds: 0 50 50 50;
+    color: rgb(255,0,0);
+  }
+  mask: color {
+    bounds: 0 50 50 50;
+    color: rgba(204,204,204,0.666667);
+  }
+}
+mask {
+  mode: inverted-luminance;
+  source: color {
+    bounds: 50 50 50 50;
+    color: rgb(255,0,0);
+  }
+  mask: color {
+    bounds: 50 50 50 50;
+    color: rgba(204,204,204,0.666667);
+  }
+}
@@ -65,7 +65,9 @@ compare_render_tests = [
  'invalid-transform',
  'issue-3615',
  'mask',
+  'mask-clipped-inverted-alpha',
  'mask-modes',
+  'mask-modes-with-alpha',
  'nested-rounded-clips',
  'opacity_clip',
  'opacity-overdraw',
@@ -52,6 +52,41 @@ model_to_string (GListModel *model)
  return g_string_free (string, FALSE);
 }

+static char *
+section_model_to_string (GListModel *model)
+{
+  GString *string = g_string_new (NULL);
+  guint i, s, e;
+
+  if (!GTK_IS_SECTION_MODEL (model))
+    return model_to_string (model);
+
+  i = 0;
+  while (i < g_list_model_get_n_items (model))
+    {
+      gtk_section_model_get_section (GTK_SECTION_MODEL (model), i, &s, &e);
+      g_assert (s == i);
+
+      if (i > 0)
+        g_string_append (string, " ");
+
+      g_string_append (string, "[");
+
+      for (; i < e; i++)
+        {
+          if (i > s)
+            g_string_append (string, " ");
+
+          g_string_append_printf (string, "%u", get (model, i));
+        }
+
+      g_string_append (string, "]");
+      i = e;
+    }
+
+  return g_string_free (string, FALSE);
+}
+
 static GListStore *
 new_store (guint start,
           guint end,
@@ -106,6 +141,14 @@ add (GListStore *store,
  g_free (s); \
 }G_STMT_END

+#define assert_section_model(model, expected) G_STMT_START{ \
+  char *s = section_model_to_string (G_LIST_MODEL (model)); \
+  if (!g_str_equal (s, expected)) \
+     g_assertion_message_cmpstr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, \
+         #model " == " #expected, s, "==", expected); \
+  g_free (s); \
+}G_STMT_END
+
 #define assert_changes(model, expected) G_STMT_START{ \
  GString *changes = g_object_get_qdata (G_OBJECT (model), changes_quark); \
  if (!g_str_equal (changes->str, expected)) \
@@ -164,6 +207,21 @@ items_changed (GListModel *model,
    }
 }

+
+static void
+sections_changed (GListModel *model,
+                  guint       position,
+                  guint       n_items,
+                  GString    *changes)
+{
+  g_assert_true (n_items != 0);
+
+  if (changes->len)
+    g_string_append (changes, ", ");
+
+  g_string_append_printf (changes, "s%u:%u", position, n_items);
+}
+
 static void
 notify_n_items (GObject    *object,
                GParamSpec *pspec,
@@ -199,17 +257,18 @@ map_multiply (gpointer item,
 }

 static GtkMapListModel *
-new_model (GListStore *store)
+new_model (GListModel *store)
 {
  GtkMapListModel *result;
  GString *changes;

  if (store)
    g_object_ref (store);
-  result = gtk_map_list_model_new (G_LIST_MODEL (store), map_multiply, GUINT_TO_POINTER (2), NULL);
+  result = gtk_map_list_model_new (store, map_multiply, GUINT_TO_POINTER (2), NULL);
  changes = g_string_new ("");
  g_object_set_qdata_full (G_OBJECT(result), changes_quark, changes, free_changes);
  g_signal_connect (result, "items-changed", G_CALLBACK (items_changed), changes);
+  g_signal_connect (result, "sections-changed", G_CALLBACK (sections_changed), changes);
  g_signal_connect (result, "notify::n-items", G_CALLBACK (notify_n_items), changes);

  return result;
@@ -234,7 +293,7 @@ test_create (void)
  GListStore *store;
  
  store = new_store (1, 5, 1);
-  map = new_model (store);
+  map = new_model (G_LIST_MODEL (store));
  assert_model (map, "2 4 6 8 10");
  assert_changes (map, "");

@@ -275,7 +334,7 @@ test_set_map_func (void)
  GListStore *store;
  
  store = new_store (1, 5, 1);
-  map = new_model (store);
+  map = new_model (G_LIST_MODEL (store));
  assert_model (map, "2 4 6 8 10");
  assert_changes (map, "");

@@ -302,7 +361,7 @@ test_add_items (void)
  GListStore *store;

  store = new_store (1, 5, 1);
-  map = new_model (store);
+  map = new_model (G_LIST_MODEL (store));
  assert_model (map, "2 4 6 8 10");
  assert_changes (map, "");

@@ -318,7 +377,7 @@ test_remove_items (void)
  GListStore *store;

  store = new_store (1, 5, 1);
-  map = new_model (store);
+  map = new_model (G_LIST_MODEL (store));
  assert_model (map, "2 4 6 8 10");
  assert_changes (map, "");

@@ -334,7 +393,7 @@ test_splice (void)
  GListStore *store;

  store = new_store (1, 5, 1);
-  map = new_model (store);
+  map = new_model (G_LIST_MODEL (store));
  assert_model (map, "2 4 6 8 10");
  assert_changes (map, "");

@@ -343,6 +402,61 @@ test_splice (void)
  assert_changes (map, "2-2+2");
 }

+static int
+by_n (gconstpointer p1,
+      gconstpointer p2,
+      gpointer      data)
+{
+  guint n1 = GPOINTER_TO_UINT (g_object_get_qdata (G_OBJECT (p1), number_quark));
+  guint n2 = GPOINTER_TO_UINT (g_object_get_qdata (G_OBJECT (p2), number_quark));
+  unsigned int n = GPOINTER_TO_UINT (data);
+
+  n1 = n1 / n;
+  n2 = n2 / n;
+
+  if (n1 < n2)
+    return -1;
+  else if (n1 > n2)
+    return 1;
+  else
+    return 0;
+}
+
+static int
+compare (gconstpointer first,
+         gconstpointer second,
+         gpointer      unused)
+{
+  return GPOINTER_TO_UINT (g_object_get_qdata (G_OBJECT (first), number_quark))
+      -  GPOINTER_TO_UINT (g_object_get_qdata (G_OBJECT (second), number_quark));
+}
+
+static void
+test_sections (void)
+{
+  GtkMapListModel *map;
+  GListStore *store;
+  GtkSortListModel *sorted;
+  GtkSorter *sorter;
+
+  store = new_store (1, 10, 1);
+  sorted = gtk_sort_list_model_new (G_LIST_MODEL (store),
+                                    GTK_SORTER (gtk_custom_sorter_new (compare, NULL, NULL)));
+  map = new_model (G_LIST_MODEL (sorted));
+  assert_model (map, "2 4 6 8 10 12 14 16 18 20");
+  assert_section_model (map, "[2 4 6 8 10 12 14 16 18 20]");
+  assert_changes (map, "");
+
+  sorter = GTK_SORTER (gtk_custom_sorter_new (by_n, GUINT_TO_POINTER (3), NULL));
+  gtk_sort_list_model_set_section_sorter (sorted, sorter);
+  g_object_unref (sorter);
+
+  assert_section_model (map, "[2 4] [6 8 10] [12 14 16] [18 20]");
+  assert_changes (map, "s0:10");
+
+  g_object_unref (map);
+}
+
 int
 main (int argc, char *argv[])
 {
@@ -359,6 +473,7 @@ main (int argc, char *argv[])
  g_test_add_func ("/maplistmodel/add_items", test_add_items);
  g_test_add_func ("/maplistmodel/remove_items", test_remove_items);
  g_test_add_func ("/maplistmodel/splice", test_splice);
+  g_test_add_func ("/maplistmodel/sections", test_sections);

  return g_test_run ();
 }
@@ -1,4 +1,10 @@
 #!/usr/bin/env python3
+#
+# Copyright © 2021 Chun-wei Fan.
+#
+# SPDX-License-Identifier: LGPL-2.1-or-later
+#
+# Original author: Chun-wei Fan <fanc999@yahoo.com.tw>

 """
 This script generates a Windows manifest file and optionally a resource file to
@@ -8,82 +14,99 @@ determine whether a specified program requires UAC elevation
 import os
 import argparse

-DOMAIN_NAME='gnome'
+DOMAIN_NAME = "gnome"
+

 def main():
-    parser = argparse.ArgumentParser(
-        description=__doc__)
-    parser.add_argument('-p', '--package', required=True,
-                        help='package name of the executable')
-    parser.add_argument('-n', '--name', required=True,
-                        help='name of executable')
-    parser.add_argument('--pkg-version', required=True, dest='version',
-                        help='version of package')
-    parser.add_argument('--require-admin', action='store_true', dest='admin',
-                        default=False,
-                        help='require admin access to application')
-    parser.add_argument('--input-resource-file', dest='resource',
-                        default=None,
-                        help='existing .rc file to embed UAC manifest (do not generate a new .rc file), must have included windows.h in it')
-    parser.add_argument('--output-dir', dest='outdir',
-                        default=None,
-                        help='directory to output resulting files')
+    parser = argparse.ArgumentParser(description=__doc__)
+    parser.add_argument(
+        "-p", "--package", required=True, help="package name of the executable"
+    )
+    parser.add_argument("-n", "--name", required=True, help="name of executable")
+    parser.add_argument(
+        "--pkg-version", required=True, dest="version", help="version of package"
+    )
+    parser.add_argument(
+        "--require-admin",
+        action="store_true",
+        dest="admin",
+        default=False,
+        help="require admin access to application",
+    )
+    parser.add_argument(
+        "--input-resource-file",
+        dest="resource",
+        default=None,
+        help="existing .rc file to embed UAC manifest (do not generate a new .rc file), must have included windows.h in it",
+    )
+    parser.add_argument(
+        "--output-dir",
+        dest="outdir",
+        default=None,
+        help="directory to output resulting files",
+    )
    args = parser.parse_args()

    if args.resource is not None:
        if not os.path.isfile(args.resource):
-            raise FileNotFoundError("Specified resource file '%s' does not exist" % args.resource)
+            raise FileNotFoundError(
+                "Specified resource file '%s' does not exist" % args.resource
+            )

    generate_manifest(args.package, args.name, args.version, args.admin, args.outdir)
    write_rc_file(args.name, args.resource, args.outdir)

+
 def generate_manifest(package, name, version, admin, outdir):
-    if version.count('.') == 0:
-        manifest_package_version = version + '.0.0.0'
-    elif version.count('.') == 1:
-        manifest_package_version = version + '.0.0'
-    elif version.count('.') == 2:
-        manifest_package_version = version + '.0'
-    elif version.count('.') == 3:
+    if version.count(".") == 0:
+        manifest_package_version = version + ".0.0.0"
+    elif version.count(".") == 1:
+        manifest_package_version = version + ".0.0"
+    elif version.count(".") == 2:
+        manifest_package_version = version + ".0"
+    elif version.count(".") == 3:
        manifest_package_version = version
    else:
-        parts = version.split('.')
-        manifest_package_version = ''
+        parts = version.split(".")
+        manifest_package_version = ""
        for x in (0, 1, 2, 3):
            if x == 0:
                manifest_package_version += parts[x]
            else:
-                manifest_package_version += '.' + parts[x]
+                manifest_package_version += "." + parts[x]

    if outdir is not None:
        output_file_base_name = os.path.join(outdir, name)
    else:
        output_file_base_name = name

-    outfile = open(output_file_base_name + '.exe.manifest', 'w+')
-    outfile.write('<?xml version="1.0" encoding="UTF-8" standalone="yes"?>\n')
-    outfile.write('<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">\n')
-    outfile.write('  <assemblyIdentity version="%s"\n' % manifest_package_version)
-    outfile.write('    processorArchitecture="*"\n')
-    outfile.write('    name="%s.%s.%s.exe"\n' % (DOMAIN_NAME, package, name))
-    outfile.write('    type="win32" />\n')
-    outfile.write('  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">\n')
-    outfile.write('    <security>\n')
-    outfile.write('      <requestedPrivileges>\n')
-    outfile.write('        <requestedExecutionLevel\n')
+    outfile = open(output_file_base_name + ".exe.manifest", "w+")
+    outfile.write("<?xml version='1.0' encoding='UTF-8' standalone='yes'?>\n")
+    outfile.write(
+        "<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>\n"
+    )
+    outfile.write("  <assemblyIdentity version='%s'\n" % manifest_package_version)
+    outfile.write("    processorArchitecture='*'\n")
+    outfile.write("    name='%s.%s.%s.exe'\n" % (DOMAIN_NAME, package, name))
+    outfile.write("    type='win32' />\n")
+    outfile.write("  <trustInfo xmlns='urn:schemas-microsoft-com:asm.v3'>\n")
+    outfile.write("    <security>\n")
+    outfile.write("      <requestedPrivileges>\n")
+    outfile.write("        <requestedExecutionLevel\n")

    if admin:
-        outfile.write('          level="requireAdministrator"\n')
+        outfile.write("          level='requireAdministrator'\n")
    else:
-        outfile.write('          level="asInvoker"\n')
+        outfile.write("          level='asInvoker'\n")

-    outfile.write('          uiAccess="false" />\n')
-    outfile.write('      </requestedPrivileges>\n')
-    outfile.write('    </security>\n')
-    outfile.write('  </trustInfo>\n')
-    outfile.write('</assembly>\n')
+    outfile.write("          uiAccess='false' />\n")
+    outfile.write("      </requestedPrivileges>\n")
+    outfile.write("    </security>\n")
+    outfile.write("  </trustInfo>\n")
+    outfile.write("</assembly>\n")
    outfile.close()

+
 def write_rc_file(name, resource, outdir):
    if outdir is not None:
        output_file_base_name = os.path.join(outdir, name)
@@ -91,21 +114,24 @@ def write_rc_file(name, resource, outdir):
        output_file_base_name = name

    if resource is None:
-        outfile = open(output_file_base_name + '.rc', 'w+')
-        outfile.write('#define WIN32_LEAN_AND_MEAN\n')
-        outfile.write('#include <windows.h>\n')
+        outfile = open(output_file_base_name + ".rc", "w+")
+        outfile.write("#define WIN32_LEAN_AND_MEAN\n")
+        outfile.write("#include <windows.h>\n")
    else:
-        if resource != output_file_base_name + '.rc':
-            outfile = open(output_file_base_name + '.rc', 'w+')
+        if resource != output_file_base_name + ".rc":
+            outfile = open(output_file_base_name + ".rc", "w+")
        else:
-            outfile = open(output_file_base_name + '.final.rc', 'w+')
-        srcfile = open(resource, 'r')
+            outfile = open(output_file_base_name + ".final.rc", "w+")
+        srcfile = open(resource, "r")
        outfile.write(srcfile.read())
        srcfile.close()

-    outfile.write('\n')
-    outfile.write('CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "%s.exe.manifest"' % name)
+    outfile.write("\n")
+    outfile.write(
+        'CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "%s.exe.manifest"' % name
+    )
    outfile.close()

-if __name__ == '__main__':
+
+if __name__ == "__main__":
    main()
@@ -371,11 +371,11 @@ do_screenshot (int          *argc,
      exit (1);
    }

-  g_set_prgname ("gtk4-builder-tool screenshot");
+  g_set_prgname ("gtk4-builder-tool render");
  context = g_option_context_new (NULL);
  g_option_context_set_translation_domain (context, GETTEXT_PACKAGE);
  g_option_context_add_main_entries (context, entries, NULL);
-  g_option_context_set_summary (context, _("Take a screenshot of the file."));
+  g_option_context_set_summary (context, _("Render a .ui file to an image."));

  if (!g_option_context_parse (context, argc, (char ***)argv, &error))
    {
@@ -394,7 +394,7 @@ do_screenshot (int          *argc,

  if (g_strv_length (filenames) > 2)
    {
-      g_printerr (_("Can only screenshot a single .ui file and a single output file\n"));
+      g_printerr (_("Can only render a single .ui file to a single output file\n"));
      exit (1);
    }

@@ -34,7 +34,7 @@ static void G_GNUC_NORETURN
 usage (void)
 {
  g_print (_("Usage:\n"
-             "  gtk-builder-tool [COMMAND] [OPTION…] FILE\n"
+             "  gtk4-builder-tool [COMMAND] [OPTION…] FILE\n"
             "\n"
             "Perform various tasks on GtkBuilder .ui files.\n"
             "\n"
@@ -43,6 +43,7 @@ usage (void)
             "  simplify     Simplify the file\n"
             "  enumerate    List all named objects\n"
             "  preview      Preview the file\n"
+             "  render       Take a screenshot of the file\n"
             "  screenshot   Take a screenshot of the file\n"
             "\n"));
  exit (1);
@@ -134,7 +135,8 @@ main (int argc, const char *argv[])
    do_enumerate (&argc, &argv);
  else if (strcmp (argv[0], "preview") == 0)
    do_preview (&argc, &argv);
-  else if (strcmp (argv[0], "screenshot") == 0)
+  else if (strcmp (argv[0], "render") == 0 ||
+           strcmp (argv[0], "screenshot") == 0)
    do_screenshot (&argc, &argv);
  else
    usage ();
Author	SHA1	Message	Date
Nelson Benítez León	bab2bf2596	widget-factory: add example on styling tooltip window by using new api: gtk_tooltip_set_css_class() GtkWidget signals 'tooltip-show' and 'tooltip-hide' Part of #5925	2023-07-09 17:07:09 -04:00
Nelson Benítez León	11b4e4a467	GtkWidget: add new signals 'tooltip-show' and 'tooltip-hide' which are emitted when a tooltip window is about to be shown on a widget, and when a tooltip window stopped being shown on a widget. These signals provide two convenient moments for where to style our tooltip window in case we want to do so by adding a css class to it. The existant signal 'query-tooltip' could not be used for that as it's triggered on motion events and we cannot distinguish from that when the tooltip window gets shown or hidden. Part of issue #5925	2023-07-09 17:07:09 -04:00
Nelson Benítez León	1cae0cd54c	GtkToolTip: new API to add css classes to GtkTooltipWindow we add a simple API to allow styling GtkTooltip's window by setting a css class on it: void gtk_tooltip_set_css_class (GtkTooltip tooltip, const char css_class); By passing NULL it will remove any previously set css class by this function. Issue #5925	2023-07-09 17:07:09 -04:00
Matthias Clasen	1f3db35271	Merge branch 'dboles/image-notify-storage-type' into 'main' Image—Notify when :storage-type changes from EMPTY See merge request GNOME/gtk!6170	2023-07-07 01:15:56 +00:00
Emmanuele Bassi	18cce46ed2	Merge branch 'wip/corey/listitemleak' into 'main' gtklistitemmanager: Stop leaking item Closes #5940 See merge request GNOME/gtk!6171	2023-07-06 23:57:16 +00:00
Corey Berla	e78148bae5	gtklistitemmanager: Stop leaking item Fixes: https://gitlab.gnome.org/GNOME/gtk/-/issues/5940	2023-07-06 16:24:29 -07:00
Daniel Boles	41237509ad	Image—Notify when :storage-type changes from EMPTY PROP_STORAGE_TYPE was only notified if it was changing to EMPTY, in gtk_image_clear_internal(). We did not notify when it changes from EMPTY to something non-empty. We should as not doing so is confusing, e.g. if a user wants to bind :storage-type to :visible if non-empty, which I just did! So, in functions that apply an ImageType, now notify. Also do so in gtk_image_set_from_definition, declared in imageprivate.h, even though none of the function there are currently used anywhere. (Should they be removed?)	2023-07-06 23:08:20 +01:00
Yosef Or Boczko	576e8a2090	Update Hebrew translation	2023-07-06 09:38:02 +00:00
Matthias Clasen	d0f77c1db4	Merge branch 'wip/carlosg/switch-stylus-buttons' into 'main' gdk/wayland: Switch behavior of BTN_STYLUS/STYLUS2 as middle/right click Closes #5935 See merge request GNOME/gtk!6168	2023-07-05 23:38:38 +00:00
Carlos Garnacho	e28ff79bec	gdk/wayland: Switch behavior of BTN_STYLUS/STYLUS2 as middle/right click This mapping of stylus evdev input event codes into GDK button numbers makes gdk/wayland inconsistent with gdk/x11, so depending on the backend the same button middle-click pastes or right-click pops up menus. Make the wayland backend consistent with X11, so that a GNOME wayland session gets these buttons consistently mapped across all kinds of clients. Closes: https://gitlab.gnome.org/GNOME/gtk/-/issues/5935	2023-07-05 16:54:54 +02:00
Daniel Boles	dccf6b55bd	GdkTexture: Don't mention private new_from_surface The stuff about Cairo Surfaces is in gdktextureprivate.h, & so end users will not be able to use them; we shouldn't confuse by implying they can.	2023-07-05 12:07:33 +01:00
Daniel Boles	d5ea376e7b	docs/list-widget: links, DirList, correct Sections * Add links to various symbols. * Mention DirectoryList in the "ready-made choices available" section. * Don't say that GridView can display headers: it makes no attempt to.	2023-07-05 12:02:08 +01:00
Matthias Clasen	40707a6af0	Merge branch 'ebassi/issue-5934' into 'main' Lower the Python requirement Closes #5934 See merge request GNOME/gtk!6167	2023-07-05 10:57:45 +00:00
Emmanuele Bassi	9b71c9dfc6	Do not use bleeding edge Python The match operator was added in Python 3.10, which is a bit too new for some downstreams. While at it, let's fix the flake8 errors and warnings. Fixes: #5934	2023-07-05 10:19:18 +01:00
Emmanuele Bassi	64308317f8	Add flake8 configuration file Ignore long lines; most of our Python scripts generate code or other types of files, which makes long lines a necessity. We should validate all our Python script in our CI as well.	2023-07-05 10:12:20 +01:00
Daniel Boles	f920723eae	AlertDialog: Remove spurious/unmatched backtick	2023-07-04 22:42:50 +01:00
Daniel Boles	c581f4c96f	ListBase: Fix a typo	2023-07-04 19:44:56 +01:00
Matthias Clasen	4998c90b10	Merge branch 'update-uac-script-format' into 'main' tools/generate-uac-manifest.py: Fix formatting (unify with copy in GLib) See merge request GNOME/gtk!6164	2023-07-03 23:37:36 +00:00
Benjamin Otte	412b23a146	Merge branch 'wip/otte/for-main' into 'main' gsk: Catch values < 0 before bad things happen See merge request GNOME/gtk!6165	2023-07-03 20:40:30 +00:00
Benjamin Otte	c179013790	testsuite: Add a test for mask out of bounds effects Inverted alpha masks have an effect on the source, even if the mask doesn't cover the source at all - or worse, is completely clipped out. The GL renderer handles this fine, but Cairo and Vulkan had optimizations that got this wrong.	2023-07-03 22:02:44 +02:00
Benjamin Otte	c6eb7fd483	gsk: Fix luminance in Cairo and GL renderer In particular, fix the combination of luminance and alpha. We want to do mask = luminance * alpha and for inverted mask = (1.0 - luminance) * alpha so add a test that makes sure we do that and then fix the code and existing tests to conform to it.	2023-07-03 22:02:44 +02:00
Benjamin Otte	7c58370673	rendernode: Work around a Cairo bug When color-matrix modifying a clear surface, the surface would remain clear according to Cairo. That's very unfortunate when we prepare a mask for inverted-alpha masking.	2023-07-03 22:02:44 +02:00
Benjamin Otte	84737a5159	build: Include the right things If we build our own targets, we need to include those. This is only relevant when adding new shaders because meson will complain that the (unused) sources don't exist as it tries to include those. And that will make the build.ninja file not be generated which would have build those shaders and would have allowed to copy them into the sources. Note that this makes builds with glslc not care about all the shader files being included with the sources, but we have CI to check that.	2023-07-03 22:02:44 +02:00
Benjamin Otte	48804c81f3	rendernode: Mask nodes with different modes are different So treat them as such. Fixes the node editor not updating when I edit the mask mode.	2023-07-03 22:02:44 +02:00
Benjamin Otte	c79ec355af	gsk: Catch values < 0 before bad things happen In particular, catch radius values being < 0 by return_if_fail()ing in the rendernode creation code, and by erroring out in the rendernode parser. I try too much dumb stuff in the node editor.	2023-07-03 22:02:44 +02:00
Benjamin Otte	ce5d74d7df	glcontext: Fix typo in Apple extension name	2023-07-03 22:02:44 +02:00
Matthias Clasen	5bcc943ec3	Post-release version bump	2023-07-03 14:56:49 -04:00
Matthias Clasen	f5d68bb586	4.11.4	2023-07-03 14:12:53 -04:00
Chun-wei Fan	6d1537647c	tools/generate-uac-manifest.py: Fix formatting As this script is now also used in GLib, unify the formatting between GLib and GTK. Make the formatting of the script conformant to the Black[1] tool, as GLib requires, and add a copyright header to this script. [1]: https://black.readthedocs.io/en/stable/, see also $(glibsrcroot)/.gitlab-ci/run-bash.sh	2023-07-03 12:50:55 +08:00
Matthias Clasen	ae2c10996a	Merge branch 'fix_atcontext_refleaks' into 'main' a11y: Fix some GtkATContext reference leaks See merge request GNOME/gtk!6160	2023-07-01 18:06:19 +00:00
Barnabás Pőcze	81e9de3778	a11y: Fix some GtkATContext reference leaks `gtk_accessible_get_at_context()` is transfer-full, so the returned reference needs to be dropped. This was missing in a couple places.	2023-07-01 16:40:11 +02:00
Chun-wei Fan	42a704fefb	Merge branch 'gdk-win32-input-fixes' into 'main' GdkWin32 input fixes Closes #5877 See merge request GNOME/gtk!6131	2023-06-30 04:33:08 +00:00
Matthias Clasen	e57eaf16b4	Merge branch 'wip/chergert/map-as-sectionmodel' into 'main' maplistmodel: implement GtkSectionModel See merge request GNOME/gtk!6154	2023-06-30 01:50:07 +00:00
Matthias Clasen	9aabb0e98d	Add section model tests for GtkMapListModel	2023-06-29 21:30:11 -04:00
Matthias Clasen	9590a5f45e	maplistmodel: Handle the ::sections-changed signal Wrapper section models need to listen to and pass on the ::sections-changed signal from the underlying model.	2023-06-29 21:29:11 -04:00
Daniel Boles	7bee50c4f6	Image: Fix missing closing backtick	2023-06-29 14:33:29 +01:00
Matthias Clasen	bad2324318	Merge branch 'dboles/gtk-demo_dnd_dark' into 'main' gtk-demo/dnd: Fix, generalise detecting dark theme See merge request GNOME/gtk!6157	2023-06-29 10:26:41 +00:00
Matthias Clasen	dd15accb79	Merge branch 'matthiasc/for-main' into 'main' build: Try harder to work with nongnu ld See merge request GNOME/gtk!6159	2023-06-28 23:31:41 +00:00
Matthias Clasen	1d1f35576a	build: Try harder to work with nongnu ld Only try to be fast with gnu ld.	2023-06-28 16:54:34 -04:00
Daniel Boles	15458b5af3	gtk-demo/dnd: Fix, generalise detecting dark theme Our default theme is now Default, not Adwaita, & HighContrastInverse was renamed to Default-hc. So these checks did not work anymore. Rather than hard-coding the new names, & possibly running into the same issue again, we can just look for the convention of appending -dark to the theme name and/or the Settings:prefer-dark-theme prop. The latter, we can & likely SHOULD also apply to all themes - not just ours as before. We also check for the :dark suffix as that means the theme variant - & before checking GtkSettings check the GTK_THEME env var, just as GtkSettings itself does	2023-06-28 14:40:06 +01:00
Matthias Clasen	5ffe9a68ed	Merge branch 'matthiasc/for-main' into 'main' build: Move objcopy checks to one place Closes #5672 See merge request GNOME/gtk!6156	2023-06-28 12:06:49 +00:00
Matthias Clasen	f341bd563b	build: Look for ld.bfd The objcopy+ld approach to fast resource building relies on behavior that is specific to the binutils linker, and does not work with the llvm one. Therefore, check for ld.bfd. We still fall back to trying with just ld, since I'm not 100% sure if binutils unconditionally installs ld.bfd. Fixes: #5672	2023-06-28 07:12:07 -04:00
Matthias Clasen	70edacc68d	build: Move objcopy checks to one place We were doing the same thing in three places. Move it to the toplevel meson.build, so we can change it in one place.	2023-06-28 07:11:51 -04:00
Matthias Clasen	091176ae48	Updates	2023-06-28 06:47:32 -04:00
Matthias Clasen	d9cfb94a80	Merge branch 'fix_dropdown_set_expression' into 'main' GtkDropDown: Force redisplay of the drop-down items after expression change See merge request GNOME/gtk!6145	2023-06-28 09:57:04 +00:00
Lukáš Tyrychtr	3c7ca28f1f	dropdown: Handle expression changes The expression is used by the default factory, so we need to track whether we are using the default factory and recreate it if the expression changes.	2023-06-28 08:18:01 +02:00
Matthias Clasen	25e518326c	Merge branch 'matthiasc/for-main' into 'main' Plug a memory leak in gsk_render_node_serialize See merge request GNOME/gtk!6155	2023-06-28 02:42:47 +00:00
Matthias Clasen	a853307fb7	ci: Ignore more leaks in dependencies libxkbcommon shows up quite a bit in leak sanitizer reports. Ignore it.	2023-06-27 22:08:22 -04:00
Matthias Clasen	0ae541671d	gsk: Plug a memory leak in mask node fallback We were forgetting to free the mask pattern. Found by asan.	2023-06-27 21:54:15 -04:00
Matthias Clasen	ef0d6c7290	gsk: Plug a memory leak in the gl renderer Found by asan.	2023-06-27 21:52:08 -04:00
Matthias Clasen	2217509701	Plug a memory leak in gsk tests Pointed out by asan.	2023-06-27 21:48:12 -04:00
Matthias Clasen	16e46a73f3	Plug a memory leak in gsk_render_node_serialize This was introduced in `0d6a6a5997` with named textures.	2023-06-27 21:43:17 -04:00
Christian Hergert	32a3690a3c	maplistmodel: implement GtkSectionModel This just wraps the underlying GListModel if it is a GtkSectionModel.	2023-06-27 18:08:20 -07:00
Benjamin Otte	526771751f	Merge branch 'dboles/issue5922-DropTarget-reject-enter-critical' into 'main' DropTarget: Fix critical if `reject()` drop before `::enter` Closes #5922 See merge request GNOME/gtk!6152	2023-06-27 21:30:03 +00:00
Daniel Boles	dfa6591675	DropTarget: Fix critical if reject drop pre-enter Fixes https://gitlab.gnome.org/GNOME/gtk/-/issues/5922 The docs of `Gtk.DropTarget::accept` say this: > If the decision whether the drop will be accepted or rejected depends > on the data, [`::accept`] should return `TRUE`, [`:preload`] should be > set and the value should be inspected via the `::notify:value` signal, > calling `gtk_drop_target_reject()` if required. But this pattern causes a CRITICAL, given these steps: * Create a `DragSource` and `DropTarget` * Keep the default `::accept` handler and set `:preload` to `TRUE` * Connect to `notify::value` and therein call `DropTarget.reject()` * CRITICAL at `DropTarget.enter()`→`Drop.get_actions()` on NULL instance We should let the documented case work without a CRITICAL or worse, null deref. And per @otte on the bug, we should bail earlier before `::enter` & setting `GTK_STATE_FLAG_DROP_ACTIVE`; neither should occur if rejected This fixes that, by checking after `start_drop()` when notifications are thawed, whether any handler has `reject()`ed & set our `drop` to `NULL`.	2023-06-27 21:37:32 +01:00
Daniel Boles	6252517aac	DropTarget: Fix `if` block indented 1 step too far	2023-06-27 21:37:20 +01:00
Matthias Clasen	51e440fa03	Merge branch 'fix-asan-ifunc' into 'main' Fix fp16 with asan See merge request GNOME/gtk!6153	2023-06-27 19:55:28 +00:00
Matthias Clasen	d82fb6f20a	Fix fp16 with asan The IFUNC resolvers that we are using here get run early, before asan had a chance to set up its plumbing, and therefore things go badly if they are compiled with asan. Turning it off makes things work again. The gcc bug tracking this problem: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110442 Thanks to Jakub Jelinek and Florian Weimer for analyzing this and recommending the workaround.	2023-06-27 15:17:56 -04:00
Matthias Clasen	44de6a6cbe	Merge branch 'wip/sadiq/fix-use-after-free' into 'main' gldriver: Fix a possible use-after-free See merge request GNOME/gtk!6151	2023-06-27 18:46:28 +00:00
Mohammed Sadiq	64e27cd87d	gldriver: Fix a possible use-after-free g_hash_table_insert() frees the given key if it already exists in the hashtable. But since we use the same pointer in the following line, it will result in use-after-free. So instead, insert the key only if it doesn't exist.	2023-06-27 22:45:07 +05:30
Benjamin Otte	60e75f8a2a	Merge branch 'wip/otte/for-vulkan' into 'main' vulkan: Generate vertex array headers from shaders See merge request GNOME/gtk!6149	2023-06-27 16:20:29 +00:00
Matthias Clasen	57eda94dde	Merge branch 'matthiasc/for-main' into 'main' gtk4-builder-tool: Fix naming See merge request GNOME/gtk!6150	2023-06-27 11:24:08 +00:00
Matthias Clasen	723fb6c8be	gtk4-builder-tool: Fix naming We install the tool as gtk4-builder-tool, so that is what it should call itself. String change.	2023-06-27 07:09:04 -04:00
Benjamin Otte	6c85ed1ba1	vulkan: Generate vertex array headers from shaders The script is pretty dumb but it does its job.	2023-06-27 07:11:48 +02:00
Benjamin Otte	2e58274f23	vulkan: Rename crossfade => cross-fade Preparation for the future.	2023-06-27 06:46:57 +02:00
Benjamin Otte	4ade0afe03	vulkan: Rename blendmode to blend-mode Preparation for future changes, nothing to see here.	2023-06-27 06:46:57 +02:00
Benjamin Otte	93fb45c689	Merge branch 'wip/otte/vulkan-for-main' into 'main' vulkan: Add a pipeline cache See merge request GNOME/gtk!6148	2023-06-26 18:52:48 +00:00
Benjamin Otte	684a015c98	vulkan: Add a pipeline cache Make the display handle the cache, because we only need one. We store the cache in $CACHE_DIR/gtk-4.0/vulkan-pipeline-cache/$UUID.$VERSION so we regenerate caches for each different device (different UUID) and each different driver version. We also keep track of the etag of the cache file, so if 2 different applications update the cache, we can detect that. Vulkan allows merging caches, so the 2nd app reloads the new cache file and merges it into its cache before saving.	2023-06-26 20:28:11 +02:00
Matthias Clasen	f7fcd2e425	Merge branch 'main' into 'main' Add settable search match mode in dropdown See merge request GNOME/gtk!6146	2023-06-26 18:18:14 +00:00
Matthias Clasen	c6c637fe21	Merge branch 'matthiasc/for-main' into 'main' buildertool: Make render an alias for screenshot See merge request GNOME/gtk!6147	2023-06-26 15:38:32 +00:00
Matthias Clasen	33fc4d6495	buildertool: Make render an alias for screenshot Its a more neutral name and will align better with other tools.	2023-06-26 10:58:35 -04:00
al_SeveR	33ff927522	Add settable search match mode in dropdown	2023-06-26 14:14:39 +00:00
Luca Bacci	43af0ee514	Define this_module with (void) argument Fixes a compiler warning about K&R (old-style) function definition	2023-06-21 16:18:40 +02:00
Luca Bacci	3912d6aba9	GdkWin32: Fix keyboard state for WinPointer input The dwKeyStates field of the POINTER_INFO structure is always set to 0, no matter what. Use GetKeyState instead. Forward-port of !4327 to GTK4	2023-06-21 16:18:01 +02:00
Luca Bacci	871685e271	GdkWin32: Use double coordinates for mouse events Mouse coordinates reported by the system are still integers, but go sub-pixel when dividing by the window scale factor.	2023-06-21 16:07:55 +02:00
Luca Bacci	5e9daa9728	GdkWin32: Unscaled coordinates in current_root_x, current_root_y Also modify gdk_win32_surface_do_move_resize_drag() to take unscaled root coordinates. Fixes #5877	2023-06-21 16:01:42 +02:00
Luca Bacci	412bc1713a	GdkWin32: Keep track of the last cursor position in move / resize contexts ...and avoid doing any work if the position hasn't changed.	2023-06-21 15:31:48 +02:00