Add a GskPoint type and use it for offsets

This has a tremendous ripple effect and is kind of disastrous.
Use graphene's simd4f type for GskScale
2024-01-21 21:25:24 -05:00 · 2024-01-21 18:42:33 -05:00 · 2024-01-21 15:56:59 -05:00 · 2024-01-21 08:04:36 -05:00 · 2024-01-21 08:04:36 -05:00
231 changed files with 3813 additions and 11478 deletions
@@ -212,9 +212,7 @@ msys2-mingw64:
 macos-x86_64:
  rules:
    # Do not run in forks as the runner is not available there.
-    # (except for dehesselle who maintains the runner)
    - if: $CI_PROJECT_NAMESPACE == "GNOME"
-    - if: $CI_PROJECT_NAMESPACE == "dehesselle"
  stage: build
  tags:
    - macosintel
@@ -253,6 +251,7 @@ macos-x86_64:
            -Dpixman:tests=disabled
            -Dlibjpeg-turbo:simd=disabled
            -Dbuild-demos=false
+            -Dbuild-tests=false
            -Dbuild-examples=false
            -Dbuild-testsuite=false
            _build
@@ -1,126 +1,6 @@
-Overview of Changes in 4.13.7, xx-xx-xxxx
+Overview of Changes in 4.13.6, xx-xx-xxxx
 =========================================

-* GtkFileChooser:
- - Speed up opening
-
-* Accessibility:
- - Add socket support for webkit accessibility
- - Implement AT-SPI text for GtkText
- - Implement AT-SPI component generically
- - Add an announce API
-
-* GSK:
- - Make the ngl renderer work on macOS
- - Fix a crash in the vulkan renderer
- - Make nodeparser allow aliases for fonts again
- - Implement cache eviction for the glyph and
-   texture caches
- - Fix shaders to work on GL < 4.0
- - Fix problems with scaled shadows
- - Fix problems with holes for underlaid subsurfaces
-
-* media:
- - Support dmabufs in the gstreamer backend. This allows
-   zero-copy video playback on Wayland when paired with
-   hardware video decoding
-
-* Wayland:
- - Commit empty frames if and double-buffered state
-   is pending
- - Fix monitor size information when using mutter without
-   the scale-monitor-framebuffer setting
-
-* macOS:
- - Propagate unhandled input events back to the OS
-
-* Tools:
- - Make the crash handling in gtk4-node-editor more robust
-
-* Translation updates
- Galician
- Georgian
- Occitan
-
-
-Overview of Changes in 4.13.6, 25-01-2024
-=========================================
-
-This release changes the ngl renderer to be the default renderer.
-
-The intent of this change is to get wider testing and verify that
-the new renderers are production-ready. If significant problems
-show up, we will revert this change for 4.14.
-
-You can still override the renderer choice using the GSK_RENDERER
-environment variable.
-
-Since ngl can handle fractional scaling much better than the old gl
-renderer, we allow fractional scaling by default with gl now. If you
-are using the old gl renderer (e.g. because your system is limited to
-GLES2), you can disable fractional scaling by setting the GDK_DEBUG
-environment variable to include the gl-no-fractional key.
-
-* GtkColumnView:
- - Fix infinite loops in dispose
- - Fix problems with weak ref cycles in GtkExpression
-
-* GtkListView:
- - Fix some corner cases with sections during insertions and deletions
- - Don't double-recycle widgets
-
-* GtkStack:
- - Add automatic cleanup for GtkStackPage
-
-* GDK:
- - Use standard cursor names for drag cursors
- - Enable fractional scaling with gl by default
-
-* GSK:
- - Many fixes and improvements to the unified renderers:
-   - Fix text rendering with the uber shader
-   - Fix rounding issues with fractional scales
-   - Fix some memory leaks
-   - Many text rendering fixes
-   - Implement subpixel positioning for glyphs
-   - Support custom fonts in node files
-   - Add tests for font rendering
-   - Fix drawing of repeat nodes
-   - Implement subpixels positioning
-   - Evict stale textures, glyphs and atlases from the cache
- - Some fixes and improvements to the GL renderer:
-   - Fix problems with GLES on Nvidia
-   - Avoid a crash in the mask demo
-   - Respect opacity of the first child node in containers
- - Some fixes and improvements to the fallback renderer:
-   - Fix drawing of repeat nodes
- - Make ngl the default renderer
-
-* Wayland:
- - Fix problems with tablet cursors
- - Fix problems without seats
-
-* Accessibility:
- - Respect a separate "show-status-shapes setting
- - Fix change notification for accessible names on some widgets
-
-* Inspector:
- - Show the git commit in devel builds
-
-* Tools:
- - Make gtk4-node-editor autosave its contents
- - Add a benchmark command to gtk4-rendernode-tool
-
-* Translation updates:
- French
- Galician
- Georgian
- Occitan
- Persian
- Russian
- Vietnamese
-
-
 Overview of Changes in 4.13.5, 07-01-2024
 =========================================

@@ -68,9 +68,8 @@ struct _NodeEditorWindow

  GArray *errors;

+  guint update_timeout;
  gboolean auto_reload;
-  gboolean mark_as_safe_pending;
-  gulong after_paint_handler;
 };

 struct _NodeEditorWindowClass
@@ -246,41 +245,6 @@ highlight_text (NodeEditorWindow *self)
  gtk_text_buffer_apply_tag_by_name (self->text_buffer, "no-hyphens", &start, &end);
 }

-static void
-mark_autosave_as_unsafe (void)
-{
-  char *path1 = NULL;
-  char *path2 = NULL;
-
-  path1 = get_autosave_path ("-unsafe");
-  path2 = get_autosave_path (NULL);
-
-  g_rename (path2, path1);
-}
-
-static void
-mark_autosave_as_safe (void)
-{
-  char *path1 = NULL;
-  char *path2 = NULL;
-
-  path1 = get_autosave_path ("-unsafe");
-  path2 = get_autosave_path (NULL);
-
-  g_rename (path1, path2);
-}
-
-static void
-after_paint (GdkFrameClock    *clock,
-             NodeEditorWindow *self)
-{
-  if (self->mark_as_safe_pending)
-    {
-      self->mark_as_safe_pending = FALSE;
-      mark_autosave_as_safe ();
-    }
-}
-
 static void
 reload (NodeEditorWindow *self)
 {
@@ -289,8 +253,6 @@ reload (NodeEditorWindow *self)
  float scale;
  GskRenderNode *big_node;

-  mark_autosave_as_unsafe ();
-
  text = get_current_text (self->text_buffer);
  bytes = g_bytes_new_take (text, strlen (text));

@@ -352,8 +314,6 @@ reload (NodeEditorWindow *self)
    }

  g_clear_pointer (&big_node, gsk_render_node_unref);
-
-  self->mark_as_safe_pending = TRUE;
 }

 static void
@@ -1165,6 +1125,9 @@ node_editor_window_finalize (GObject *object)
 {
  NodeEditorWindow *self = (NodeEditorWindow *)object;

+  if (self->update_timeout)
+    g_source_remove (self->update_timeout);
+
  g_array_free (self->errors, TRUE);

  g_clear_pointer (&self->node, gsk_render_node_unref);
@@ -1209,7 +1172,6 @@ static void
 node_editor_window_realize (GtkWidget *widget)
 {
  NodeEditorWindow *self = NODE_EDITOR_WINDOW (widget);
-  GdkFrameClock *frameclock;

  GTK_WIDGET_CLASS (node_editor_window_parent_class)->realize (widget);

@@ -1237,24 +1199,14 @@ node_editor_window_realize (GtkWidget *widget)
  node_editor_window_add_renderer (self,
                                   gsk_cairo_renderer_new (),
                                   "Cairo");
-
-  frameclock = gtk_widget_get_frame_clock (widget);
-  self->after_paint_handler = g_signal_connect (frameclock, "after-paint",
-                                                G_CALLBACK (after_paint), self);
-
 }

 static void
 node_editor_window_unrealize (GtkWidget *widget)
 {
  NodeEditorWindow *self = NODE_EDITOR_WINDOW (widget);
-  GdkFrameClock *frameclock;
  guint i;

-  frameclock = gtk_widget_get_frame_clock (widget);
-  g_signal_handler_disconnect (frameclock, self->after_paint_handler);
-  self->after_paint_handler = 0;
-
  for (i = 0; i < g_list_model_get_n_items (G_LIST_MODEL (self->renderers)); i ++)
    {
      gpointer item = g_list_model_get_item (G_LIST_MODEL (self->renderers), i);
@@ -1615,6 +1567,23 @@ edit_action_cb (GtkWidget  *widget,
  node_editor_window_edit (self, &start);
 }

+static void
+node_editor_window_map (GtkWidget *widget)
+{
+  char *path;
+
+  GTK_WIDGET_CLASS (node_editor_window_parent_class)->map (widget);
+
+  path = get_autosave_path (NULL);
+  if (g_file_test (path, G_FILE_TEST_EXISTS))
+    {
+      g_free (path);
+      return;
+    }
+
+  g_free (path);
+}
+
 static void
 node_editor_window_set_property (GObject      *object,
                                 guint         prop_id,
@@ -1691,6 +1660,8 @@ node_editor_window_class_init (NodeEditorWindowClass *class)
  widget_class->realize = node_editor_window_realize;
  widget_class->unrealize = node_editor_window_unrealize;

+  widget_class->map = node_editor_window_map;
+
  properties[PROP_AUTO_RELOAD] = g_param_spec_boolean ("auto-reload", NULL, NULL,
                                                       TRUE,
                                                       G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_STATIC_NAME);
@@ -1794,16 +1765,16 @@ set_initial_text (NodeEditorWindow *self)
  path = get_autosave_path (NULL);
  path1 = get_autosave_path ("-unsafe");

-  if (g_file_get_contents (path1, &initial_text, &len, NULL))
+  if (g_file_get_contents (path, &initial_text, &len, NULL))
+    {
+      gtk_text_buffer_set_text (self->text_buffer, initial_text, len);
+      g_free (initial_text);
+    }
+  else if (g_file_get_contents (path1, &initial_text, &len, NULL))
    {
      self->auto_reload = FALSE;
      gtk_revealer_set_reveal_child (GTK_REVEALER (self->crash_warning), TRUE);

-      gtk_text_buffer_set_text (self->text_buffer, initial_text, len);
-      g_free (initial_text);
-    }
-  else if (g_file_get_contents (path, &initial_text, &len, NULL))
-    {
      gtk_text_buffer_set_text (self->text_buffer, initial_text, len);
      g_free (initial_text);
    }
@@ -1854,6 +1825,41 @@ autosave_contents (NodeEditorWindow *self)
  g_free (contents);
 }

+static void
+mark_autosave_as_safe (void)
+{
+  char *path1 = NULL;
+  char *path2 = NULL;
+
+  path1 = get_autosave_path ("-unsafe");
+  path2 = get_autosave_path (NULL);
+
+  g_rename (path1, path2);
+}
+
+static gboolean
+update_timeout_cb (gpointer data)
+{
+  NodeEditorWindow *self = data;
+
+  self->update_timeout = 0;
+
+  mark_autosave_as_safe ();
+
+  return G_SOURCE_REMOVE;
+}
+
+static void
+initiate_autosave (NodeEditorWindow *self)
+{
+  autosave_contents (self);
+
+  if (self->update_timeout != 0)
+    g_source_remove (self->update_timeout);
+
+  self->update_timeout = g_timeout_add (100, update_timeout_cb, self);
+}
+
 static void
 node_editor_window_init (NodeEditorWindow *self)
 {
@@ -1918,7 +1924,7 @@ node_editor_window_init (NodeEditorWindow *self)

  set_initial_text (self);

-  g_signal_connect_swapped (self->text_buffer, "changed", G_CALLBACK (autosave_contents), self);
+  g_signal_connect_swapped (self->text_buffer, "changed", G_CALLBACK (initiate_autosave), self);

  if (g_getenv ("GSK_RENDERER"))
    {
@@ -213,7 +213,6 @@
                        <property name="halign">1</property>
                        <property name="label" translatable="1">The application may have crashed.
 As a precaution, auto-loading has been turned off.
-You can turn it back on in the menu.
 </property>
                      </object>
                    </child>
@@ -25,8 +25,6 @@ base_url = "https://gitlab.gnome.org/GNOME/gtk/-/blob/main/"

 [extra]
 content_images = [
-  "../images/favicon.svg",
-  "../images/favicon-192x192.png",
  "images/gtk-logo.svg",
 ]
 urlmap_file = "urlmap.js"
@@ -24,8 +24,6 @@ base_url = "https://gitlab.gnome.org/GNOME/gtk/-/blob/main/"

 [extra]
 content_images = [
-  "../images/favicon.svg",
-  "../images/favicon-192x192.png",
  "images/gtk-logo.svg",
 ]
 urlmap_file = "urlmap.js"
@@ -67,8 +67,6 @@ content_files = [
  "macos.md",
 ]
 content_images = [
-  "../images/favicon.svg",
-  "../images/favicon-192x192.png",
  "images/gtk-logo.svg",
  "images/rotated-text.png",
  "images/default_cursor.png",
@@ -36,8 +36,6 @@ content_files = [
  "paths.md",
 ]
 content_images = [
-  "../images/favicon.svg",
-  "../images/favicon-192x192.png",
  "gtk-logo.svg",
  "images/arc-dark.png",
  "images/arc-light.png",
@@ -234,7 +234,7 @@ By default, GTK will try to build with support for the Vulkan graphics
 API in addition to cairo and OpenGL. This option can be used to explicitly
 control whether Vulkan should be used.

-### `media-gstreamer`
+### `media-gstreamer` and `media-ffmpeg`

 By default, GTK will try to build the gstreamer backend for
 media playback support. These options can be used to explicitly
@@ -85,8 +85,6 @@ content_files = [
  "visual_index.md",
 ]
 content_images = [
-  "../images/favicon.svg",
-  "../images/favicon-192x192.png",
  "images/aboutdialog.png",
  "images/action-bar.png",
  "images/appchooserbutton.png",
@@ -126,8 +126,8 @@ available on the system.
 ### `GTK_MEDIA`

 Specifies what backend to load for [class@Gtk.MediaFile]. The possible values
-depend on what options GTK was built with, and can include 'gstreamer'
-and 'none'. If set to 'none', media playback will be unavailable.
+depend on what options GTK was built with, and can include 'gstreamer',
+'ffmpeg' and 'none'. If set to 'none', media playback will be unavailable.
 The special value 'help' can be used to obtain a list of all supported
 media backends.

@@ -220,8 +220,8 @@ A number of options affect behavior instead of logging:
 `gl-disable`
 : Disable OpenGL support

-`gl-no-fractional`
-: Disable fractional scaling for OpenGL.
+`gl-fractional`
+: Enable fractional scaling for OpenGL. This is experimental

 `gl-debug`
 : Insert debugging information in OpenGL
@@ -460,13 +460,6 @@ disable certain optimizations of the "ngl" and "vulkan" renderer.
 The special value `all` can be used to turn on all values. The special
 value `help` can be used to obtain a list of all supported values.

-### `GSK_CACHE_TIMEOUT`
-
-Overrides the timeout for cache GC in the "ngl" and "vulkan" renderers.
-The value can be -1 to disable GC entirely, 0 to force GC to happen
-before every frame, or a positive number to do GC in a timeout every
-n seconds. The default timeout is 15 seconds.
-
 ### `GSK_MAX_TEXTURE_SIZE`

 Limit texture size to the minimum of this value and the OpenGL limit
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.0" width="88.572334" height="96.050743" id="svg6843">
-  <defs id="defs6845"/>
-  <g transform="translate(-19.822308,-16.115941)" id="layer1">
-    <path d="M 20.88413,30.82696 53.816977,55.527708 107.33282,39.060543 70.587303,17.177763 20.88413,30.82696 z" id="path6976" style="fill:#729fcf;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:2.12364459;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"/>
-    <path d="m 22.94243,82.287118 -2.0583,-51.460158 32.932847,24.700748 0,55.577152 L 22.94243,82.287118 z" id="path6978" style="fill:#e40000;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:2.12364459;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"/>
-    <path d="m 53.816977,111.10486 49.399213,-20.58416 4.11663,-51.460157 -53.515843,16.467165 0,55.577152 z" id="path6980" style="fill:#7fe719;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:2.12364459;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"/>
-    <path d="M 23.216626,81.319479 70.48573,67.361442 103.38422,90.444516" id="path6982" style="fill:none;stroke:#ffffff;stroke-width:1.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
-    <path d="m 70.434539,17.875593 0,49.109284" id="path6984" style="fill:#babdb6;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
-  </g>
-</svg>
@@ -123,7 +123,7 @@ static const GdkDebugKey gdk_debug_keys[] = {
  { "portals",         GDK_DEBUG_PORTALS, "Force use of portals" },
  { "no-portals",      GDK_DEBUG_NO_PORTALS, "Disable use of portals" },
  { "gl-disable",      GDK_DEBUG_GL_DISABLE, "Disable OpenGL support" },
-  { "gl-no-fractional", GDK_DEBUG_GL_NO_FRACTIONAL, "Disable fractional scaling for OpenGL" },
+  { "gl-fractional",   GDK_DEBUG_GL_FRACTIONAL, "Enable fractional scaling for OpenGL (experimental)" },
  { "gl-debug",        GDK_DEBUG_GL_DEBUG, "Insert debugging information in OpenGL" },
  { "gl-disable-gl",   GDK_DEBUG_GL_DISABLE_GL, "Only allow OpenGL GLES API" },
  { "gl-disable-gles", GDK_DEBUG_GL_DISABLE_GLES, "Don't allow OpenGL GLES API" },
@@ -222,6 +222,7 @@ gdk_parse_debug_var (const char        *variable,
        }
      else
        {
+          char *val = g_strndup (p, q - p);
          for (i = 0; i < nkeys; i++)
            {
              if (strlen (keys[i].key) == q - p &&
@@ -232,7 +233,8 @@ gdk_parse_debug_var (const char        *variable,
                }
            }
          if (i == nkeys)
-            fprintf (stderr, "Unrecognized value \"%.*s\". Try %s=help\n", (int) (q - p), p, variable);
+            fprintf (stderr, "Unrecognized value \"%s\". Try %s=help\n", val, variable);
+          g_free (val);
         }

      p = q;
@@ -43,7 +43,7 @@ typedef enum {
  GDK_DEBUG_PORTALS         = 1 << 14,
  GDK_DEBUG_NO_PORTALS      = 1 << 15,
  GDK_DEBUG_GL_DISABLE      = 1 << 16,
-  GDK_DEBUG_GL_NO_FRACTIONAL= 1 << 17,
+  GDK_DEBUG_GL_FRACTIONAL   = 1 << 17,

  GDK_DEBUG_GL_DISABLE_GL   = 1 << 19,
  GDK_DEBUG_GL_DISABLE_GLES = 1 << 20,
@@ -77,7 +77,6 @@ enum
  PROP_0,
  PROP_COMPOSITED,
  PROP_RGBA,
-  PROP_SHADOW_WIDTH,
  PROP_INPUT_SHAPES,
  PROP_DMABUF_FORMATS,
  LAST_PROP
@@ -112,7 +111,6 @@ struct _GdkDisplayPrivate {

  guint rgba : 1;
  guint composited : 1;
-  guint shadow_width: 1;
  guint input_shapes : 1;

  GdkDebugFlags debug_flags;
@@ -146,10 +144,6 @@ gdk_display_get_property (GObject    *object,
      g_value_set_boolean (value, gdk_display_is_rgba (display));
      break;

-    case PROP_SHADOW_WIDTH:
-      g_value_set_boolean (value, gdk_display_supports_shadow_width (display));
-      break;
-
    case PROP_INPUT_SHAPES:
      g_value_set_boolean (value, gdk_display_supports_input_shapes (display));
      break;
@@ -249,18 +243,6 @@ gdk_display_class_init (GdkDisplayClass *class)
                          TRUE,
                          G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);

-  /**
-   * GdkDisplay:shadow-width: (attributes org.gtk.Property.get=gdk_display_supports_shadow_width)
-   *
-   * %TRUE if the display supports extensible frames.
-   *
-   * Since: 4.14
-   */
-  props[PROP_SHADOW_WIDTH] =
-    g_param_spec_boolean ("shadow-width", NULL, NULL,
-                          TRUE,
-                          G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
-
  /**
   * GdkDisplay:input-shapes: (attributes org.gtk.Property.get=gdk_display_supports_input_shapes)
   *
@@ -272,7 +254,7 @@ gdk_display_class_init (GdkDisplayClass *class)
                          G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);

  /**
-   * GdkDisplay:dmabuf-formats: (attributes org.gtk.Property.get=gdk_display_get_dmabuf_formats)
+   * GdkDisplay:dmabuf-formats:
   *
   * The dma-buf formats that are supported on this display
   *
@@ -409,7 +391,6 @@ gdk_display_init (GdkDisplay *display)

  priv->composited = TRUE;
  priv->rgba = TRUE;
-  priv->shadow_width = TRUE;
  priv->input_shapes = TRUE;
 }

@@ -1382,7 +1363,7 @@ gdk_display_init_gl (GdkDisplay *self)
      return;
    }

-  gdk_profiler_end_mark (before2, "Realize OpenGL context", NULL);
+  gdk_profiler_end_mark (before2, "realize OpenGL context", NULL);

  /* Only assign after realize, so GdkGLContext::realize() can use
   * gdk_display_get_gl_context() == NULL to differentiate between
@@ -1392,7 +1373,7 @@ gdk_display_init_gl (GdkDisplay *self)

  gdk_gl_backend_use (GDK_GL_CONTEXT_GET_CLASS (context)->backend_type);

-  gdk_profiler_end_mark (before, "Init OpenGL", NULL);
+  gdk_profiler_end_mark (before, "initialize OpenGL", NULL);
 }

 /**
@@ -1787,6 +1768,7 @@ gdk_display_init_egl (GdkDisplay  *self,
 {
  GdkDisplayPrivate *priv = gdk_display_get_instance_private (self);
  G_GNUC_UNUSED gint64 start_time = GDK_PROFILER_CURRENT_TIME;
+  G_GNUC_UNUSED gint64 start_time2;
  int major, minor;

  if (!gdk_gl_backend_can_be_used (GDK_GL_EGL, error))
@@ -1813,6 +1795,7 @@ gdk_display_init_egl (GdkDisplay  *self,
      return FALSE;
    }

+  start_time2 = GDK_PROFILER_CURRENT_TIME;
  if (!eglInitialize (priv->egl_display, &major, &minor))
    {
      priv->egl_display = NULL;
@@ -1821,6 +1804,7 @@ gdk_display_init_egl (GdkDisplay  *self,
                           _("Could not initialize EGL display"));
      return FALSE;
    }
+  gdk_profiler_end_mark (start_time2, "eglInitialize", NULL);

  if (major < GDK_EGL_MIN_VERSION_MAJOR ||
      (major == GDK_EGL_MIN_VERSION_MAJOR && minor < GDK_EGL_MIN_VERSION_MINOR))
@@ -1910,7 +1894,7 @@ gdk_display_init_egl (GdkDisplay  *self,
      g_free (ext);
    }

-  gdk_profiler_end_mark (start_time, "Init EGL", NULL);
+  gdk_profiler_end_mark (start_time, "init EGL", NULL);

  return TRUE;
 }
@@ -2141,46 +2125,6 @@ gdk_display_set_rgba (GdkDisplay *display,
  g_object_notify_by_pspec (G_OBJECT (display), props[PROP_RGBA]);
 }

-/**
- * gdk_display_supports_shadow_width: (attributes org.gtk.Method.get_property=shadow-width)
- * @display: a `GdkDisplay`
- *
- * Returns whether it's possible for a surface to draw outside of the window area.
- *
- * If %TRUE is returned the application decides if it wants to draw shadows.
- * If %FALSE is returned, the compositor decides if it wants to draw shadows.
- *
- * Returns: %TRUE if surfaces can draw shadows or
- *   %FALSE if the display does not support this functionality.
- *
- * Since: 4.14
- */
-gboolean
-gdk_display_supports_shadow_width (GdkDisplay *display)
-{
-  GdkDisplayPrivate *priv = gdk_display_get_instance_private (display);
-
-  g_return_val_if_fail (GDK_IS_DISPLAY (display), FALSE);
-
-  return priv->shadow_width;
-}
-
-void
-gdk_display_set_shadow_width (GdkDisplay *display,
-                              gboolean    shadow_width)
-{
-  GdkDisplayPrivate *priv = gdk_display_get_instance_private (display);
-
-  g_return_if_fail (GDK_IS_DISPLAY (display));
-
-  if (priv->shadow_width == shadow_width)
-    return;
-
-  priv->shadow_width = shadow_width;
-
-  g_object_notify_by_pspec (G_OBJECT (display), props[PROP_SHADOW_WIDTH]);
-}
-
 static void
 device_removed_cb (GdkSeat    *seat,
                   GdkDevice  *device,
@@ -63,8 +63,6 @@ GDK_AVAILABLE_IN_ALL
 gboolean    gdk_display_is_composited      (GdkDisplay  *display);
 GDK_AVAILABLE_IN_ALL
 gboolean    gdk_display_is_rgba            (GdkDisplay  *display);
-GDK_AVAILABLE_IN_4_14
-gboolean    gdk_display_supports_shadow_width (GdkDisplay *display);
 GDK_AVAILABLE_IN_ALL
 gboolean    gdk_display_supports_input_shapes (GdkDisplay    *display);

@@ -257,8 +257,6 @@ void                gdk_display_set_composited        (GdkDisplay       *display
                                                       gboolean          composited);
 void                gdk_display_set_input_shapes      (GdkDisplay       *display,
                                                       gboolean          input_shapes);
-void                gdk_display_set_shadow_width      (GdkDisplay       *display,
-                                                       gboolean          shadow_width);

 void                gdk_display_add_seat              (GdkDisplay       *display,
                                                       GdkSeat          *seat);
@@ -2329,42 +2329,18 @@ gdk_dmabuf_sanitize (GdkDmabuf        *dest,
 * @dmabuf: a sanitized GdkDmabuf
 *
 * A dmabuf is considered disjoint if it uses more than
- * 1 inode.
- * Multiple file descriptors may exist when the creator
- * of the dmabuf just dup()ed once for every plane...
+ * 1 file descriptor.
 *
 * Returns: %TRUE if the dmabuf is disjoint
 **/
 gboolean
 gdk_dmabuf_is_disjoint (const GdkDmabuf *dmabuf)
 {
-  struct stat first_stat;
  unsigned i;

-  /* First, do a fast check */
-
  for (i = 1; i < dmabuf->n_planes; i++)
    {
      if (dmabuf->planes[0].fd != dmabuf->planes[i].fd)
-        break;
-    }
-
-  if (i == dmabuf->n_planes)
-    return FALSE;
-
-  /* We have different fds, do the fancy check instead */
-
-  if (fstat (dmabuf->planes[0].fd, &first_stat) != 0)
-    return TRUE;
-
-  for (i = 1; i < dmabuf->n_planes; i++)
-    {
-      struct stat plane_stat;
-
-      if (fstat (dmabuf->planes[0].fd, &plane_stat) != 0)
-        return TRUE;
-
-      if (first_stat.st_ino != plane_stat.st_ino)
        return TRUE;
    }

@@ -217,41 +217,3 @@ gdk_dmabuf_formats_peek_formats (GdkDmabufFormats *self)
 {
  return self->formats;
 }
-
-/**
- * gdk_dmabuf_formats_equal:
- * @formats1: (nullable): a `GdkDmabufFormats`
- * @formats2: (nullable): another `GdkDmabufFormats`
- *
- * Returns whether @formats1 and @formats2 contain the
- * same dmabuf formats, in the same order.
- *
- * Returns: `TRUE` if @formats1 and @formats2 are equal
- *
- * Since: 4.14
- */
-gboolean
-gdk_dmabuf_formats_equal (const GdkDmabufFormats *formats1,
-                          const GdkDmabufFormats *formats2)
-{
-  if (formats1 == formats2)
-    return TRUE;
-
-  if (formats1 == NULL || formats2 == NULL)
-    return FALSE;
-
-  if (formats1->n_formats != formats2->n_formats)
-    return FALSE;
-
-  for (gsize i = 0; i < formats1->n_formats; i++)
-    {
-      GdkDmabufFormat *f1 = &formats1->formats[i];
-      GdkDmabufFormat *f2 = &formats2->formats[i];
-
-      if (f1->fourcc != f2->fourcc ||
-          f1->modifier != f2->modifier)
-        return FALSE;
-    }
-
-  return TRUE;
-}
@@ -51,8 +51,4 @@ gboolean           gdk_dmabuf_formats_contains        (GdkDmabufFormats *formats
                                                       guint32           fourcc,
                                                       guint64           modifier) G_GNUC_PURE;

-GDK_AVAILABLE_IN_4_14
-gboolean           gdk_dmabuf_formats_equal           (const GdkDmabufFormats *formats1,
-                                                       const GdkDmabufFormats *formats2);
-
 G_END_DECLS
@@ -33,7 +33,7 @@
 /**
 * GdkDmabufTexture:
 *
- * A `GdkTexture` representing a DMA buffer.
+ * A `GdkTexture` representing a dma-buf object.
 *
 * To create a `GdkDmabufTexture`, use the auxiliary
 * [class@Gdk.DmabufTextureBuilder] object.
@@ -477,18 +477,18 @@ check_event_sanity (GdkEvent *event)
 }
 #endif

-gboolean
+void
 _gdk_event_emit (GdkEvent *event)
 {
 #ifdef G_ENABLE_DEBUG
  if (!check_event_sanity (event))
-    return FALSE;
+    return;
 #endif

  if (gdk_drag_handle_source_event (event))
-    return TRUE;
+    return;

-  return gdk_surface_handle_event (event);
+  gdk_surface_handle_event (event);
 }

 /*********************************************
@@ -619,16 +619,16 @@ typedef enum

 GdkEvent* _gdk_event_unqueue (GdkDisplay *display);

-gboolean _gdk_event_emit              (GdkEvent   *event);
-GList*   _gdk_event_queue_find_first  (GdkDisplay *display);
-void     _gdk_event_queue_remove_link (GdkDisplay *display,
-                                       GList      *node);
-GList*   _gdk_event_queue_append      (GdkDisplay *display,
-                                       GdkEvent   *event);
+void   _gdk_event_emit               (GdkEvent   *event);
+GList* _gdk_event_queue_find_first   (GdkDisplay *display);
+void   _gdk_event_queue_remove_link  (GdkDisplay *display,
+                                      GList      *node);
+GList* _gdk_event_queue_append       (GdkDisplay *display,
+                                      GdkEvent   *event);

-void     _gdk_event_queue_handle_motion_compression (GdkDisplay *display);
-void     gdk_event_queue_handle_scroll_compression  (GdkDisplay *display);
-void     _gdk_event_queue_flush                     (GdkDisplay       *display);
+void    _gdk_event_queue_handle_motion_compression (GdkDisplay *display);
+void    gdk_event_queue_handle_scroll_compression  (GdkDisplay *display);
+void    _gdk_event_queue_flush                     (GdkDisplay       *display);

 double * gdk_event_dup_axes (GdkEvent *event);

@@ -687,7 +687,7 @@ _gdk_frame_clock_emit_update (GdkFrameClock *frame_clock)

  g_signal_emit (frame_clock, signals[UPDATE], 0);

-  gdk_profiler_end_mark (before, "Frameclock update", NULL);
+  gdk_profiler_end_mark (before, "frameclock update", NULL);
 }

 void
@@ -699,7 +699,7 @@ _gdk_frame_clock_emit_layout (GdkFrameClock *frame_clock)

  g_signal_emit (frame_clock, signals[LAYOUT], 0);

-  gdk_profiler_end_mark (before, "Frameclock layout", NULL);
+  gdk_profiler_end_mark (before, "frameclock layout", NULL);
 }

 void
@@ -711,7 +711,7 @@ _gdk_frame_clock_emit_paint (GdkFrameClock *frame_clock)

  g_signal_emit (frame_clock, signals[PAINT], 0);

-  gdk_profiler_end_mark (before, "Frameclock paint", NULL);
+  gdk_profiler_end_mark (before, "frameclock paint", NULL);
 }

 void
@@ -811,12 +811,12 @@ _gdk_frame_clock_add_timings_to_profiler (GdkFrameClock   *clock,
 {
  if (timings->drawn_time != 0)
    {
-      gdk_profiler_add_mark (1000 * timings->drawn_time, 0, "Drawn window", NULL);
+      gdk_profiler_add_mark (1000 * timings->drawn_time, 0, "drawn window", NULL);
    }

  if (timings->presentation_time != 0)
    {
-      gdk_profiler_add_mark (1000 * timings->presentation_time, 0, "Presented window", NULL);
+      gdk_profiler_add_mark (1000 * timings->presentation_time, 0, "presented window", NULL);
    }

  gdk_profiler_set_counter (fps_counter, gdk_frame_clock_get_fps (clock));
@@ -694,7 +694,7 @@ gdk_frame_clock_paint_idle (void *data)
  if (!gdk_frame_clock_idle_is_frozen (clock_idle))
    priv->sleep_serial = get_sleep_serial ();

-  gdk_profiler_end_mark (before, "Frameclock cycle", NULL);
+  gdk_profiler_end_mark (before, "frameclock cycle", NULL);

  return FALSE;
 }
@@ -386,7 +386,7 @@ gdk_gl_context_create_egl_context (GdkGLContext *context,
  else if (epoxy_has_egl_extension (egl_display, "EGL_EXT_swap_buffers_with_damage"))
    priv->eglSwapBuffersWithDamage = (gpointer) epoxy_eglGetProcAddress ("eglSwapBuffersWithDamageEXT");

-  gdk_profiler_end_mark (start_time, "Create EGL context", NULL);
+  gdk_profiler_end_mark (start_time, "realize GdkWaylandGLContext", NULL);

  return api;
 }
@@ -593,7 +593,7 @@ gdk_gl_context_get_scale (GdkGLContext *self)
  scale = gdk_surface_get_scale (surface);

  display = gdk_gl_context_get_display (self);
-  if (gdk_display_get_debug_flags (display) & GDK_DEBUG_GL_NO_FRACTIONAL)
+  if (!(gdk_display_get_debug_flags (display) & GDK_DEBUG_GL_FRACTIONAL))
    scale = ceil (scale);

  return scale;
@@ -669,7 +669,7 @@ gdk_gl_context_real_end_frame (GdkDrawContext *draw_context,

  egl_surface = gdk_surface_get_egl_surface (surface);

-  gdk_profiler_add_mark (GDK_PROFILER_CURRENT_TIME, 0, "EGL swap buffers", NULL);
+  gdk_profiler_add_mark (GDK_PROFILER_CURRENT_TIME, 0, "EGL", "swap buffers");

  if (priv->eglSwapBuffersWithDamage)
    {
@@ -2042,6 +2042,15 @@ gdk_gl_context_has_sync (GdkGLContext *self)
  return priv->has_sync;
 }

+/* Return if GL_BGRA works with glTexImage2D */
+gboolean
+gdk_gl_context_has_bgra (GdkGLContext *self)
+{
+  GdkGLContextPrivate *priv = gdk_gl_context_get_instance_private (self);
+
+  return priv->has_bgra;
+}
+
 /* Return if glGenVertexArrays, glBindVertexArray and glDeleteVertexArrays
 * can be used
 */
@@ -171,6 +171,8 @@ gboolean                gdk_gl_context_has_vertex_half_float    (GdkGLContext

 gboolean                gdk_gl_context_has_sync                 (GdkGLContext    *self) G_GNUC_PURE;

+gboolean                gdk_gl_context_has_bgra                 (GdkGLContext    *self) G_GNUC_PURE;
+
 gboolean                gdk_gl_context_has_vertex_arrays        (GdkGLContext    *self) G_GNUC_PURE;

 double                  gdk_gl_context_get_scale                (GdkGLContext    *self);
@@ -26,8 +26,6 @@
 #include "gdkenumtypes.h"
 #include "gdkrectangle.h"

-#include <math.h>
-
 /**
 * GdkMonitor:
 *
@@ -48,7 +46,6 @@ enum {
  PROP_MODEL,
  PROP_CONNECTOR,
  PROP_SCALE_FACTOR,
-  PROP_SCALE,
  PROP_GEOMETRY,
  PROP_WIDTH_MM,
  PROP_HEIGHT_MM,
@@ -73,8 +70,6 @@ static void
 gdk_monitor_init (GdkMonitor *monitor)
 {
  monitor->scale_factor = 1;
-  monitor->scale = 1.0;
-  monitor->scale_set = FALSE;
  monitor->valid = TRUE;
 }

@@ -112,10 +107,6 @@ gdk_monitor_get_property (GObject    *object,
      g_value_set_int (value, monitor->scale_factor);
      break;

-    case PROP_SCALE:
-      g_value_set_double (value, monitor->scale);
-      break;
-
    case PROP_GEOMETRY:
      g_value_set_boxed (value, &monitor->geometry);
      break;
@@ -242,28 +233,13 @@ gdk_monitor_class_init (GdkMonitorClass *class)
   * GdkMonitor:scale-factor: (attributes org.gtk.Property.get=gdk_monitor_get_scale_factor)
   *
   * The scale factor.
-   *
-   * The scale factor is the next larger integer,
-   * compared to [property@Gdk.Surface:scale].
   */
  props[PROP_SCALE_FACTOR] =
    g_param_spec_int ("scale-factor", NULL, NULL,
-                      1, G_MAXINT,
+                      0, G_MAXINT,
                      1,
                      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);

-  /**
-   * GdkMonitor:scale: (attributes org.gtk.Property.get=gdk_monitor_get_scale)
-   *
-   * The scale of the monitor.
-   *
-   * Since: 4.14
-   */
-  props[PROP_SCALE] =
-      g_param_spec_double ("scale", NULL, NULL,
-                        1., G_MAXDOUBLE, 1.,
-                        G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
-
  /**
   * GdkMonitor:geometry: (attributes org.gtk.Property.get=gdk_monitor_get_geometry)
   *
@@ -370,7 +346,7 @@ gdk_monitor_get_display (GdkMonitor *monitor)
 * display coordinate space.
 *
 * The returned geometry is in  ”application pixels”, not in
- * ”device pixels” (see [method@Gdk.Monitor.get_scale]).
+ * ”device pixels” (see [method@Gdk.Monitor.get_scale_factor]).
 */
 void
 gdk_monitor_get_geometry (GdkMonitor   *monitor,
@@ -496,29 +472,6 @@ gdk_monitor_get_scale_factor (GdkMonitor *monitor)
  return monitor->scale_factor;
 }

-/**
- * gdk_monitor_get_scale: (attributes org.gtk.Method.get_property=scale)
- * @monitor: a `GdkMonitor`
- *
- * Gets the internal scale factor that maps from monitor coordinates
- * to device pixels.
- *
- * This can be used if you want to create pixel based data for a
- * particular monitor, but most of the time you’re drawing to a surface
- * where it is better to use [method@Gdk.Surface.get_scale] instead.
- *
- * Returns: the scale
- *
- * Since: 4.14
- */
-double
-gdk_monitor_get_scale (GdkMonitor *monitor)
-{
-  g_return_val_if_fail (GDK_IS_MONITOR (monitor), 1.);
-
-  return monitor->scale;
-}
-
 /**
 * gdk_monitor_get_refresh_rate: (attributes org.gtk.Method.get_property=refresh-rate)
 * @monitor: a `GdkMonitor`
@@ -630,37 +583,12 @@ void
 gdk_monitor_set_scale_factor (GdkMonitor *monitor,
                              int         scale_factor)
 {
-  g_return_if_fail (scale_factor >= 1);
-
-  if (monitor->scale_set)
-    return;
-
  if (monitor->scale_factor == scale_factor)
    return;

  monitor->scale_factor = scale_factor;
-  monitor->scale = scale_factor;

  g_object_notify (G_OBJECT (monitor), "scale-factor");
-  g_object_notify (G_OBJECT (monitor), "scale");
-}
-
-void
-gdk_monitor_set_scale (GdkMonitor *monitor,
-                       double      scale)
-{
-  g_return_if_fail (scale >= 1.);
-
-  monitor->scale_set = TRUE;
-
-  if (monitor->scale == scale)
-    return;
-
-  monitor->scale = scale;
-  monitor->scale_factor = (int) ceil (scale);
-
-  g_object_notify (G_OBJECT (monitor), "scale");
-  g_object_notify (G_OBJECT (monitor), "scale-factor");
 }

 void
@@ -77,8 +77,6 @@ GDK_AVAILABLE_IN_ALL
 const char *      gdk_monitor_get_connector       (GdkMonitor   *monitor);
 GDK_AVAILABLE_IN_ALL
 int               gdk_monitor_get_scale_factor    (GdkMonitor   *monitor);
-GDK_AVAILABLE_IN_4_14
-double            gdk_monitor_get_scale           (GdkMonitor   *monitor);
 GDK_AVAILABLE_IN_ALL
 int               gdk_monitor_get_refresh_rate    (GdkMonitor   *monitor);
 GDK_AVAILABLE_IN_ALL
@@ -44,8 +44,6 @@ struct _GdkMonitor {
  int refresh_rate;
  GdkSubpixelLayout subpixel_layout;
  gboolean valid;
-  double scale;
-  gboolean scale_set;
 };

 struct _GdkMonitorClass {
@@ -66,9 +64,7 @@ void            gdk_monitor_set_physical_size   (GdkMonitor *monitor,
                                                 int         width_mm,
                                                 int         height_mm);
 void            gdk_monitor_set_scale_factor    (GdkMonitor *monitor,
-                                                 int         scale_factor);
-void            gdk_monitor_set_scale           (GdkMonitor *monitor,
-                                                 double      scale);
+                                                 int         scale);
 void            gdk_monitor_set_refresh_rate    (GdkMonitor *monitor,
                                                 int         refresh_rate);
 void            gdk_monitor_set_subpixel_layout (GdkMonitor        *monitor,
@@ -32,7 +32,6 @@
 #include "version/gdkversionmacros.h"
 #include "gdkframeclockprivate.h"

-#define CATEGORY "GTK"

 gboolean
 gdk_profiler_is_running (void)
@@ -51,7 +50,7 @@ void
                         const char *message)
 {
 #ifdef HAVE_SYSPROF
-  sysprof_collector_mark (begin_time, duration, CATEGORY, name, message);
+  sysprof_collector_mark (begin_time, duration, "gtk", name, message);
 #endif
 }

@@ -61,7 +60,7 @@ void
                         const char *message)
 {
 #ifdef HAVE_SYSPROF
-  sysprof_collector_mark (begin_time, GDK_PROFILER_CURRENT_TIME - begin_time, CATEGORY, name, message);
+  sysprof_collector_mark (begin_time, GDK_PROFILER_CURRENT_TIME - begin_time, "gtk", name, message);
 #endif
 }

@@ -75,7 +74,7 @@ void
 #ifdef HAVE_SYSPROF
  va_list args;
  va_start (args, message_format);
-  sysprof_collector_mark_vprintf (begin_time, duration, CATEGORY, name, message_format, args);
+  sysprof_collector_mark_vprintf (begin_time, duration, "gtk", name, message_format, args);
  va_end (args);
 #endif  /* HAVE_SYSPROF */
 }
@@ -89,7 +88,7 @@ void
 #ifdef HAVE_SYSPROF
  va_list args;
  va_start (args, message_format);
-  sysprof_collector_mark_vprintf (begin_time, GDK_PROFILER_CURRENT_TIME - begin_time, CATEGORY, name, message_format, args);
+  sysprof_collector_mark_vprintf (begin_time, GDK_PROFILER_CURRENT_TIME - begin_time, "gtk", name, message_format, args);
  va_end (args);
 #endif  /* HAVE_SYSPROF */
 }
@@ -104,7 +103,7 @@ guint
  counter.id = sysprof_collector_request_counters (1);
  counter.type = SYSPROF_CAPTURE_COUNTER_DOUBLE;
  counter.value.vdbl = 0.0;
-  g_strlcpy (counter.category, CATEGORY, sizeof counter.category);
+  g_strlcpy (counter.category, "gtk", sizeof counter.category);
  g_strlcpy (counter.name, name, sizeof counter.name);
  g_strlcpy (counter.description, description, sizeof counter.name);

@@ -126,7 +125,7 @@ guint
  counter.id = sysprof_collector_request_counters (1);
  counter.type = SYSPROF_CAPTURE_COUNTER_INT64;
  counter.value.v64 = 0;
-  g_strlcpy (counter.category, CATEGORY, sizeof counter.category);
+  g_strlcpy (counter.category, "gtk", sizeof counter.category);
  g_strlcpy (counter.name, name, sizeof counter.name);
  g_strlcpy (counter.description, description, sizeof counter.name);

@@ -55,58 +55,6 @@ gdk_subsurface_get_parent (GdkSubsurface *subsurface)
  return subsurface->parent;
 }

-static void
-remove_subsurface (GdkSubsurface *subsurface)
-{
-  GdkSurface *parent = subsurface->parent;
-
-  if (parent->subsurfaces_above == subsurface)
-    parent->subsurfaces_above = subsurface->sibling_above;
-  if (parent->subsurfaces_below == subsurface)
-    parent->subsurfaces_below = subsurface->sibling_below;
-
-  if (subsurface->sibling_above)
-    subsurface->sibling_above->sibling_below = subsurface->sibling_below;
-  if (subsurface->sibling_below)
-    subsurface->sibling_below->sibling_above = subsurface->sibling_above;
-
-  subsurface->sibling_above = NULL;
-  subsurface->sibling_below = NULL;
-}
-
-static void
-insert_subsurface (GdkSubsurface *subsurface,
-                   gboolean       above,
-                   GdkSubsurface *sibling)
-{
-  GdkSurface *parent = subsurface->parent;
-
-  subsurface->above_parent = sibling->above_parent;
-
-  if (above)
-    {
-      subsurface->sibling_above = sibling->sibling_above;
-      sibling->sibling_above = subsurface;
-      subsurface->sibling_below = sibling;
-      if (subsurface->sibling_above)
-        subsurface->sibling_above->sibling_below = subsurface;
-
-      if (parent->subsurfaces_below == sibling)
-        parent->subsurfaces_below = subsurface;
-    }
-  else
-    {
-      subsurface->sibling_below = sibling->sibling_below;
-      sibling->sibling_below = subsurface;
-      subsurface->sibling_above = sibling;
-      if (subsurface->sibling_below)
-        subsurface->sibling_below->sibling_above = subsurface;
-
-      if (parent->subsurfaces_above == sibling)
-        parent->subsurfaces_above = subsurface;
-    }
-}
-
 gboolean
 gdk_subsurface_attach (GdkSubsurface         *subsurface,
                       GdkTexture            *texture,
@@ -114,39 +62,10 @@ gdk_subsurface_attach (GdkSubsurface         *subsurface,
                       gboolean               above,
                       GdkSubsurface         *sibling)
 {
-  GdkSurface *parent = subsurface->parent;
-
  g_return_val_if_fail (GDK_IS_SUBSURFACE (subsurface), FALSE);
  g_return_val_if_fail (GDK_IS_TEXTURE (texture), FALSE);
  g_return_val_if_fail (rect != NULL, FALSE);
-  g_return_val_if_fail (sibling != subsurface, FALSE);
  g_return_val_if_fail (sibling == NULL || GDK_IS_SUBSURFACE (sibling), FALSE);
-  g_return_val_if_fail (sibling == NULL || sibling->parent == subsurface->parent, FALSE);
-
-  remove_subsurface (subsurface);
-
-  if (sibling)
-    {
-      insert_subsurface (subsurface, above, sibling);
-    }
-  else
-    {
-      sibling = above ? parent->subsurfaces_above : parent->subsurfaces_below;
-
-      if (sibling)
-        {
-          insert_subsurface (subsurface, !above, sibling);
-        }
-      else
-        {
-          subsurface->above_parent = above;
-
-          if (above)
-            parent->subsurfaces_above = subsurface;
-          else
-            parent->subsurfaces_below = subsurface;
-        }
-    }

  return GDK_SUBSURFACE_GET_CLASS (subsurface)->attach (subsurface, texture, rect, above, sibling);
 }
@@ -156,8 +75,6 @@ gdk_subsurface_detach (GdkSubsurface *subsurface)
 {
  g_return_if_fail (GDK_IS_SUBSURFACE (subsurface));

-  remove_subsurface (subsurface);
-
  GDK_SUBSURFACE_GET_CLASS (subsurface)->detach (subsurface);
 }

@@ -184,5 +101,5 @@ gdk_subsurface_is_above_parent (GdkSubsurface *subsurface)
 {
  g_return_val_if_fail (GDK_IS_SUBSURFACE (subsurface), TRUE);

-  return subsurface->above_parent;
+  return GDK_SUBSURFACE_GET_CLASS (subsurface)->is_above_parent (subsurface);
 }
@@ -41,10 +41,6 @@ struct _GdkSubsurface
  GdkSurface *parent;

  int ref_count;
-
-  gboolean above_parent;
-  GdkSubsurface *sibling_above;
-  GdkSubsurface *sibling_below;
 };


@@ -61,6 +57,7 @@ struct _GdkSubsurfaceClass
  GdkTexture * (* get_texture)     (GdkSubsurface         *subsurface);
  void         (* get_rect)        (GdkSubsurface         *subsurface,
                                    graphene_rect_t       *rect);
+  gboolean     (* is_above_parent) (GdkSubsurface         *subsurface);
 };

 GType           gdk_subsurface_get_type        (void) G_GNUC_CONST;
@@ -2839,7 +2839,7 @@ add_event_mark (GdkEvent *event,
  class = g_type_class_ref (GDK_TYPE_EVENT_TYPE);
  value = g_enum_get_value (class, event_type);
  g_type_class_unref (class);
-  kind = value ? value->value_nick : "Event";
+  kind = value ? value->value_nick : "event";

  switch ((int) event_type)
    {
@@ -2909,7 +2909,7 @@ add_event_mark (GdkEvent *event,
      break;
    }

-  gdk_profiler_add_mark (time, end_time - time, "Event", message ? message : kind);
+  gdk_profiler_add_mark (time, end_time - time, "event", message ? message : kind);

  g_free (message);
 #endif
@@ -99,12 +99,6 @@ struct _GdkSurface
  GdkSeat *current_shortcuts_inhibited_seat;

  GPtrArray *subsurfaces;
-
-  /* We keep the subsurfaces above and below the surface in two linked
-   * lists, which start here.
-   */
-  GdkSubsurface *subsurfaces_above;
-  GdkSubsurface *subsurfaces_below;
 };

 struct _GdkSurfaceClass
@@ -351,6 +345,8 @@ void           gdk_surface_request_motion (GdkSurface *surface);
 gboolean       gdk_surface_supports_edge_constraints    (GdkSurface *surface);

 GdkSubsurface * gdk_surface_create_subsurface  (GdkSurface          *surface);
+void            gdk_surface_destroy_subsurface (GdkSurface          *surface,
+                                                GdkSubsurface       *subsurface);
 gsize           gdk_surface_get_n_subsurfaces  (GdkSurface          *surface);
 GdkSubsurface * gdk_surface_get_subsurface     (GdkSurface          *surface,
                                                gsize                idx);
@@ -142,9 +142,6 @@ gdk_toplevel_size_set_min_size (GdkToplevelSize *size,
 * The shadow width corresponds to the part of the computed surface size
 * that would consist of the shadow margin surrounding the window, would
 * there be any.
- * 
- * Shadow width should only be set if
- * [method@Gtk.Display.supports_shadow_width] is %TRUE.
 */
 void
 gdk_toplevel_size_set_shadow_width (GdkToplevelSize *size,
@@ -593,8 +593,7 @@ physical_device_check_features (VkPhysicalDevice   device,
      v12_features.shaderStorageBufferArrayNonUniformIndexing)
    *out_features |= GDK_VULKAN_FEATURE_NONUNIFORM_INDEXING;

-  if (ycbcr_features.samplerYcbcrConversion ||
-      physical_device_supports_extension (device, VK_KHR_SAMPLER_YCBCR_CONVERSION_EXTENSION_NAME))
+  if (ycbcr_features.samplerYcbcrConversion)
    *out_features |= GDK_VULKAN_FEATURE_YCBCR;

  if (physical_device_supports_extension (device, VK_KHR_EXTERNAL_MEMORY_FD_EXTENSION_NAME) &&
@@ -1467,27 +1466,13 @@ gdk_display_create_vulkan_device (GdkDisplay  *display,
              g_ptr_array_add (device_extensions, (gpointer) VK_KHR_SWAPCHAIN_EXTENSION_NAME);
              if (features & GDK_VULKAN_FEATURE_DESCRIPTOR_INDEXING)
                g_ptr_array_add (device_extensions, (gpointer) VK_EXT_DESCRIPTOR_INDEXING_EXTENSION_NAME);
-              if (features & GDK_VULKAN_FEATURE_YCBCR)
-                {
-                  g_ptr_array_add (device_extensions, (gpointer) VK_KHR_SAMPLER_YCBCR_CONVERSION_EXTENSION_NAME);
-                  g_ptr_array_add (device_extensions, (gpointer) VK_KHR_MAINTENANCE_1_EXTENSION_NAME);
-                  g_ptr_array_add (device_extensions, (gpointer) VK_KHR_BIND_MEMORY_2_EXTENSION_NAME);
-                  g_ptr_array_add (device_extensions, (gpointer) VK_KHR_GET_MEMORY_REQUIREMENTS_2_EXTENSION_NAME);
-                }
              if (features & GDK_VULKAN_FEATURE_DMABUF)
                {
-                  g_assert (features & GDK_VULKAN_FEATURE_YCBCR);
-
                  g_ptr_array_add (device_extensions, (gpointer) VK_KHR_EXTERNAL_MEMORY_FD_EXTENSION_NAME);
-                  g_ptr_array_add (device_extensions, (gpointer) VK_KHR_EXTERNAL_MEMORY_EXTENSION_NAME);
-
                  g_ptr_array_add (device_extensions, (gpointer) VK_EXT_IMAGE_DRM_FORMAT_MODIFIER_EXTENSION_NAME);
-                  g_ptr_array_add (device_extensions, (gpointer) VK_KHR_IMAGE_FORMAT_LIST_EXTENSION_NAME);
                }
              if (features & (GDK_VULKAN_FEATURE_SEMAPHORE_IMPORT | GDK_VULKAN_FEATURE_SEMAPHORE_EXPORT))
-                {
-                  g_ptr_array_add (device_extensions, (gpointer) VK_KHR_EXTERNAL_SEMAPHORE_FD_EXTENSION_NAME);
-                }
+                g_ptr_array_add (device_extensions, (gpointer) VK_KHR_EXTERNAL_SEMAPHORE_FD_EXTENSION_NAME);
              if (features & GDK_VULKAN_FEATURE_INCREMENTAL_PRESENT)
                g_ptr_array_add (device_extensions, (gpointer) VK_KHR_INCREMENTAL_PRESENT_EXTENSION_NAME);

@@ -1628,12 +1613,6 @@ gdk_display_create_vulkan_instance (GdkDisplay  *display,
          g_ptr_array_add (used_extensions, (gpointer) VK_EXT_DEBUG_REPORT_EXTENSION_NAME);
          have_debug_report = TRUE;
        }
-      if (g_str_equal (extensions[i].extensionName, VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME))
-        g_ptr_array_add (used_extensions, (gpointer) VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME);
-      if (g_str_equal (extensions[i].extensionName, VK_KHR_EXTERNAL_MEMORY_CAPABILITIES_EXTENSION_NAME))
-        g_ptr_array_add (used_extensions, (gpointer) VK_KHR_EXTERNAL_MEMORY_CAPABILITIES_EXTENSION_NAME);
-      if (g_str_equal (extensions[i].extensionName, VK_KHR_EXTERNAL_SEMAPHORE_CAPABILITIES_EXTENSION_NAME))
-        g_ptr_array_add (used_extensions, (gpointer) VK_KHR_EXTERNAL_SEMAPHORE_CAPABILITIES_EXTENSION_NAME);
    }

  uint32_t n_layers;
@@ -237,7 +237,7 @@ gdk_load_jpeg (GBytes  *input_bytes,

  g_bytes_unref (bytes);

-  gdk_profiler_end_mark (before, "Load jpeg", NULL);
+  gdk_profiler_end_mark (before, "jpeg load", NULL);
 
  return texture;
 }
@@ -304,7 +304,7 @@ gdk_load_png (GBytes  *bytes,
    {
      gint64 end = GDK_PROFILER_CURRENT_TIME;
      if (end - before > 500000)
-        gdk_profiler_add_mark (before, end - before, "Load png", NULL);
+        gdk_profiler_add_mark (before, end - before, "png load", NULL);
    }

  return texture;
@@ -504,7 +504,7 @@ gdk_load_tiff (GBytes  *input_bytes,
    {
      gint64 end = GDK_PROFILER_CURRENT_TIME;
      if (end - before > 500000)
-        gdk_profiler_add_mark (before, end - before, "Load tiff", NULL);
+        gdk_profiler_add_mark (before, end - before, "tiff load", NULL);
    }

  return texture;
@@ -398,7 +398,8 @@ typedef NSString *CALayerContentsGravity;
   * in from a display-side change. We need to request a layout in
   * addition to the configure event.
   */
-  if (GDK_IS_MACOS_TOPLEVEL_SURFACE (gdk_surface))
+  if (GDK_IS_MACOS_TOPLEVEL_SURFACE (gdk_surface) &&
+      GDK_MACOS_TOPLEVEL_SURFACE (gdk_surface)->decorated)
    gdk_surface_request_layout (GDK_SURFACE (gdk_surface));
 }

@@ -874,21 +875,12 @@ typedef NSString *CALayerContentsGravity;
 {
  NSWindowStyleMask style_mask = [self styleMask];

-  if (decorated)
-    {
-      style_mask &= ~NSWindowStyleMaskFullSizeContentView;
-      [self setTitleVisibility:NSWindowTitleVisible];
-    }
-  else
-    {
-      style_mask |= NSWindowStyleMaskFullSizeContentView;
-      [self setTitleVisibility:NSWindowTitleHidden];
-    }
+  [self setHasShadow:decorated];

-  [self setTitlebarAppearsTransparent:!decorated];
-  [[self standardWindowButton:NSWindowCloseButton] setHidden:!decorated];
-  [[self standardWindowButton:NSWindowMiniaturizeButton] setHidden:!decorated];
-  [[self standardWindowButton:NSWindowZoomButton] setHidden:!decorated];
+  if (decorated)
+    style_mask |= NSWindowStyleMaskTitled;
+  else
+    style_mask &= ~NSWindowStyleMaskTitled;

  [self setStyleMask:style_mask];
 }
@@ -271,11 +271,6 @@ _gdk_macos_cairo_context_end_frame (GdkDrawContext *draw_context,
  [CATransaction commit];
 }

-static void
-_gdk_macos_cairo_context_empty_frame (GdkDrawContext *draw_context)
-{
-}
-
 static void
 _gdk_macos_cairo_context_surface_resized (GdkDrawContext *draw_context)
 {
@@ -292,7 +287,6 @@ _gdk_macos_cairo_context_class_init (GdkMacosCairoContextClass *klass)

  draw_context_class->begin_frame = _gdk_macos_cairo_context_begin_frame;
  draw_context_class->end_frame = _gdk_macos_cairo_context_end_frame;
-  draw_context_class->empty_frame = _gdk_macos_cairo_context_empty_frame;
  draw_context_class->surface_resized = _gdk_macos_cairo_context_surface_resized;

  cairo_context_class->cairo_create = _gdk_macos_cairo_context_cairo_create;
@@ -625,7 +625,6 @@ gdk_macos_display_init (GdkMacosDisplay *self)
  gdk_display_set_composited (GDK_DISPLAY (self), TRUE);
  gdk_display_set_input_shapes (GDK_DISPLAY (self), FALSE);
  gdk_display_set_rgba (GDK_DISPLAY (self), TRUE);
-  gdk_display_set_shadow_width (GDK_DISPLAY (self), FALSE);
 }

 GdkDisplay *
@@ -734,14 +734,7 @@ gdk_macos_event_source_dispatch (GSource     *source,

  if (event)
    {
-      gboolean handled = _gdk_event_emit (event);
-
-      if (!handled)
-        {
-          NSEvent *nsevent = _gdk_macos_display_get_nsevent (event);
-          if (nsevent != NULL)
-            [NSApp sendEvent: nsevent];
-        }
+      _gdk_event_emit (event);

      gdk_event_unref (event);
    }
@@ -545,11 +545,6 @@ gdk_macos_gl_context_end_frame (GdkDrawContext *context,
  [CATransaction commit];
 }

-static void
-gdk_macos_gl_context_empty_frame (GdkDrawContext *draw_context)
-{
-}
-
 static void
 gdk_macos_gl_context_surface_resized (GdkDrawContext *draw_context)
 {
@@ -672,7 +667,6 @@ gdk_macos_gl_context_class_init (GdkMacosGLContextClass *klass)

  draw_context_class->begin_frame = gdk_macos_gl_context_begin_frame;
  draw_context_class->end_frame = gdk_macos_gl_context_end_frame;
-  draw_context_class->empty_frame = gdk_macos_gl_context_empty_frame;
  draw_context_class->surface_resized = gdk_macos_gl_context_surface_resized;

  gl_class->get_damage = gdk_macos_gl_context_get_damage;
@@ -186,7 +186,7 @@ gdk_wayland_cairo_context_end_frame (GdkDrawContext *draw_context,
  gdk_wayland_surface_attach_image (surface, self->paint_surface, painted);
  gdk_wayland_surface_request_frame (surface);

-  gdk_profiler_add_mark (GDK_PROFILER_CURRENT_TIME, 0, "Wayland surface commit", NULL);
+  gdk_profiler_add_mark (GDK_PROFILER_CURRENT_TIME, 0, "wayland", "surface commit");
  gdk_wayland_surface_commit (surface);
  gdk_wayland_surface_notify_committed (surface);

@@ -206,7 +206,7 @@ gdk_wayland_cairo_context_empty_frame (GdkDrawContext *draw_context)
  gdk_wayland_surface_sync (surface);
  gdk_wayland_surface_request_frame (surface);

-  gdk_profiler_add_mark (GDK_PROFILER_CURRENT_TIME, 0, "Wayland surface commit", NULL);
+  gdk_profiler_add_mark (GDK_PROFILER_CURRENT_TIME, 0, "wayland", "surface commit");
  gdk_wayland_surface_commit (surface);
  gdk_wayland_surface_notify_committed (surface);
 }
@@ -1253,7 +1253,7 @@ _gdk_wayland_display_load_cursor_theme (GdkWaylandDisplay *display_wayland)
  gdk_wayland_display_set_cursor_theme (GDK_DISPLAY (display_wayland), name, size);
  g_value_unset (&v);

-  gdk_profiler_end_mark (before, "Wayland cursor theme load", NULL);
+  gdk_profiler_end_mark (before, "wayland", "load cursor theme");

 }

@@ -1795,7 +1795,7 @@ static TranslationEntry translations[] = {
  { FALSE, "org.gnome.desktop.wm.preferences", "action-middle-click-titlebar", "gtk-titlebar-middle-click", G_TYPE_STRING, { .s = "none" } },
  { FALSE, "org.gnome.desktop.wm.preferences", "action-right-click-titlebar", "gtk-titlebar-right-click", G_TYPE_STRING, { .s = "menu" } },
  { FALSE, "org.gnome.desktop.a11y", "always-show-text-caret", "gtk-keynav-use-caret", G_TYPE_BOOLEAN, { .b = FALSE } },
-  { FALSE, "org.gnome.desktop.a11y.interface", "high-contrast", "high-contrast", G_TYPE_NONE, { .b = FALSE } },
+  { FALSE, "org.gnome.desktop.a11y.interface", "high-contrast", "high-contast", G_TYPE_NONE, { .b = FALSE } },
  { FALSE, "org.gnome.desktop.a11y.interface", "show-status-shapes", "gtk-show-status-shapes", G_TYPE_BOOLEAN, { .b = FALSE } },
  /* Note, this setting doesn't exist, the portal and gsd fake it */
  { FALSE, "org.gnome.fontconfig", "serial", "gtk-fontconfig-timestamp", G_TYPE_NONE, { .i = 0 } },
@@ -2430,47 +2430,15 @@ apply_monitor_change (GdkWaylandMonitor *monitor)
 {
  GDK_DEBUG (MISC, "monitor %d changed position %d %d, size %d %d",
                   monitor->id,
-                   monitor->output_geometry.x, monitor->output_geometry.y,
-                   monitor->output_geometry.width, monitor->output_geometry.height);
+                   monitor->x, monitor->y,
+                   monitor->width, monitor->height);

-  GdkRectangle logical_geometry;
-  gboolean needs_scaling = FALSE;
-  double scale;
-
-  if (monitor->xdg_output_done)
-    {
-      logical_geometry = monitor->xdg_output_geometry;
-      needs_scaling =
-        logical_geometry.width == monitor->output_geometry.width ||
-        logical_geometry.height == monitor->output_geometry.height;
-    }
-  else
-    {
-      logical_geometry = monitor->output_geometry;
-      needs_scaling = TRUE;
-    }
-
-  if (needs_scaling)
-    {
-      int scale_factor = gdk_monitor_get_scale_factor (GDK_MONITOR (monitor));
-      logical_geometry.y /= scale_factor;
-      logical_geometry.x /= scale_factor;
-      logical_geometry.width /= scale_factor;
-      logical_geometry.height /= scale_factor;
-
-      scale = scale_factor;
-    }
-  else
-    {
-      scale = MAX (monitor->output_geometry.width / (double) logical_geometry.width,
-                   monitor->output_geometry.height / (double) logical_geometry.height);
-    }
-
-  gdk_monitor_set_geometry (GDK_MONITOR (monitor), &logical_geometry);
+  gdk_monitor_set_geometry (GDK_MONITOR (monitor),
+                            &(GdkRectangle) {
+                              monitor->x, monitor->y,
+                              monitor->width, monitor->height });
  gdk_monitor_set_connector (GDK_MONITOR (monitor), monitor->name);
  gdk_monitor_set_description (GDK_MONITOR (monitor), monitor->description);
-  gdk_monitor_set_scale (GDK_MONITOR (monitor), scale);
-
  monitor->wl_output_done = FALSE;
  monitor->xdg_output_done = FALSE;

@@ -2488,8 +2456,8 @@ xdg_output_handle_logical_position (void                  *data,
  GDK_DEBUG (MISC, "handle logical position xdg-output %d, position %d %d",
                   monitor->id, x, y);

-  monitor->xdg_output_geometry.x = x;
-  monitor->xdg_output_geometry.y = y;
+  monitor->x = x;
+  monitor->y = y;
 }

 static void
@@ -2503,8 +2471,8 @@ xdg_output_handle_logical_size (void                  *data,
  GDK_DEBUG (MISC, "handle logical size xdg-output %d, size %d %d",
                   monitor->id, width, height);

-  monitor->xdg_output_geometry.width = width;
-  monitor->xdg_output_geometry.height = height;
+  monitor->width = width;
+  monitor->height = height;
 }

 static void
@@ -2590,8 +2558,8 @@ output_handle_geometry (void             *data,
                   make, model,
                   transform_to_string (transform));

-  monitor->output_geometry.x = x;
-  monitor->output_geometry.y = y;
+  monitor->x = x;
+  monitor->y = y;

  switch (transform)
    {
@@ -2635,12 +2603,28 @@ output_handle_scale (void             *data,
                     int32_t           scale)
 {
  GdkWaylandMonitor *monitor = (GdkWaylandMonitor *)data;
+  GdkRectangle previous_geometry;
+  int previous_scale;
+  int width;
+  int height;

  GDK_DEBUG (MISC, "handle scale output %d, scale %d", monitor->id, scale);

+  gdk_monitor_get_geometry (GDK_MONITOR (monitor), &previous_geometry);
+  previous_scale = gdk_monitor_get_scale_factor (GDK_MONITOR (monitor));
+
  /* Set the scale from wl_output protocol, regardless of xdg-output support */
  gdk_monitor_set_scale_factor (GDK_MONITOR (monitor), scale);

+  if (monitor_has_xdg_output (monitor))
+    return;
+
+  width = previous_geometry.width * previous_scale;
+  height = previous_geometry.height * previous_scale;
+
+  monitor->width = width / scale;
+  monitor->height = height / scale;
+
  if (should_update_monitor (monitor))
    apply_monitor_change (monitor);
 }
@@ -2654,6 +2638,7 @@ output_handle_mode (void             *data,
                    int               refresh)
 {
  GdkWaylandMonitor *monitor = (GdkWaylandMonitor *)data;
+  int scale;

  GDK_DEBUG (MISC, "handle mode output %d, size %d %d, rate %d",
                   monitor->id, width, height, refresh);
@@ -2661,8 +2646,9 @@ output_handle_mode (void             *data,
  if ((flags & WL_OUTPUT_MODE_CURRENT) == 0)
    return;

-  monitor->output_geometry.width = width;
-  monitor->output_geometry.height = height;
+  scale = gdk_monitor_get_scale_factor (GDK_MONITOR (monitor));
+  monitor->width = width / scale;
+  monitor->height = height / scale;
  gdk_monitor_set_refresh_rate (GDK_MONITOR (monitor), refresh);

  if (should_update_monitor (monitor) || !monitor_has_xdg_output (monitor))
@@ -87,8 +87,9 @@ static void
 gdk_wayland_gl_context_empty_frame (GdkDrawContext *draw_context)
 {
  GdkSurface *surface = gdk_draw_context_get_surface (draw_context);
+  GdkWaylandSurface *impl = GDK_WAYLAND_SURFACE (surface);

-  if (gdk_wayland_surface_needs_commit (surface))
+  if (impl->has_pending_subsurface_commits)
    {
      gdk_wayland_surface_sync (surface);
      gdk_wayland_surface_request_frame (surface);
@@ -31,10 +31,11 @@ struct _GdkWaylandMonitor {
  gboolean added;

  struct zxdg_output_v1 *xdg_output;
-  /* Raw wl_output data */
-  GdkRectangle output_geometry;
-  /* Raw xdg_output data */
-  GdkRectangle xdg_output_geometry;
+  /* Size and position, can be either from wl_output or xdg_output */
+  int32_t x;
+  int32_t y;
+  int32_t width;
+  int32_t height;
  char *name;
  char *description;
  gboolean wl_output_done;
@@ -1012,7 +1012,7 @@ gdk_wayland_surface_create_xdg_popup (GdkWaylandPopup *wayland_popup,
        }
    }

-  gdk_profiler_add_mark (GDK_PROFILER_CURRENT_TIME, 0, "Wayland surface commit", NULL);
+  gdk_profiler_add_mark (GDK_PROFILER_CURRENT_TIME, 0, "wayland", "surface commit");
  wl_surface_commit (impl->display_server.wl_surface);

  if (GDK_IS_POPUP (surface))
@@ -129,7 +129,6 @@ guint      _gdk_wayland_cursor_get_next_image_index (GdkWaylandDisplay *display,
                                                     guint             *next_image_delay);

 void            gdk_wayland_surface_sync                   (GdkSurface           *surface);
-gboolean        gdk_wayland_surface_needs_commit           (GdkSurface           *surface);
 void            gdk_wayland_surface_commit                 (GdkSurface           *surface);
 void            gdk_wayland_surface_notify_committed       (GdkSurface           *surface);
 void            gdk_wayland_surface_request_frame          (GdkSurface           *surface);
@@ -26,6 +26,8 @@ struct _GdkWaylandSubsurface
  struct wl_region *opaque_region;

  struct wl_callback *frame_callback;
+
+  gboolean above_parent;
 };

 struct _GdkWaylandSubsurfaceClass
@@ -166,8 +166,8 @@ gdk_wayland_subsurface_attach (GdkSubsurface         *sub,
  graphene_rect_t device_rect;
  cairo_rectangle_int_t device_dest;

-  if (sibling)
-    will_be_above = sibling->above_parent;
+  if (sib)
+    will_be_above = sib->above_parent;
  else
    will_be_above = above;

@@ -322,6 +322,8 @@ gdk_wayland_subsurface_attach (GdkSubsurface         *sub,
        wl_subsurface_place_above (self->subsurface, sib->surface);
      else
        wl_subsurface_place_below (self->subsurface, sib->surface);
+
+      self->above_parent = sib->above_parent;
    }
  else
    {
@@ -331,6 +333,7 @@ gdk_wayland_subsurface_attach (GdkSubsurface         *sub,
      else
        wl_subsurface_place_below (self->subsurface,
                                   GDK_WAYLAND_SURFACE (sub->parent)->display_server.wl_surface);
+      self->above_parent = above;
    }

  wl_surface_commit (self->surface);
@@ -381,6 +384,14 @@ gdk_wayland_subsurface_get_rect (GdkSubsurface   *sub,
  rect->size.height = self->dest.height;
 }

+static gboolean
+gdk_wayland_subsurface_is_above_parent (GdkSubsurface *sub)
+{
+  GdkWaylandSubsurface *self = (GdkWaylandSubsurface *)sub;
+
+  return self->above_parent;
+}
+
 static void
 gdk_wayland_subsurface_class_init (GdkWaylandSubsurfaceClass *class)
 {
@@ -393,6 +404,7 @@ gdk_wayland_subsurface_class_init (GdkWaylandSubsurfaceClass *class)
  subsurface_class->detach = gdk_wayland_subsurface_detach;
  subsurface_class->get_texture = gdk_wayland_subsurface_get_texture;
  subsurface_class->get_rect = gdk_wayland_subsurface_get_rect;
+  subsurface_class->is_above_parent = gdk_wayland_subsurface_is_above_parent;
 };

 static void
@@ -466,6 +478,8 @@ gdk_wayland_surface_create_subsurface (GdkSurface *surface)
  wl_region_add (sub->opaque_region, 0, 0, G_MAXINT, G_MAXINT);
  wl_surface_set_opaque_region (sub->surface, sub->opaque_region);

+  sub->above_parent = TRUE;
+
  GDK_DISPLAY_DEBUG (display, OFFLOAD, "Subsurface %p of surface %p created", sub, impl);

  return GDK_SUBSURFACE (sub);
@@ -199,20 +199,20 @@ get_egl_window_size (GdkSurface *surface,
  GdkDisplay *display = gdk_surface_get_display (surface);
  GdkWaylandSurface *impl = GDK_WAYLAND_SURFACE (surface);

-  if (GDK_DISPLAY_DEBUG_CHECK (display, GL_NO_FRACTIONAL))
-    {
-      GDK_DISPLAY_DEBUG (display, OPENGL, "Using integer scale %d for EGL window", gdk_fractional_scale_to_int (&impl->scale));
-
-      *width = surface->width * gdk_fractional_scale_to_int (&impl->scale);
-      *height = surface->height * gdk_fractional_scale_to_int (&impl->scale);
-    }
-  else
+  if (GDK_DISPLAY_DEBUG_CHECK (display, GL_FRACTIONAL))
    {
      GDK_DISPLAY_DEBUG (display, OPENGL, "Using fractional scale %g for EGL window", gdk_fractional_scale_to_double (&impl->scale));

      *width = gdk_fractional_scale_scale (&impl->scale, surface->width),
      *height = gdk_fractional_scale_scale (&impl->scale, surface->height);
    }
+  else
+    {
+      GDK_DISPLAY_DEBUG (display, OPENGL, "Using integer scale %d for EGL window", gdk_fractional_scale_to_int (&impl->scale));
+
+      *width = surface->width * gdk_fractional_scale_to_int (&impl->scale);
+      *height = surface->height * gdk_fractional_scale_to_int (&impl->scale);
+    }
 }

 void
@@ -274,7 +274,7 @@ gdk_wayland_surface_frame_callback (GdkSurface *surface,
  GdkFrameClock *clock = gdk_surface_get_frame_clock (surface);
  GdkFrameTimings *timings;

-  gdk_profiler_add_mark (GDK_PROFILER_CURRENT_TIME, 0, "Wayland frame event", NULL);
+  gdk_profiler_add_mark (GDK_PROFILER_CURRENT_TIME, 0, "wayland", "frame event");
  GDK_DISPLAY_DEBUG (GDK_DISPLAY (display_wayland), EVENTS, "frame %p", surface);

  g_clear_pointer (&impl->frame_callback, wl_callback_destroy);
@@ -646,12 +646,9 @@ gdk_wayland_surface_sync_opaque_region (GdkSurface *surface)
          cairo_region_t *region = cairo_region_copy (impl->opaque_region);
          for (gsize i = 0; i < gdk_surface_get_n_subsurfaces (surface); i++)
            {
-              GdkSubsurface *subsurface = gdk_surface_get_subsurface (surface, i);
-              GdkWaylandSubsurface *sub = (GdkWaylandSubsurface *) subsurface;
-
-              if (subsurface->above_parent)
+              GdkWaylandSubsurface *sub = (GdkWaylandSubsurface *)gdk_surface_get_subsurface (surface, i);
+              if (sub->above_parent)
                continue;
-
              if (sub->texture != NULL)
                cairo_region_subtract_rectangle (region, &sub->dest);
            }
@@ -749,18 +746,6 @@ gdk_wayland_surface_sync (GdkSurface *surface)
  gdk_wayland_surface_sync_viewport (surface);
 }

-gboolean
-gdk_wayland_surface_needs_commit (GdkSurface *surface)
-{
-  GdkWaylandSurface *self = GDK_WAYLAND_SURFACE (surface);
-
-  return self->has_pending_subsurface_commits ||
-         self->opaque_region_dirty ||
-         self->input_region_dirty ||
-         self->buffer_scale_dirty ||
-         self->viewport_dirty;
-}
-
 static void
 gdk_wayland_surface_fractional_scale_preferred_scale_cb (void *data,
                                                         struct wp_fractional_scale_v1 *fractional_scale,
@@ -830,7 +830,7 @@ gdk_wayland_surface_create_xdg_toplevel (GdkWaylandToplevel *wayland_toplevel)
  maybe_set_gtk_surface_dbus_properties (wayland_toplevel);
  maybe_set_gtk_surface_modal (wayland_toplevel);

-  gdk_profiler_add_mark (GDK_PROFILER_CURRENT_TIME, 0, "Wayland surface commit", NULL);
+  gdk_profiler_add_mark (GDK_PROFILER_CURRENT_TIME, 0, "wayland", "surface commit");
  wl_surface_commit (wayland_surface->display_server.wl_surface);
 }

@@ -153,11 +153,6 @@ gdk_win32_cairo_context_end_frame (GdkDrawContext *draw_context,
  g_clear_pointer (&self->window_surface, cairo_surface_destroy);
 }

-static void
-gdk_win32_cairo_context_empty_frame (GdkDrawContext *draw_context)
-{
-}
-
 static cairo_t *
 gdk_win32_cairo_context_cairo_create (GdkCairoContext *context)
 {
@@ -187,7 +182,6 @@ gdk_win32_cairo_context_class_init (GdkWin32CairoContextClass *klass)

  draw_context_class->begin_frame = gdk_win32_cairo_context_begin_frame;
  draw_context_class->end_frame = gdk_win32_cairo_context_end_frame;
-  draw_context_class->empty_frame = gdk_win32_cairo_context_empty_frame;

  cairo_context_class->cairo_create = gdk_win32_cairo_context_cairo_create;
 }
@@ -1064,7 +1064,6 @@ gdk_win32_display_check_composited (GdkWin32Display *display)
    }

  gdk_display_set_composited (GDK_DISPLAY (display), composited);
-  gdk_display_set_shadow_width (GDK_DISPLAY (display), composited);
 }

 static void
@@ -117,11 +117,6 @@ gdk_win32_gl_context_egl_begin_frame (GdkDrawContext *draw_context,
  GDK_DRAW_CONTEXT_CLASS (gdk_win32_gl_context_egl_parent_class)->begin_frame (draw_context, depth, update_area);
 }

-static void
-gdk_win32_gl_context_egl_empty_frame (GdkDrawContext *draw_context)
-{
-}
-
 static void
 gdk_win32_gl_context_egl_class_init (GdkWin32GLContextClass *klass)
 {
@@ -132,7 +127,6 @@ gdk_win32_gl_context_egl_class_init (GdkWin32GLContextClass *klass)

  draw_context_class->begin_frame = gdk_win32_gl_context_egl_begin_frame;
  draw_context_class->end_frame = gdk_win32_gl_context_egl_end_frame;
-  draw_context_class->empty_frame = gdk_win32_gl_context_egl_empty_frame;
 }

 static void
@@ -116,11 +116,6 @@ gdk_win32_gl_context_wgl_end_frame (GdkDrawContext *draw_context,
  SwapBuffers (hdc);
 }

-static void
-gdk_win32_gl_context_wgl_empty_frame (GdkDrawContext *draw_context)
-{
-}
-
 static void
 gdk_win32_gl_context_wgl_begin_frame (GdkDrawContext *draw_context,
                                      GdkMemoryDepth  depth,
@@ -814,8 +809,6 @@ gdk_win32_gl_context_wgl_class_init (GdkWin32GLContextWGLClass *klass)

  draw_context_class->begin_frame = gdk_win32_gl_context_wgl_begin_frame;
  draw_context_class->end_frame = gdk_win32_gl_context_wgl_end_frame;
-  draw_context_class->empty_frame = gdk_win32_gl_context_wgl_empty_frame;
-
  gobject_class->dispose = gdk_win32_gl_context_wgl_dispose;
 }

@@ -74,11 +74,6 @@ gdk_win32_vulkan_context_begin_frame (GdkDrawContext *draw_context,
  GDK_DRAW_CONTEXT_CLASS (gdk_win32_vulkan_context_parent_class)->begin_frame (draw_context, depth, update_area);
 }

-static void
-gdk_win32_vulkan_context_empty_frame (GdkDrawContext *draw_context)
-{
-}
-
 static void
 gdk_win32_vulkan_context_class_init (GdkWin32VulkanContextClass *klass)
 {
@@ -87,7 +82,6 @@ gdk_win32_vulkan_context_class_init (GdkWin32VulkanContextClass *klass)

  context_class->create_surface = gdk_win32_vulkan_context_create_surface;
  draw_context_class->begin_frame = gdk_win32_vulkan_context_begin_frame;
-  draw_context_class->empty_frame = gdk_win32_vulkan_context_empty_frame;
 }

 static void
@@ -1429,7 +1429,6 @@ gdk_x11_display_open (const char *display_name)
  int ignore;
  int maj, min;
  char *cm_name;
-  gboolean frame_extents;

  XInitThreads ();

@@ -1644,10 +1643,6 @@ gdk_x11_display_open (const char *display_name)
                                                  gdk_x11_get_xatom_by_name_for_display (display, cm_name)) != None);
  g_free (cm_name);

-  frame_extents = gdk_x11_screen_supports_net_wm_hint (gdk_x11_display_get_screen (display),
-                                                       g_intern_static_string ("_GTK_FRAME_EXTENTS"));
-  gdk_display_set_shadow_width (display, frame_extents);
-
  gdk_display_emit_opened (display);

  return display;
@@ -316,10 +316,7 @@ gdk_x11_gl_context_glx_get_damage (GdkGLContext *context)
          for (i = 0; i < buffer_age - 1; i++)
            {
              if (context->old_updated_area[i] == NULL)
-                {
-                  cairo_region_destroy (damage);
-                  return GDK_GL_CONTEXT_CLASS (gdk_x11_gl_context_glx_parent_class)->get_damage (context);
-                }
+                return GDK_GL_CONTEXT_CLASS (gdk_x11_gl_context_glx_parent_class)->get_damage (context);

              cairo_region_union (damage, context->old_updated_area[i]);
            }
@@ -1608,8 +1608,8 @@ gsk_gl_command_queue_do_upload_texture_chunk (GskGLCommandQueue *self,

  if (gdk_profiler_is_running ())
    {
-      gdk_profiler_end_markf (start_time,
-                              "Download texture chunk",
+      gdk_profiler_add_markf (start_time, GDK_PROFILER_CURRENT_TIME-start_time,
+                              "Download Texture chunk",
                              "Tile %dx%d Size %dx%d", x, y, width, height);
      start_time = GDK_PROFILER_CURRENT_TIME;
    }
@@ -1654,8 +1654,8 @@ gsk_gl_command_queue_do_upload_texture_chunk (GskGLCommandQueue *self,
  g_bytes_unref (bytes);

  if (gdk_profiler_is_running ())
-    gdk_profiler_end_markf (start_time,
-                            "Upload texture chunk",
+    gdk_profiler_add_markf (start_time, GDK_PROFILER_CURRENT_TIME-start_time,
+                            "Upload Texture chunk",
                            "Tile %dx%d Size %dx%d", x, y, width, height);
 }

@@ -424,7 +424,7 @@ gsk_gl_driver_load_programs (GskGLDriver  *self,
 failure:
  g_clear_object (&compiler);

-  gdk_profiler_end_mark (start_time, "Load GL programs", NULL);
+  gdk_profiler_end_mark (start_time, "load programs", NULL);

  return ret;
 }
@@ -477,7 +477,7 @@ gsk_gl_driver_new (GskGLCommandQueue  *command_queue,
  self->icons_library = gsk_gl_icon_library_new (self);
  self->shadows_library = gsk_gl_shadow_library_new (self);

-  gdk_profiler_end_mark (before, "Create GL driver", NULL);
+  gdk_profiler_end_mark (before, "create GskGLDriver", NULL);

  return g_steal_pointer (&self);
 }
@@ -119,7 +119,11 @@ gsk_gl_glyph_library_init_atlas (GskGLTextureLibrary *self,

  memset (pixel_data, 255, sizeof pixel_data);

-  if (gdk_gl_context_get_use_es (gdk_gl_context_get_current ()))
+  if (!gdk_gl_context_has_bgra (gdk_gl_context_get_current ())
+#if G_BYTE_ORDER == G_BIG_ENDIAN
+      || gdk_gl_context_get_use_es (gdk_gl_context_get_current ())
+#endif
+     )
    {
      gl_format = GL_RGBA;
      gl_type = GL_UNSIGNED_BYTE;
@@ -376,7 +380,7 @@ gsk_gl_glyph_library_upload_glyph (GskGLGlyphLibrary     *self,
    {
      char message[64];
      g_snprintf (message, sizeof message, "Size %dx%d", width, height);
-      gdk_profiler_add_mark (start_time, GDK_PROFILER_CURRENT_TIME-start_time, "Upload glyph", message);
+      gdk_profiler_add_mark (start_time, GDK_PROFILER_CURRENT_TIME-start_time, "Upload Glyph", message);
    }
 }

@@ -211,6 +211,6 @@ gsk_gl_icon_library_add (GskGLIconLibrary     *self,
    {
      char message[64];
      g_snprintf (message, sizeof message, "Size %dx%d", width, height);
-      gdk_profiler_add_mark (start_time, GDK_PROFILER_CURRENT_TIME-start_time, "Upload icon", message);
+      gdk_profiler_add_mark (start_time, GDK_PROFILER_CURRENT_TIME-start_time, "Upload Icon", message);
    }
 }
@@ -4544,7 +4544,7 @@ gsk_gl_render_job_render (GskGLRenderJob *job,
  gsk_gl_render_job_visit_node (job, root);
  gdk_gl_context_pop_debug_group (job->command_queue->context);

-  gdk_profiler_end_mark (start_time, "Build GL command queue", "");
+  gdk_profiler_add_mark (start_time, GDK_PROFILER_CURRENT_TIME-start_time, "Build GL command queue", "");

 #if 0
  /* At this point the atlases have uploaded content while we processed
@@ -4562,7 +4562,7 @@ gsk_gl_render_job_render (GskGLRenderJob *job,
  gdk_gl_context_push_debug_group (job->command_queue->context, "Executing command queue");
  gsk_gl_command_queue_execute (job->command_queue, surface_height, scale, job->region, job->default_framebuffer);
  gdk_gl_context_pop_debug_group (job->command_queue->context);
-  gdk_profiler_end_mark (start_time, "Execute GL command queue", "");
+  gdk_profiler_add_mark (start_time, GDK_PROFILER_CURRENT_TIME-start_time, "Execute GL command queue", "");
 }

 static int
@@ -125,12 +125,6 @@ gsk_gl_device_create_atlas_image (GskGpuDevice *device,
                           height);
 }

-static void
-gsk_gl_device_make_current (GskGpuDevice *device)
-{
-  gdk_gl_context_make_current (gdk_display_get_gl_context (gsk_gpu_device_get_display (device)));
-}
-
 static void
 gsk_gl_device_finalize (GObject *object)
 {
@@ -157,7 +151,6 @@ gsk_gl_device_class_init (GskGLDeviceClass *klass)
  gpu_device_class->create_atlas_image = gsk_gl_device_create_atlas_image;
  gpu_device_class->create_upload_image = gsk_gl_device_create_upload_image;
  gpu_device_class->create_download_image = gsk_gl_device_create_download_image;
-  gpu_device_class->make_current = gsk_gl_device_make_current;

  object_class->finalize = gsk_gl_device_finalize;
 }
@@ -242,7 +235,7 @@ gsk_gl_device_get_for_display (GdkDisplay  *display,
  if (!gdk_gl_context_check_version (context, "3.0", "3.0"))
    {
      g_set_error (error, GDK_GL_ERROR, GDK_GL_ERROR_NOT_AVAILABLE,
-                   _("OpenGL ES 3.0 is not supported by this renderer."));
+                   _("OpenGL ES 2.0 is not supported by this renderer."));
      return NULL;
    }

@@ -43,7 +43,7 @@ gsk_gl_image_finalize (GObject *object)
 {
  GskGLImage *self = GSK_GL_IMAGE (object);

-  if (self->texture_id && self->framebuffer_id)
+  if (self->framebuffer_id)
    glDeleteFramebuffers (1, &self->framebuffer_id);

  if (self->owns_texture)
@@ -70,7 +70,6 @@ gsk_gl_image_init (GskGLImage *self)

 GskGpuImage *
 gsk_gl_image_new_backbuffer (GskGLDevice    *device,
-                             GdkGLContext   *context,
                             GdkMemoryFormat format,
                             gsize           width,
                             gsize           height)
@@ -96,13 +95,6 @@ gsk_gl_image_new_backbuffer (GskGLDevice    *device,

  /* texture_id == 0 means backbuffer */

-  /* Check for non-standard framebuffer binding as we might not be using
-   * the default framebuffer on systems like macOS where we've bound an
-   * IOSurface to a GL_TEXTURE_RECTANGLE. Otherwise, no scissor clip will
-   * be applied in the command queue causing overdrawing.
-   */
-  self->framebuffer_id = GDK_GL_CONTEXT_GET_CLASS (context)->get_default_framebuffer (context);
-
  return GSK_GPU_IMAGE (self);
 }

@@ -11,7 +11,6 @@ G_BEGIN_DECLS
 G_DECLARE_FINAL_TYPE (GskGLImage, gsk_gl_image, GSK, GL_IMAGE, GskGpuImage)

 GskGpuImage *           gsk_gl_image_new_backbuffer                     (GskGLDevice            *device,
-                                                                         GdkGLContext           *context,
                                                                         GdkMemoryFormat         format,
                                                                         gsize                   width,
                                                                         gsize                   height);
@@ -60,7 +60,7 @@ gsk_gpu_blend_mode_op (GskGpuFrame            *frame,
                       GskGpuShaderClip        clip,
                       GskGpuDescriptors      *desc,
                       const graphene_rect_t  *rect,
-                       const graphene_point_t *offset,
+                       const GskPoint         *offset,
                       float                   opacity,
                       GskBlendMode            blend_mode,
                       guint32                 bottom_descriptor,
@@ -10,7 +10,7 @@ void                    gsk_gpu_blend_mode_op                           (GskGpuF
                                                                         GskGpuShaderClip                clip,
                                                                         GskGpuDescriptors              *desc,
                                                                         const graphene_rect_t          *rect,
-                                                                         const graphene_point_t         *offset,
+                                                                         const GskPoint                 *offset,
                                                                         float                           opacity,
                                                                         GskBlendMode                    blend_mode,
                                                                         guint32                         start_descriptor,
@@ -36,9 +36,6 @@ gsk_gpu_blend_op_print (GskGpuOp    *op,
      case GSK_GPU_BLEND_ADD:
        gsk_gpu_print_string (string, "add");
        break;
-      case GSK_GPU_BLEND_CLEAR:
-        gsk_gpu_print_string (string, "clear");
-        break;
      default:
        g_assert_not_reached ();
        break;
@@ -75,9 +72,6 @@ gsk_gpu_blend_op_gl_command (GskGpuOp          *op,
      case GSK_GPU_BLEND_ADD:
        glBlendFunc (GL_ONE, GL_ONE);
        break;
-      case GSK_GPU_BLEND_CLEAR:
-        glBlendFunc (GL_ZERO, GL_ONE_MINUS_SRC_ALPHA);
-        break;
      default:
        g_assert_not_reached ();
        break;
@@ -31,7 +31,6 @@ gsk_gpu_blur_op_print (GskGpuOp    *op,
  instance = (GskGpuBlurInstance *) gsk_gpu_frame_get_vertex_data (frame, shader->vertex_offset);

  gsk_gpu_print_op (string, indent, "blur");
-  g_string_append_printf (string, "%g,%g ", instance->blur_direction[0], instance->blur_direction[1]);
  gsk_gpu_print_rect (string, instance->rect);
  gsk_gpu_print_image_descriptor (string, shader->desc, instance->tex_id);
  gsk_gpu_print_newline (string);
@@ -64,9 +63,9 @@ gsk_gpu_blur_op_full (GskGpuFrame            *frame,
                      GskGpuDescriptors      *desc,
                      guint32                 descriptor,
                      const graphene_rect_t  *rect,
-                      const graphene_point_t *offset,
+                      const GskPoint         *offset,
                      const graphene_rect_t  *tex_rect,
-                      const graphene_vec2_t  *blur_direction,
+                      const graphene_point_t *blur_direction,
                      const GdkRGBA          *blur_color)
 {
  GskGpuBlurInstance *instance;
@@ -80,7 +79,8 @@ gsk_gpu_blur_op_full (GskGpuFrame            *frame,

  gsk_gpu_rect_to_float (rect, offset, instance->rect);
  gsk_gpu_rect_to_float (tex_rect, offset, instance->tex_rect);
-  graphene_vec2_to_float (blur_direction, instance->blur_direction);
+  instance->blur_direction[0] = blur_direction->x;
+  instance->blur_direction[1] = blur_direction->y;
  gsk_gpu_rgba_to_float (blur_color, instance->blur_color);
  instance->tex_id = descriptor;
 }
@@ -91,9 +91,9 @@ gsk_gpu_blur_op (GskGpuFrame            *frame,
                 GskGpuDescriptors      *desc,
                 guint32                 descriptor,
                 const graphene_rect_t  *rect,
-                 const graphene_point_t *offset,
+                 const GskPoint         *offset,
                 const graphene_rect_t  *tex_rect,
-                 const graphene_vec2_t  *blur_direction)
+                 const graphene_point_t *blur_direction)
 {
  gsk_gpu_blur_op_full (frame,
                        0,
@@ -113,9 +113,9 @@ gsk_gpu_blur_shadow_op (GskGpuFrame            *frame,
                        GskGpuDescriptors      *desc,
                        guint32                 descriptor,
                        const graphene_rect_t  *rect,
-                        const graphene_point_t *offset,
+                        const GskPoint         *offset,
                        const graphene_rect_t  *tex_rect,
-                        const graphene_vec2_t  *blur_direction,
+                        const graphene_point_t *blur_direction,
                        const GdkRGBA          *shadow_color)
 {
  gsk_gpu_blur_op_full (frame,
@@ -11,18 +11,18 @@ void                    gsk_gpu_blur_op                                 (GskGpuF
                                                                         GskGpuDescriptors              *desc,
                                                                         guint32                         descriptor,
                                                                         const graphene_rect_t          *rect,
-                                                                         const graphene_point_t         *offset,
+                                                                         const GskPoint                 *offset,
                                                                         const graphene_rect_t          *tex_rect,
-                                                                         const graphene_vec2_t          *blur_direction);
+                                                                         const graphene_point_t         *blur_direction);

 void                    gsk_gpu_blur_shadow_op                          (GskGpuFrame                    *frame,
                                                                         GskGpuShaderClip                clip,
                                                                         GskGpuDescriptors              *desc,
                                                                         guint32                         descriptor,
                                                                         const graphene_rect_t          *rect,
-                                                                         const graphene_point_t         *offset,
+                                                                         const GskPoint                 *offset,
                                                                         const graphene_rect_t          *tex_rect,
-                                                                         const graphene_vec2_t          *blur_direction,
+                                                                         const graphene_point_t         *blur_direction,
                                                                         const GdkRGBA                  *shadow_color);


@@ -103,7 +103,7 @@ void
 gsk_gpu_border_op (GskGpuFrame            *frame,
                   GskGpuShaderClip        clip,
                   const GskRoundedRect   *outline,
-                   const graphene_point_t *offset,
+                   const GskPoint         *offset,
                   const graphene_point_t *inside_offset,
                   const float             widths[4],
                   const GdkRGBA           colors[4])
@@ -118,7 +118,7 @@ gsk_gpu_border_op (GskGpuFrame            *frame,
                           NULL,
                           &instance);

-  gsk_rounded_rect_to_float (outline, offset, instance->outline);
+  gsk_gpu_rounded_rect_to_float (outline, offset, instance->outline);

  for (i = 0; i < 4; i++)
    {
@@ -10,7 +10,7 @@ G_BEGIN_DECLS
 void                    gsk_gpu_border_op                               (GskGpuFrame                    *frame,
                                                                         GskGpuShaderClip                clip,
                                                                         const GskRoundedRect           *outline,
-                                                                         const graphene_point_t         *offset,
+                                                                         const GskPoint                 *offset,
                                                                         const graphene_point_t         *inside_offset,
                                                                         const float                     widths[4],
                                                                         const GdkRGBA                   colors[4]);
@@ -86,7 +86,7 @@ gsk_gpu_box_shadow_op (GskGpuFrame            *frame,
                       const graphene_point_t *shadow_offset,
                       float                   spread,
                       float                   blur_radius,
-                       const graphene_point_t *offset,
+                       const GskPoint         *offset,
                       const GdkRGBA          *color)
 {
  GskGpuBoxshadowInstance *instance;
@@ -102,11 +102,10 @@ gsk_gpu_box_shadow_op (GskGpuFrame            *frame,
                           &instance);

  gsk_gpu_rect_to_float (bounds, offset, instance->bounds);
-  gsk_rounded_rect_to_float (outline, offset, instance->outline);
+  gsk_gpu_rounded_rect_to_float (outline, offset, instance->outline);
  gsk_gpu_rgba_to_float (color, instance->color);
  instance->shadow_offset[0] = shadow_offset->x;
  instance->shadow_offset[1] = shadow_offset->y;
  instance->shadow_spread = spread;
  instance->blur_radius = blur_radius;
 }
-
@@ -15,7 +15,7 @@ void                    gsk_gpu_box_shadow_op                                  (
                                                                                const graphene_point_t         *shadow_offset,
                                                                                float                           spread,
                                                                                float                           blur_radius,
-                                                                                const graphene_point_t         *offset,
+                                                                                const GskPoint                 *offset,
                                                                                const GdkRGBA                  *color);


@@ -238,12 +238,10 @@ gsk_gpu_clip_transform (GskGpuClip            *dest,

 gboolean
 gsk_gpu_clip_may_intersect_rect (const GskGpuClip       *self,
-                                 const graphene_point_t *offset,
+                                 const GskPoint         *offset,
                                 const graphene_rect_t  *rect)
 {
-  graphene_rect_t r = *rect;
-  r.origin.x += offset->x;
-  r.origin.y += offset->y;
+  graphene_rect_t r = gsk_rect_add_offset (*rect, *offset);

  switch (self->type)
    {
@@ -262,12 +260,10 @@ gsk_gpu_clip_may_intersect_rect (const GskGpuClip       *self,

 gboolean
 gsk_gpu_clip_contains_rect (const GskGpuClip       *self,
-                            const graphene_point_t *offset,
+                            const GskPoint         *offset,
                            const graphene_rect_t  *rect)
 {
-  graphene_rect_t r = *rect;
-  r.origin.x += offset->x;
-  r.origin.y += offset->y;
+  graphene_rect_t r = gsk_rect_add_offset (*rect, *offset);

  switch (self->type)
    {
@@ -288,7 +284,7 @@ gsk_gpu_clip_contains_rect (const GskGpuClip       *self,

 GskGpuShaderClip
 gsk_gpu_clip_get_shader_clip (const GskGpuClip       *self,
-                              const graphene_point_t *offset,
+                              const GskPoint         *offset,
                              const graphene_rect_t  *rect)
 {
  if (self->type == GSK_GPU_CLIP_NONE ||
@@ -59,15 +59,15 @@ gboolean                gsk_gpu_clip_transform                          (GskGpuC
                                                                         GskTransform           *transform,
                                                                         const graphene_rect_t  *viewport) G_GNUC_WARN_UNUSED_RESULT;

-gboolean                gsk_gpu_clip_contains_rect                      (const GskGpuClip    *self,
-                                                                         const graphene_point_t *offset,
+gboolean                gsk_gpu_clip_contains_rect                      (const GskGpuClip       *self,
+                                                                         const GskPoint         *offset,
                                                                         const graphene_rect_t  *rect) G_GNUC_WARN_UNUSED_RESULT;
-gboolean                gsk_gpu_clip_may_intersect_rect                 (const GskGpuClip    *self,
-                                                                         const graphene_point_t *offset,
-                                                                         const graphene_rect_t  *rect) G_GNUC_WARN_UNUSED_RESULT;
-GskGpuShaderClip        gsk_gpu_clip_get_shader_clip                    (const GskGpuClip    *self,
-                                                                         const graphene_point_t *offset,
-                                                                         const graphene_rect_t  *rect);
+gboolean                gsk_gpu_clip_may_intersect_rect                 (const GskGpuClip      *self,
+                                                                         const GskPoint        *offset,
+                                                                         const graphene_rect_t *rect) G_GNUC_WARN_UNUSED_RESULT;
+GskGpuShaderClip        gsk_gpu_clip_get_shader_clip                    (const GskGpuClip      *self,
+                                                                         const GskPoint        *offset,
+                                                                         const graphene_rect_t *rect);

 G_END_DECLS

@@ -59,7 +59,7 @@ gsk_gpu_colorize_op (GskGpuFrame            *frame,
                     GskGpuDescriptors      *descriptors,
                     guint32                 descriptor,
                     const graphene_rect_t  *rect,
-                     const graphene_point_t *offset,
+                     const GskPoint         *offset,
                     const graphene_rect_t  *tex_rect,
                     const GdkRGBA          *color)
 {
@@ -11,7 +11,7 @@ void                    gsk_gpu_colorize_op                             (GskGpuF
                                                                         GskGpuDescriptors              *desc,
                                                                         guint32                         descriptor,
                                                                         const graphene_rect_t          *rect,
-                                                                         const graphene_point_t         *offset,
+                                                                         const GskPoint                 *offset,
                                                                         const graphene_rect_t          *tex_rect,
                                                                         const GdkRGBA                  *color);

@@ -58,7 +58,7 @@ gsk_gpu_color_matrix_op (GskGpuFrame             *frame,
                         GskGpuDescriptors       *desc,
                         guint32                  descriptor,
                         const graphene_rect_t   *rect,
-                         const graphene_point_t  *offset,
+                         const GskPoint          *offset,
                         const graphene_rect_t   *tex_rect,
                         const graphene_matrix_t *color_matrix,
                         const graphene_vec4_t   *color_offset)
@@ -85,7 +85,7 @@ gsk_gpu_color_matrix_op_opacity (GskGpuFrame             *frame,
                                 GskGpuDescriptors       *desc,
                                 guint32                  descriptor,
                                 const graphene_rect_t   *rect,
-                                 const graphene_point_t  *offset,
+                                 const GskPoint          *offset,
                                 const graphene_rect_t   *tex_rect,
                                 float                    opacity)
 {
@@ -11,7 +11,7 @@ void                    gsk_gpu_color_matrix_op                         (GskGpuF
                                                                         GskGpuDescriptors              *desc,
                                                                         guint32                         descriptor,
                                                                         const graphene_rect_t          *rect,
-                                                                         const graphene_point_t         *offset,
+                                                                         const GskPoint                 *offset,
                                                                         const graphene_rect_t          *tex_rect,
                                                                         const graphene_matrix_t        *color_matrix,
                                                                         const graphene_vec4_t          *color_offset);
@@ -21,7 +21,7 @@ void                    gsk_gpu_color_matrix_op_opacity                 (GskGpuF
                                                                         GskGpuDescriptors              *desc,
                                                                         guint32                         descriptor,
                                                                         const graphene_rect_t          *rect,
-                                                                         const graphene_point_t         *offset,
+                                                                         const GskPoint                 *offset,
                                                                         const graphene_rect_t          *tex_rect,
                                                                         float                           opacity);

@@ -57,7 +57,7 @@ void
 gsk_gpu_color_op (GskGpuFrame            *frame,
                  GskGpuShaderClip        clip,
                  const graphene_rect_t  *rect,
-                  const graphene_point_t *offset,
+                  const GskPoint         *offset,
                  const GdkRGBA          *color)
 {
  GskGpuColorInstance *instance;
@@ -9,7 +9,7 @@ G_BEGIN_DECLS
 void                    gsk_gpu_color_op                                (GskGpuFrame                    *frame,
                                                                         GskGpuShaderClip                clip,
                                                                         const graphene_rect_t          *rect,
-                                                                         const graphene_point_t         *offset,
+                                                                         const GskPoint                 *offset,
                                                                         const GdkRGBA                  *color);


@@ -59,7 +59,7 @@ gsk_gpu_conic_gradient_op (GskGpuFrame            *frame,
                           const graphene_rect_t  *rect,
                           const graphene_point_t *center,
                           float                   angle,
-                           const graphene_point_t *offset,
+                           const GskPoint         *offset,
                           const GskColorStop     *stops,
                           gsize                   n_stops)
 {
@@ -13,7 +13,7 @@ void                    gsk_gpu_conic_gradient_op                       (GskGpuF
                                                                         const graphene_rect_t          *rect,
                                                                         const graphene_point_t         *center,
                                                                         float                           angle,
-                                                                         const graphene_point_t         *offset,
+                                                                         const GskPoint                 *offset,
                                                                         const GskColorStop             *stops,
                                                                         gsize                           n_stops);

@@ -59,7 +59,7 @@ gsk_gpu_cross_fade_op (GskGpuFrame            *frame,
                       GskGpuShaderClip        clip,
                       GskGpuDescriptors      *desc,
                       const graphene_rect_t  *rect,
-                       const graphene_point_t *offset,
+                       const GskPoint         *offset,
                       float                   opacity,
                       float                   progress,
                       guint32                 start_descriptor,
@@ -10,7 +10,7 @@ void                    gsk_gpu_cross_fade_op                           (GskGpuF
                                                                         GskGpuShaderClip                clip,
                                                                         GskGpuDescriptors              *desc,
                                                                         const graphene_rect_t          *rect,
-                                                                         const graphene_point_t         *offset,
+                                                                         const GskPoint                 *offset,
                                                                         float                           opacity,
                                                                         float                           progress,
                                                                         guint32                         start_descriptor,
@@ -3,14 +3,10 @@
 #include "gskgpudeviceprivate.h"

 #include "gskgpuframeprivate.h"
-#include "gskgpuimageprivate.h"
 #include "gskgpuuploadopprivate.h"

 #include "gdk/gdkdisplayprivate.h"
 #include "gdk/gdktextureprivate.h"
-#include "gdk/gdkprofilerprivate.h"
-
-#include "gsk/gskdebugprivate.h"

 #define MAX_SLICES_PER_ATLAS 64

@@ -18,13 +14,6 @@

 #define MAX_ATLAS_ITEM_SIZE 256

-#define MAX_DEAD_PIXELS (ATLAS_SIZE * ATLAS_SIZE / 2)
-
-#define CACHE_TIMEOUT 15  /* seconds */
-
-G_STATIC_ASSERT (MAX_ATLAS_ITEM_SIZE < ATLAS_SIZE);
-G_STATIC_ASSERT (MAX_DEAD_PIXELS < ATLAS_SIZE * ATLAS_SIZE);
-
 typedef struct _GskGpuCached GskGpuCached;
 typedef struct _GskGpuCachedClass GskGpuCachedClass;
 typedef struct _GskGpuCachedAtlas GskGpuCachedAtlas;
@@ -40,14 +29,11 @@ struct _GskGpuDevicePrivate
  GskGpuCached *first_cached;
  GskGpuCached *last_cached;
  guint cache_gc_source;
-  int cache_timeout;  /* in seconds, or -1 to disable gc */

  GHashTable *texture_cache;
  GHashTable *glyph_cache;

  GskGpuCachedAtlas *current_atlas;
-
-  /* atomic */ gsize dead_texture_pixels;
 };

 G_DEFINE_TYPE_WITH_PRIVATE (GskGpuDevice, gsk_gpu_device, G_TYPE_OBJECT)
@@ -68,34 +54,12 @@ struct _GskGpuCachedClass
 struct _GskGpuCached
 {
  const GskGpuCachedClass *class;
-
+  
  GskGpuCachedAtlas *atlas;
  GskGpuCached *next;
  GskGpuCached *prev;
-
-  gint64 timestamp;
-  gboolean stale;
-  guint pixels;   /* For glyphs and textures, pixels. For atlases, dead pixels */
 };

-static inline void
-mark_as_stale (GskGpuCached *cached,
-               gboolean      stale)
-{
-  if (cached->stale != stale)
-    {
-      cached->stale = stale;
-
-      if (cached->atlas)
-        {
-          if (stale)
-            ((GskGpuCached *) cached->atlas)->pixels += cached->pixels;
-          else
-            ((GskGpuCached *) cached->atlas)->pixels -= cached->pixels;
-        }
-    }
-}
-
 static void
 gsk_gpu_cached_free (GskGpuDevice *device,
                     GskGpuCached *cached)
@@ -111,8 +75,6 @@ gsk_gpu_cached_free (GskGpuDevice *device,
  else
    priv->first_cached = cached->next;

-  mark_as_stale (cached, TRUE);
-
  cached->class->free (device, cached);
 }

@@ -152,21 +114,7 @@ gsk_gpu_cached_use (GskGpuDevice *device,
                    GskGpuCached *cached,
                    gint64        timestamp)
 {
-  cached->timestamp = timestamp;
-  mark_as_stale (cached, FALSE);
-}
-
-static inline gboolean
-gsk_gpu_cached_is_old (GskGpuDevice *device,
-                       GskGpuCached *cached,
-                       gint64        timestamp)
-{
-  GskGpuDevicePrivate *priv = gsk_gpu_device_get_instance_private (device);
-
-  if (priv->cache_timeout < 0)
-    return FALSE;
-  else
-    return timestamp - cached->timestamp > priv->cache_timeout * G_TIME_SPAN_SECOND;
+  /* FIXME */
 }

 /* }}} */
@@ -189,23 +137,10 @@ static void
 gsk_gpu_cached_atlas_free (GskGpuDevice *device,
                           GskGpuCached *cached)
 {
-  GskGpuDevicePrivate *priv = gsk_gpu_device_get_instance_private (device);
  GskGpuCachedAtlas *self = (GskGpuCachedAtlas *) cached;
-  GskGpuCached *c, *next;
-
-  /* Free all remaining glyphs on this atlas */
-  for (c = priv->first_cached; c != NULL; c = next)
-    {
-      next = c->next;
-      if (c->atlas == self)
-        gsk_gpu_cached_free (device, c);
-    }
-
-  if (priv->current_atlas == self)
-    priv->current_atlas = NULL;

  g_object_unref (self->image);
-
+  
  g_free (self);
 }

@@ -214,7 +149,8 @@ gsk_gpu_cached_atlas_should_collect (GskGpuDevice *device,
                                     GskGpuCached *cached,
                                     gint64        timestamp)
 {
-  return cached->pixels > MAX_DEAD_PIXELS;
+  /* FIXME */
+  return FALSE;
 }

 static const GskGpuCachedClass GSK_GPU_CACHED_ATLAS_CLASS =
@@ -242,14 +178,7 @@ struct _GskGpuCachedTexture
 {
  GskGpuCached parent;

-  /* atomic */ int use_count; /* We count the use by the device (via the linked
-                               * list) and by the texture (via render data or
-                               * weak ref.
-                               */
-
-  gsize *dead_pixels_counter;
-
-  GdkTexture *texture;
+  /* atomic */ GdkTexture *texture;
  GskGpuImage *image;
 };

@@ -257,37 +186,14 @@ static void
 gsk_gpu_cached_texture_free (GskGpuDevice *device,
                             GskGpuCached *cached)
 {
-  GskGpuDevicePrivate *priv = gsk_gpu_device_get_instance_private (device);
  GskGpuCachedTexture *self = (GskGpuCachedTexture *) cached;
-  gpointer key, value;
+  gboolean texture_still_alive;

-  g_clear_object (&self->image);
-
-  if (g_hash_table_steal_extended (priv->texture_cache, self->texture, &key, &value))
-    {
-      /* If the texture has been reused already, we put the entry back */
-      if ((GskGpuCached *) value != cached)
-        g_hash_table_insert (priv->texture_cache, key, value);
-    }
-
-  /* If the cached item itself is still in use by the texture, we leave
-   * it to the weak ref or render data to free it.
-   */
-  if (g_atomic_int_dec_and_test (&self->use_count))
-    {
-      g_free (self);
-      return;
-    }
-}
-
-static inline gboolean
-gsk_gpu_cached_texture_is_invalid (GskGpuCachedTexture *self)
-{
-  /* If the use count is less than 2, the orignal texture has died,
-   * and the memory may have been reused for a new texture, so we
-   * can't hand out the image that is for the original texture.
-   */
-  return g_atomic_int_get (&self->use_count) < 2;
+  texture_still_alive = g_atomic_pointer_exchange (&self->texture, NULL) != NULL;
+  g_object_unref (self->image);
+  
+  if (!texture_still_alive)
+    g_free (self);
 }

 static gboolean
@@ -295,10 +201,8 @@ gsk_gpu_cached_texture_should_collect (GskGpuDevice *device,
                                       GskGpuCached *cached,
                                       gint64        timestamp)
 {
-  GskGpuCachedTexture *self = (GskGpuCachedTexture *) cached;
-
-  return gsk_gpu_cached_is_old (device, cached, timestamp) ||
-         gsk_gpu_cached_texture_is_invalid (self);
+  /* FIXME */
+  return FALSE;
 }

 static const GskGpuCachedClass GSK_GPU_CACHED_TEXTURE_CLASS =
@@ -308,19 +212,16 @@ static const GskGpuCachedClass GSK_GPU_CACHED_TEXTURE_CLASS =
  gsk_gpu_cached_texture_should_collect
 };

-/* Note: this function can run in an arbitrary thread, so it can
- * only access things atomically
- */
 static void
 gsk_gpu_cached_texture_destroy_cb (gpointer data)
 {
-  GskGpuCachedTexture *self = data;
+  GskGpuCachedTexture *cache = data;
+  gboolean cache_still_alive;

-  if (!gsk_gpu_cached_texture_is_invalid (self))
-    g_atomic_pointer_add (self->dead_pixels_counter, ((GskGpuCached *) self)->pixels);
+  cache_still_alive = g_atomic_pointer_exchange (&cache->texture, NULL) != NULL;

-  if (g_atomic_int_dec_and_test (&self->use_count))
-    g_free (self);
+  if (!cache_still_alive)
+    g_free (cache);
 }

 static GskGpuCachedTexture *
@@ -334,19 +235,18 @@ gsk_gpu_cached_texture_new (GskGpuDevice *device,
  if (gdk_texture_get_render_data (texture, device))
    gdk_texture_clear_render_data (texture);
  else if ((self = g_hash_table_lookup (priv->texture_cache, texture)))
-    g_hash_table_remove (priv->texture_cache, texture);
+    {
+      g_hash_table_remove (priv->texture_cache, texture);
+      g_object_weak_unref (G_OBJECT (texture), (GWeakNotify) gsk_gpu_cached_texture_destroy_cb, self);
+    }

  self = gsk_gpu_cached_new (device, &GSK_GPU_CACHED_TEXTURE_CLASS, NULL);
  self->texture = texture;
  self->image = g_object_ref (image);
-  ((GskGpuCached *)self)->pixels = gsk_gpu_image_get_width (image) * gsk_gpu_image_get_height (image);
-  self->dead_pixels_counter = &priv->dead_texture_pixels;
-  self->use_count = 2;

  if (!gdk_texture_set_render_data (texture, device, self, gsk_gpu_cached_texture_destroy_cb))
    {
      g_object_weak_ref (G_OBJECT (texture), (GWeakNotify) gsk_gpu_cached_texture_destroy_cb, self);
-
      g_hash_table_insert (priv->texture_cache, texture, self);
    }

@@ -374,11 +274,8 @@ static void
 gsk_gpu_cached_glyph_free (GskGpuDevice *device,
                           GskGpuCached *cached)
 {
-  GskGpuDevicePrivate *priv = gsk_gpu_device_get_instance_private (device);
  GskGpuCachedGlyph *self = (GskGpuCachedGlyph *) cached;

-  g_hash_table_remove (priv->glyph_cache, self);
-
  g_object_unref (self->font);
  g_object_unref (self->image);

@@ -390,15 +287,7 @@ gsk_gpu_cached_glyph_should_collect (GskGpuDevice *device,
                                     GskGpuCached *cached,
                                     gint64        timestamp)
 {
-  if (gsk_gpu_cached_is_old (device, cached, timestamp))
-    {
-      if (cached->atlas)
-        mark_as_stale (cached, TRUE);
-      else
-        return TRUE;
-    }
-
-  /* Glyphs are only collected when their atlas is freed */
+  /* FIXME */
  return FALSE;
 }

@@ -436,127 +325,19 @@ static const GskGpuCachedClass GSK_GPU_CACHED_GLYPH_CLASS =
 /* }}} */
 /* {{{ GskGpuDevice */

-static void
-print_cache_stats (GskGpuDevice *self)
-{
-  GskGpuDevicePrivate *priv = gsk_gpu_device_get_instance_private (self);
-  GskGpuCached *cached;
-  guint glyphs = 0;
-  guint stale_glyphs = 0;
-  guint textures = 0;
-  guint atlases = 0;
-  GString *ratios = g_string_new ("");
-
-  for (cached = priv->first_cached; cached != NULL; cached = cached->next)
-    {
-      if (cached->class == &GSK_GPU_CACHED_GLYPH_CLASS)
-        {
-          glyphs++;
-          if (cached->stale)
-            stale_glyphs++;
-        }
-      else if (cached->class == &GSK_GPU_CACHED_TEXTURE_CLASS)
-        {
-          textures++;
-        }
-      else if (cached->class == &GSK_GPU_CACHED_ATLAS_CLASS)
-        {
-          double ratio;
-
-          atlases++;
-
-          ratio = (double) cached->pixels / (double) (ATLAS_SIZE * ATLAS_SIZE);
-
-          if (ratios->len == 0)
-            g_string_append (ratios, " (ratios ");
-          else
-            g_string_append (ratios, ", ");
-          g_string_append_printf (ratios, "%.2f", ratio);
-        }
-    }
-
-  if (ratios->len > 0)
-    g_string_append (ratios, ")");
-
-  gdk_debug_message ("Cached items\n"
-                     "  glyphs:   %5u (%u stale)\n"
-                     "  textures: %5u (%u in hash)\n"
-                     "  atlases:  %5u%s",
-                     glyphs, stale_glyphs,
-                     textures, g_hash_table_size (priv->texture_cache),
-                     atlases, ratios->str);
-
-  g_string_free (ratios, TRUE);
-}
-
-static void
+void
 gsk_gpu_device_gc (GskGpuDevice *self,
                   gint64        timestamp)
 {
  GskGpuDevicePrivate *priv = gsk_gpu_device_get_instance_private (self);
-  GskGpuCached *cached, *prev;
-  gint64 before G_GNUC_UNUSED = GDK_PROFILER_CURRENT_TIME;
+  GskGpuCached *cached, *next;

-  gsk_gpu_device_make_current (self);
-
-  /* We walk the cache from the end so we don't end up with prev
-   * being a leftover glyph on the atlas we are freeing
-   */
-  for (cached = priv->last_cached; cached != NULL; cached = prev)
+  for (cached = priv->first_cached; cached != NULL; cached = next)
    {
-      prev = cached->prev;
+      next = cached->next;
      if (gsk_gpu_cached_should_collect (self, cached, timestamp))
        gsk_gpu_cached_free (self, cached);
    }
-
-  g_atomic_pointer_set (&priv->dead_texture_pixels, 0);
-
-  if (GSK_DEBUG_CHECK (GLYPH_CACHE))
-    print_cache_stats (self);
-
-  gdk_profiler_end_mark (before, "Glyph cache GC", NULL);
-}
-
-static gboolean
-cache_gc_cb (gpointer data)
-{
-  GskGpuDevice *self = data;
-  GskGpuDevicePrivate *priv = gsk_gpu_device_get_instance_private (self);
-
-  GSK_DEBUG (GLYPH_CACHE, "Periodic GC");
-
-  gsk_gpu_device_gc (self, g_get_monotonic_time ());
-
-  priv->cache_gc_source = 0;
-
-  return G_SOURCE_REMOVE;
-}
-
-void
-gsk_gpu_device_maybe_gc (GskGpuDevice *self)
-{
-  GskGpuDevicePrivate *priv = gsk_gpu_device_get_instance_private (self);
-  gsize dead_texture_pixels;
-
-  if (priv->cache_timeout < 0)
-    return;
-
-  dead_texture_pixels = GPOINTER_TO_SIZE (g_atomic_pointer_get (&priv->dead_texture_pixels));
-
-  if (priv->cache_timeout == 0 || dead_texture_pixels > 1000000)
-    {
-      GSK_DEBUG (GLYPH_CACHE, "Pre-frame GC (%lu dead pixels)", dead_texture_pixels);
-      gsk_gpu_device_gc (self, g_get_monotonic_time ());
-    }
-}
-
-void
-gsk_gpu_device_queue_gc (GskGpuDevice *self)
-{
-  GskGpuDevicePrivate *priv = gsk_gpu_device_get_instance_private (self);
-
-  if (priv->cache_timeout > 0 && !priv->cache_gc_source)
-    priv->cache_gc_source = g_timeout_add_seconds (priv->cache_timeout, cache_gc_cb, self);
 }

 static void
@@ -576,9 +357,8 @@ gsk_gpu_device_clear_cache (GskGpuDevice *self)
        g_assert (cached->next->prev == cached);
    }

-  /* We clear the cache from the end so glyphs get freed before their atlas */
-  while (priv->last_cached)
-    gsk_gpu_cached_free (self, priv->last_cached);
+  while (priv->first_cached)
+    gsk_gpu_cached_free (self, priv->first_cached);

  g_assert (priv->last_cached == NULL);
 }
@@ -592,7 +372,6 @@ gsk_gpu_device_dispose (GObject *object)
  gsk_gpu_device_clear_cache (self);
  g_hash_table_unref (priv->glyph_cache);
  g_hash_table_unref (priv->texture_cache);
-  g_clear_handle_id (&priv->cache_gc_source, g_source_remove);

  G_OBJECT_CLASS (gsk_gpu_device_parent_class)->dispose (object);
 }
@@ -634,38 +413,9 @@ gsk_gpu_device_setup (GskGpuDevice *self,
                      gsize         max_image_size)
 {
  GskGpuDevicePrivate *priv = gsk_gpu_device_get_instance_private (self);
-  const char *str;

  priv->display = g_object_ref (display);
  priv->max_image_size = max_image_size;
-  priv->cache_timeout = CACHE_TIMEOUT;
-
-  str = g_getenv ("GSK_CACHE_TIMEOUT");
-  if (str != NULL)
-    {
-      gint64 value;
-      GError *error = NULL;
-
-      if (!g_ascii_string_to_signed (str, 10, -1, G_MAXINT, &value, &error))
-        {
-          g_warning ("Failed to parse GSK_CACHE_TIMEOUT: %s", error->message);
-          g_error_free (error);
-        }
-      else
-        {
-          priv->cache_timeout = (int) value;
-        }
-    }
-
-  if (GSK_DEBUG_CHECK (GLYPH_CACHE))
-    {
-      if (priv->cache_timeout < 0)
-        gdk_debug_message ("Cache GC disabled");
-      else if (priv->cache_timeout == 0)
-        gdk_debug_message ("Cache GC before every frame");
-      else
-        gdk_debug_message ("Cache GC timeout: %d seconds", priv->cache_timeout);
-    }
 }

 GdkDisplay *
@@ -704,12 +454,6 @@ gsk_gpu_device_create_upload_image (GskGpuDevice   *self,
  return GSK_GPU_DEVICE_GET_CLASS (self)->create_upload_image (self, with_mipmap, format, width, height);
 }

-void
-gsk_gpu_device_make_current (GskGpuDevice *self)
-{
-  GSK_GPU_DEVICE_GET_CLASS (self)->make_current (self);
-}
-
 GskGpuImage *
 gsk_gpu_device_create_download_image (GskGpuDevice   *self,
                                      GdkMemoryDepth  depth,
@@ -773,21 +517,15 @@ gsk_gpu_cached_atlas_allocate (GskGpuCachedAtlas *atlas,

  if (best_slice >= i && i == atlas->n_slices)
    {
-      gsize slice_height;
-
      if (!can_add_slice)
        return FALSE;

-      slice_height = round_up_atlas_size (MAX (height, 4));
-      if (slice_height > ATLAS_SIZE - y)
-        return FALSE;
-
      atlas->n_slices++;
      if (atlas->n_slices == MAX_SLICES_PER_ATLAS)
-        slice_height = ATLAS_SIZE - y;
-
+        atlas->slices[i].height = ATLAS_SIZE - y;
+      else
+        atlas->slices[i].height = round_up_atlas_size (MAX (height, 4));
      atlas->slices[i].width = 0;
-      atlas->slices[i].height = slice_height;
      best_y = y;
      best_slice = i;
    }
@@ -803,7 +541,8 @@ gsk_gpu_cached_atlas_allocate (GskGpuCachedAtlas *atlas,

 static void
 gsk_gpu_device_ensure_atlas (GskGpuDevice *self,
-                             gboolean      recreate)
+                             gboolean      recreate,
+                             gint64        timestamp)
 {
  GskGpuDevicePrivate *priv = gsk_gpu_device_get_instance_private (self);

@@ -818,13 +557,14 @@ gsk_gpu_device_get_atlas_image (GskGpuDevice *self)
 {
  GskGpuDevicePrivate *priv = gsk_gpu_device_get_instance_private (self);

-  gsk_gpu_device_ensure_atlas (self, FALSE);
+  gsk_gpu_device_ensure_atlas (self, FALSE, g_get_monotonic_time ());

  return priv->current_atlas->image;
 }

 static GskGpuImage *
 gsk_gpu_device_add_atlas_image (GskGpuDevice      *self,
+                                gint64             timestamp,
                                gsize              width,
                                gsize              height,
                                gsize             *out_x,
@@ -835,15 +575,21 @@ gsk_gpu_device_add_atlas_image (GskGpuDevice      *self,
  if (width > MAX_ATLAS_ITEM_SIZE || height > MAX_ATLAS_ITEM_SIZE)
    return NULL;

-  gsk_gpu_device_ensure_atlas (self, FALSE);
+  gsk_gpu_device_ensure_atlas (self, FALSE, timestamp);
+  
+  if (gsk_gpu_cached_atlas_allocate (priv->current_atlas, width, height, out_x, out_y))
+    {
+      gsk_gpu_cached_use (self, (GskGpuCached *) priv->current_atlas, timestamp);
+      return priv->current_atlas->image;
+    }
+
+  gsk_gpu_device_ensure_atlas (self, TRUE, timestamp);

  if (gsk_gpu_cached_atlas_allocate (priv->current_atlas, width, height, out_x, out_y))
-    return priv->current_atlas->image;
-
-  gsk_gpu_device_ensure_atlas (self, TRUE);
-
-  if (gsk_gpu_cached_atlas_allocate (priv->current_atlas, width, height, out_x, out_y))
-    return priv->current_atlas->image;
+    {
+      gsk_gpu_cached_use (self, (GskGpuCached *) priv->current_atlas, timestamp);
+      return priv->current_atlas->image;
+    }

  return NULL;
 }
@@ -860,12 +606,12 @@ gsk_gpu_device_lookup_texture_image (GskGpuDevice *self,
  if (cache == NULL)
    cache = g_hash_table_lookup (priv->texture_cache, texture);

-  if (!cache || !cache->image || gsk_gpu_cached_texture_is_invalid (cache))
-    return NULL;
+  if (cache)
+    {
+      return g_object_ref (cache->image);
+    }

-  gsk_gpu_cached_use (self, (GskGpuCached *) cache, timestamp);
-
-  return g_object_ref (cache->image);
+  return NULL;
 }

 void
@@ -904,7 +650,6 @@ gsk_gpu_device_lookup_glyph_image (GskGpuDevice           *self,
  graphene_point_t origin;
  GskGpuImage *image;
  gsize atlas_x, atlas_y, padding;
-  float subpixel_x, subpixel_y;

  cache = g_hash_table_lookup (priv->glyph_cache, &lookup);
  if (cache)
@@ -916,16 +661,15 @@ gsk_gpu_device_lookup_glyph_image (GskGpuDevice           *self,
      return cache->image;
    }

-  subpixel_x = (flags & 3) / 4.f;
-  subpixel_y = ((flags >> 2) & 3) / 4.f;
  pango_font_get_glyph_extents (font, glyph, &ink_rect, NULL);
-  origin.x = floor (ink_rect.x * scale / PANGO_SCALE + subpixel_x);
-  origin.y = floor (ink_rect.y * scale / PANGO_SCALE + subpixel_y);
-  rect.size.width = ceil ((ink_rect.x + ink_rect.width) * scale / PANGO_SCALE + subpixel_x) - origin.x;
-  rect.size.height = ceil ((ink_rect.y + ink_rect.height) * scale / PANGO_SCALE + subpixel_y) - origin.y;
+  origin.x = floor (ink_rect.x * scale / PANGO_SCALE);
+  origin.y = floor (ink_rect.y * scale / PANGO_SCALE);
+  rect.size.width = ceil ((ink_rect.x + ink_rect.width) * scale / PANGO_SCALE) - origin.x;
+  rect.size.height = ceil ((ink_rect.y + ink_rect.height) * scale / PANGO_SCALE) - origin.y;
  padding = 1;

  image = gsk_gpu_device_add_atlas_image (self,
+                                          gsk_gpu_frame_get_timestamp (frame),
                                          rect.size.width + 2 * padding, rect.size.height + 2 * padding,
                                          &atlas_x, &atlas_y);
  if (image)
@@ -944,15 +688,14 @@ gsk_gpu_device_lookup_glyph_image (GskGpuDevice           *self,
      cache = gsk_gpu_cached_new (self, &GSK_GPU_CACHED_GLYPH_CLASS, NULL);
    }

-  cache->font = g_object_ref (font);
-  cache->glyph = glyph;
-  cache->flags = flags;
-  cache->scale = scale;
-  cache->bounds = rect;
-  cache->image = image;
-  cache->origin = GRAPHENE_POINT_INIT (- origin.x + subpixel_x,
-                                       - origin.y + subpixel_y);
-  ((GskGpuCached *) cache)->pixels = (rect.size.width + 2 * padding) * (rect.size.height + 2 * padding);
+  cache->font = g_object_ref (font),
+  cache->glyph = glyph,
+  cache->flags = flags,
+  cache->scale = scale,
+  cache->bounds = rect,
+  cache->image = image,
+  cache->origin = GRAPHENE_POINT_INIT (- origin.x + (flags & 3) / 4.f,
+                                       - origin.y + ((flags >> 2) & 3) / 4.f);

  gsk_gpu_upload_glyph_op (frame,
                           cache->image,
@@ -41,8 +41,6 @@ struct _GskGpuDeviceClass
                                                                         GdkMemoryDepth          depth,
                                                                         gsize                   width,
                                                                         gsize                   height);
-  void                  (* make_current)                                (GskGpuDevice           *self);
-
 };

 GType                   gsk_gpu_device_get_type                         (void) G_GNUC_CONST;
@@ -50,8 +48,9 @@ GType                   gsk_gpu_device_get_type                         (void) G
 void                    gsk_gpu_device_setup                            (GskGpuDevice           *self,
                                                                         GdkDisplay             *display,
                                                                         gsize                   max_image_size);
-void                    gsk_gpu_device_maybe_gc                         (GskGpuDevice           *self);
-void                    gsk_gpu_device_queue_gc                         (GskGpuDevice           *self);
+void                    gsk_gpu_device_gc                               (GskGpuDevice           *self,
+                                                                         gint64                  timestamp);
+
 GdkDisplay *            gsk_gpu_device_get_display                      (GskGpuDevice           *self);
 gsize                   gsk_gpu_device_get_max_image_size               (GskGpuDevice           *self);
 GskGpuImage *           gsk_gpu_device_get_atlas_image                  (GskGpuDevice           *self);
@@ -70,7 +69,7 @@ GskGpuImage *           gsk_gpu_device_create_download_image            (GskGpuD
                                                                         GdkMemoryDepth          depth,
                                                                         gsize                   width,
                                                                         gsize                   height);
-void                    gsk_gpu_device_make_current                     (GskGpuDevice           *self);
+
 GskGpuImage *           gsk_gpu_device_lookup_texture_image             (GskGpuDevice           *self,
                                                                         GdkTexture             *texture,
                                                                         gint64                  timestamp);
@@ -220,7 +220,7 @@ gsk_gpu_frame_seal_ops (GskGpuFrame *self)
 {
  GskGpuFramePrivate *priv = gsk_gpu_frame_get_instance_private (self);
  GskGpuOp *last, *op;
-  gsize i;
+  guint i;

  priv->first_op = (GskGpuOp *) gsk_gpu_ops_index (&priv->ops, 0);

@@ -12,6 +12,8 @@
 #include "gskvulkandescriptorsprivate.h"
 #endif

+#include "gskrectprivate.h"
+
 typedef struct _GskGpuGlobalsOp GskGpuGlobalsOp;

 struct _GskGpuGlobalsOp
@@ -87,15 +89,16 @@ static const GskGpuOpClass GSK_GPU_GLOBALS_OP_CLASS = {

 void
 gsk_gpu_globals_op (GskGpuFrame             *frame,
-                    const graphene_vec2_t   *scale,
+                    const GskScale          *scale,
                    const graphene_matrix_t *mvp,
                    const GskRoundedRect    *clip)
 {
  GskGpuGlobalsOp *self;
+  GskPoint zero = gsk_point_init (0, 0);

  self = (GskGpuGlobalsOp *) gsk_gpu_op_alloc (frame, &GSK_GPU_GLOBALS_OP_CLASS);

  graphene_matrix_to_float (mvp, self->instance.mvp);
-  gsk_rounded_rect_to_float (clip, graphene_point_zero (), self->instance.clip);
-  graphene_vec2_to_float (scale, self->instance.scale);
+  gsk_gpu_rounded_rect_to_float (clip, &zero, self->instance.clip);
+  gsk_scale_to_float (scale, self->instance.scale);
 }
@@ -3,6 +3,7 @@
 #include "gskgpuopprivate.h"

 #include <gsk/gskroundedrect.h>
+#include "gsk/gskscaleprivate.h"
 #include <graphene.h>

 G_BEGIN_DECLS
@@ -17,7 +18,7 @@ struct _GskGpuGlobalsInstance
 };

 void                    gsk_gpu_globals_op                              (GskGpuFrame                    *frame,
-                                                                         const graphene_vec2_t          *scale,
+                                                                         const GskScale                 *scale,
                                                                         const graphene_matrix_t        *mvp,
                                                                         const GskRoundedRect           *clip);

@@ -64,7 +64,7 @@ gsk_gpu_linear_gradient_op (GskGpuFrame            *frame,
                            const graphene_rect_t  *rect,
                            const graphene_point_t *start,
                            const graphene_point_t *end,
-                            const graphene_point_t *offset,
+                            const GskPoint         *offset,
                            const GskColorStop     *stops,
                            gsize                   n_stops)
 {
@@ -14,7 +14,7 @@ void                    gsk_gpu_linear_gradient_op                      (GskGpuF
                                                                         const graphene_rect_t          *rect,
                                                                         const graphene_point_t         *start,
                                                                         const graphene_point_t         *end,
-                                                                         const graphene_point_t         *offset,
+                                                                         const GskPoint                 *offset,
                                                                         const GskColorStop             *stops,
                                                                         gsize                           n_stops);

@@ -58,7 +58,7 @@ gsk_gpu_mask_op (GskGpuFrame            *frame,
                 GskGpuShaderClip        clip,
                 GskGpuDescriptors      *desc,
                 const graphene_rect_t  *rect,
-                 const graphene_point_t *offset,
+                 const GskPoint         *offset,
                 float                   opacity,
                 GskMaskMode             mask_mode,
                 guint32                 source_descriptor,
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Matthias Clasen	dfefa884ad	Add a GskPoint type and use it for offsets This has a tremendous ripple effect and is kind of disastrous.	2024-01-21 21:25:24 -05:00
Matthias Clasen	72b8c6cf74	Use graphene's simd4f type for GskScale	2024-01-21 18:42:33 -05:00
Matthias Clasen	501095452a	gsk: Introduce GskScale Use a separate type for a 2d scale that the compiler won't confuse with graphene_point_t. We can also move some of the generic scale/ transform code form gskgpunodeprocessor.c here.	2024-01-21 15:56:59 -05:00
Matthias Clasen	2ede31b682	Don't use a vec2 for blur direction either A point_t does just as well.	2024-01-21 08:04:36 -05:00
Matthias Clasen	1355367360	gpu: Don't use a vec2 for scales This is wasteful (since it gets stored as 4 highly-aligned floats), and all we ever do is unpack and repack that simf4.	2024-01-21 08:04:36 -05:00