gsk: Add some inline vec2 apis

The gpu renderers are using a vec2 for their scale, and frequently
need to access the components. Avoid PLT overhead for this.

.gitlab-ci/fedora.Dockerfile

@@ -2,6 +2,8 @@ FROM fedora:39
 
 RUN dnf -y install \
     adwaita-icon-theme \
+    atk-devel \
+    at-spi2-atk-devel \
     avahi-gobject-devel \
     cairo-devel \
     cairo-gobject-devel \
@@ -16,6 +18,7 @@ RUN dnf -y install \
     dejavu-sans-mono-fonts \
     desktop-file-utils \
     diffutils \
+    docbook-style-xsl \
     elfutils-libelf-devel \
     expat-devel \
     fribidi-devel \

NEWS

@@ -1,42 +1,6 @@
 Overview of Changes in 4.14.1, xx-xx-xxxx
 =========================================
 
-* GtkTextView:
- - Fix a mixup of cursor and anchor when retrieving surrounding text
-   in input methods
-
-* Printing:
- - Avoid accessing freed printers
-
-* Accessibility:
- - Fix memory leaks
-
-* GDK:
- - Rename the GDK_VULKAN_SKIP environment variable to GDK_VULKAN_DISABLE
- - Add a GDK_GL_DISABLE environment variable
-
-* GSK:
- - Rename the GSK_GPU_SKIP environment variable to GSK_GPU_DISABLE
- - Speed up handling of repeated ops, which should help for text
- - Speed up the inner loop of text node conversion
- - Drop the glyph-align optimization flag
- - ngl: Avoid reusing frames while they are in use
- - Fix flickering thumbnails in nautilus
- - Speed up buffer handling in both ngl and Vulkan
-
-* Demos:
- - Skip demos using gl shaders when we're not using the gl renderer
-
-* Build:
- - Fix some ubsan warnings
- - Avoid zink in ci since it spams stderr
-
-* Translation updates:
- Czech
- German
- Korean
- Russian
-
 
 Overview of Changes in 4.14.0, 12-03-2024
 =========================================

demos/gtk-demo/fishbowl.c

@@ -184,12 +184,6 @@ create_cogs (void)
   return picture;
 }
 
-static gboolean
-check_cogs (GtkFishbowl *fb)
-{
-  return GSK_IS_GL_RENDERER (gtk_native_get_renderer (gtk_widget_get_native (GTK_WIDGET (fb))));
-}
-
 static void
 mapped (GtkWidget *w)
 {
@@ -224,41 +218,36 @@ create_graph (void)
 
 static const struct {
   const char *name;
-  GtkWidget * (* create_func) (void);
-  gboolean    (* check) (GtkFishbowl *fb);
+  GtkWidget * (*create_func) (void);
 } widget_types[] = {
-  { "Icon",       create_icon,           NULL },
-  { "Button",     create_button,         NULL },
-  { "Blurbutton", create_blurred_button, NULL },
-  { "Fontbutton", create_font_button,    NULL },
-  { "Levelbar",   create_level_bar,      NULL },
-  { "Label",      create_label,          NULL },
-  { "Spinner",    create_spinner,        NULL },
-  { "Spinbutton", create_spinbutton,     NULL },
-  { "Video",      create_video,          NULL },
-  { "Gears",      create_gears,          NULL },
-  { "Switch",     create_switch,         NULL },
-  { "Menubutton", create_menu_button,    NULL },
-  { "Shader",     create_cogs,           check_cogs },
-  { "Tiger",      create_tiger,          NULL },
-  { "Graph",      create_graph,          NULL },
+  { "Icon",       create_icon           },
+  { "Button",     create_button         },
+  { "Blurbutton", create_blurred_button },
+  { "Fontbutton", create_font_button    },
+  { "Levelbar",   create_level_bar      },
+  { "Label",      create_label          },
+  { "Spinner",    create_spinner        },
+  { "Spinbutton", create_spinbutton     },
+  { "Video",      create_video          },
+  { "Gears",      create_gears          },
+  { "Switch",     create_switch         },
+  { "Menubutton", create_menu_button    },
+  { "Shader",     create_cogs           },
+  { "Tiger",      create_tiger          },
+  { "Graph",      create_graph          },
 };
 
 static int selected_widget_type = -1;
 static const int N_WIDGET_TYPES = G_N_ELEMENTS (widget_types);
 
-static gboolean
+static void
 set_widget_type (GtkFishbowl *fishbowl,
                  int          widget_type_index)
 {
   GtkWidget *window;
 
   if (widget_type_index == selected_widget_type)
-    return TRUE;
-
-  if (widget_types[widget_type_index].check != NULL &&
-      !widget_types[widget_type_index].check (fishbowl))
-    return FALSE;
+    return;
 
   selected_widget_type = widget_type_index;
 
@@ -268,8 +257,6 @@ set_widget_type (GtkFishbowl *fishbowl,
   window = GTK_WIDGET (gtk_widget_get_root (GTK_WIDGET (fishbowl)));
   gtk_window_set_title (GTK_WINDOW (window),
                         widget_types[selected_widget_type].name);
-
-  return TRUE;
 }
 
 G_MODULE_EXPORT void
@@ -277,17 +264,14 @@ fishbowl_next_button_clicked_cb (GtkButton *source,
                                  gpointer   user_data)
 {
   GtkFishbowl *fishbowl = user_data;
-  int new_index = selected_widget_type;
+  int new_index;
 
-  do
-    {
-      if (new_index + 1 >= N_WIDGET_TYPES)
-        new_index = 0;
-      else
-        new_index = new_index + 1;
+  if (selected_widget_type + 1 >= N_WIDGET_TYPES)
+    new_index = 0;
+  else
+    new_index = selected_widget_type + 1;
 
-    }
-  while (!set_widget_type (fishbowl, new_index));
+  set_widget_type (fishbowl, new_index);
 }
 
 G_MODULE_EXPORT void
@@ -295,18 +279,14 @@ fishbowl_prev_button_clicked_cb (GtkButton *source,
                                  gpointer   user_data)
 {
   GtkFishbowl *fishbowl = user_data;
-  int new_index = selected_widget_type;
+  int new_index;
 
-  do
-    {
-      if (new_index - 1 < 0)
-        new_index = N_WIDGET_TYPES - 1;
-      else
-        new_index = new_index - 1;
+  if (selected_widget_type - 1 < 0)
+    new_index = N_WIDGET_TYPES - 1;
+  else
+    new_index = selected_widget_type - 1;
 
-    }
-
-  while (!set_widget_type (fishbowl, new_index));
+  set_widget_type (fishbowl, new_index);
 }
 
 G_MODULE_EXPORT void

demos/gtk-demo/main.c

@@ -827,25 +827,13 @@ demo_search_changed_cb (GtkSearchEntry *entry,
   gtk_filter_changed (filter, GTK_FILTER_CHANGE_DIFFERENT);
 }
 
-static gboolean
-demo_can_run (GtkWidget  *window,
-              const char *name)
-{
-  if (name != NULL && strcmp (name, "gltransition") == 0)
-    return GSK_IS_GL_RENDERER (gtk_native_get_renderer (GTK_NATIVE (window)));
-
-  return TRUE;
-}
-
 static GListModel *
-create_demo_model (GtkWidget *window)
+create_demo_model (void)
 {
   GListStore *store = g_list_store_new (GTK_TYPE_DEMO);
   DemoData *demo = gtk_demos;
   GtkDemo *d;
 
-  gtk_widget_realize (window);
-
   d = GTK_DEMO (g_object_new (GTK_TYPE_DEMO, NULL));
   d->name = "main";
   d->title = "GTK Demo";
@@ -857,20 +845,16 @@ create_demo_model (GtkWidget *window)
 
   while (demo->title)
     {
-       DemoData *children = demo->children;
+      d = GTK_DEMO (g_object_new (GTK_TYPE_DEMO, NULL));
+      DemoData *children = demo->children;
 
-      if (demo_can_run (window, demo->name))
-        {
-          d = GTK_DEMO (g_object_new (GTK_TYPE_DEMO, NULL));
+      d->name = demo->name;
+      d->title = demo->title;
+      d->keywords = demo->keywords;
+      d->filename = demo->filename;
+      d->func = demo->func;
 
-          d->name = demo->name;
-          d->title = demo->title;
-          d->keywords = demo->keywords;
-          d->filename = demo->filename;
-          d->func = demo->func;
-
-          g_list_store_append (store, d);
-        }
+      g_list_store_append (store, d);
 
       if (children)
         {
@@ -878,19 +862,15 @@ create_demo_model (GtkWidget *window)
 
           while (children->title)
             {
-              if (demo_can_run (window, children->name))
-                {
-                  GtkDemo *child = GTK_DEMO (g_object_new (GTK_TYPE_DEMO, NULL));
+              GtkDemo *child = GTK_DEMO (g_object_new (GTK_TYPE_DEMO, NULL));
 
-                  child->name = children->name;
-                  child->title = children->title;
-                  child->keywords = children->keywords;
-                  child->filename = children->filename;
-                  child->func = children->func;
-
-                  g_list_store_append (G_LIST_STORE (d->children_model), child);
-                }
+              child->name = children->name;
+              child->title = children->title;
+              child->keywords = children->keywords;
+              child->filename = children->filename;
+              child->func = children->func;
 
+              g_list_store_append (G_LIST_STORE (d->children_model), child);
               children++;
             }
         }
@@ -956,7 +936,7 @@ activate (GApplication *app)
   search_bar = GTK_WIDGET (gtk_builder_get_object (builder, "searchbar"));
   g_signal_connect (search_bar, "notify::search-mode-enabled", G_CALLBACK (clear_search), NULL);
 
-  listmodel = create_demo_model (window);
+  listmodel = create_demo_model ();
   treemodel = gtk_tree_list_model_new (G_LIST_MODEL (listmodel),
                                        FALSE,
                                        TRUE,

demos/gtk-demo/path_maze.c

@@ -338,7 +338,7 @@ do_path_maze (GtkWidget *do_widget)
       GskPath *path;
 
       window = gtk_window_new ();
-      gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
+      gtk_window_set_resizable (GTK_WINDOW (window), TRUE);
       gtk_window_set_title (GTK_WINDOW (window), "Follow the maze with the mouse");
       g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
 

docs/reference/gtk/building.md

@@ -38,13 +38,13 @@ can run the build, using Ninja:
 
 ```
 cd builddir
-meson compile
-meson install
+ninja
+ninja install
 ```
 
 If you don't have permission to write to the directory you are
 installing in, you may have to change to root temporarily before
-running `meson install`.
+running `ninja install`.
 
 Several environment variables are useful to pass to set before
 running *meson*. `CPPFLAGS` contains options to pass to the C
@@ -112,10 +112,10 @@ responsible for controlling the debugging features of GTK with
 
 ## Dependencies
 
-Before you can compile GTK, you need to have various other tools and
-libraries installed on your system. Dependencies of GTK have their own
-build systems, so you will need to refer to their own installation
-instructions.
+Before you can compile the GTK widget toolkit, you need to have
+various other tools and libraries installed on your
+system. Dependencies of GTK have their own build systems, so
+you will need to refer to their own installation instructions.
 
 A particular important tool used by GTK to find its dependencies
 is `pkg-config`.
@@ -156,8 +156,8 @@ Other libraries are maintained separately.
   the development environment for these libraries that your
   operating system vendor provides.
 - The [fontconfig](https://www.freedesktop.org/wiki/Software/fontconfig/)
-  library provides Pango with a standard way of locating fonts and matching
-  them against font names.
+  library provides Pango with a standard way of locating
+  fonts and matching them against font names.
 - [Cairo](https://www.cairographics.org) is a graphics library that
   supports vector graphics and image compositing. Both Pango and GTK
   use Cairo for drawing. Note that we also need the auxiliary cairo-gobject
@@ -220,12 +220,13 @@ meson configure builddir
 
 ### `x11-backend`, `win32-backend`, `broadway-backend`, `wayland-backend` and `macos-backend`
 
-Enable specific backends for GDK.  If none of these options are given, the
-Wayland backend will be enabled by default, if the platform is Linux; the
-X11 backend will also be enabled by default, unless the platform is Windows,
-in which case the default is win32, or the platform is macOS, in which case
-the default is macOS. If any backend is explicitly enabled or disabled, no
-other platform will be enabled automatically.
+Enable specific backends for GDK.  If none of these options
+are given, the Wayland backend will be enabled by default,
+if the platform is Linux; the X11 backend will also be enabled
+by default, unless the platform is Windows, in which case the
+default is win32, or the platform is macOS, in which case the
+default is macOS. If any backend is explicitly enabled or disabled,
+no other platform will be enabled automatically.
 
 ### `vulkan`
 

docs/reference/gtk/css-overview.md

@@ -1,7 +1,7 @@
 Title: CSS in GTK
 Slug: css
 
-This chapter describes how GTK uses CSS for styling and layout.
+This chapter describes how GTK uses CSS for styling and layout. 
 It is not meant to be an explanation of CSS from first principles,
 but focuses on listing supported CSS features and differences
 between Web CSS and GTK.

docs/reference/gtk/overview.md

@@ -28,9 +28,6 @@ GTK depends on the following libraries:
  - **OpenGL**: OpenGL is the premier environment for developing portable,
    interactive 2D and 3D graphics applications. More information available
    on the [Khronos website][opengl].
- - **Vulkan**: Vulkan is the a newer graphics API, that can be considered
-   the successor of OpenGL.  More information available on the
-   [Khronos website][vulkan].
  - **Pango**: Pango is a library for internationalized text handling. It
    centers around the `PangoLayout` object, representing a paragraph of
    text.  Pango provides the engine for `GtkTextView`, `GtkLabel`,
@@ -63,7 +60,6 @@ GTK is divided into three parts:
 [gio]: https://developer.gnome.org/gio/stable/
 [cairo]: https://www.cairographics.org/manual/
 [opengl]: https://www.opengl.org/about/
-[vulkan]: https://www.vulkan.org/
 [pango]: https://pango.gnome.org/
 [gdkpixbuf]: https://developer.gnome.org/gdk-pixbuf/stable/
 [graphene]: https://ebassi.github.io/graphene/

docs/reference/gtk/running.md

@@ -278,11 +278,14 @@ are only available when GTK has been configured with `-Ddebug=true`.
 : OpenGL renderer information
 
 `vulkan`
-: Check Vulkan errors
+: Vulkan renderer information
 
 `shaders`
 : Information about shaders
 
+`surface`
+: Information about surfaces
+
 `fallback`
 : Information about fallback usage in renderers
 
@@ -300,6 +303,9 @@ A number of options affect behavior instead of logging:
 `full-redraw`
 : Force full redraws
 
+`sync`
+: Sync after each frame
+
 `staging`
 : Use a staging image for texture upload (Vulkan only)
 
@@ -341,28 +347,6 @@ a `*`, which means: try all remaining backends. The special value
 backends. For more information about selecting backends,
 see the [func@Gdk.DisplayManager.get] function.
 
-### `GDK_GL_DISABLE`
-
-This variable can be set to a list of values, which cause GDK to
-disable extension features of the OpenGL support.
-Note that these features may already be disabled if the GL driver
-does not support them.
-
-`debug`
-: GL_KHR_debug
-
-`unpack-subimage`
-:GL_EXT_unpack_subimage
-
-`half-float`
-:GL_OES_vertex_half_float
-
-`sync`
-:GL_ARB_sync
-
-`base-instance`
-:GL_EXT_base_instance
-
 ### `GDK_VULKAN_DEVICE`
 
 This variable can be set to the index of a Vulkan device to override
@@ -370,7 +354,7 @@ the default selection of the device that is used for Vulkan rendering.
 The special value `list` can be used to obtain a list of all Vulkan
 devices.
 
-### `GDK_VULKAN_DISABLE`
+### `GDK_VULKAN_SKIP`
 
 This variable can be set to a list of values, which cause GDK to
 disable features of the Vulkan support.
@@ -450,7 +434,7 @@ using and the GDK backend supports them:
     installation.
 
 
-### `GSK_GPU_DISABLE`
+### `GSK_GPU_SKIP`
 
 This variable can be set to a list of values, which cause GSK to
 disable certain optimizations of the "ngl" and "vulkan" renderer.
@@ -470,6 +454,9 @@ disable certain optimizations of the "ngl" and "vulkan" renderer.
 `mipmap`
 : Avoid creating mipmaps
 
+`gl-baseinstance`
+: Assume no ARB/EXT_base_instance support
+
 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.
 
@@ -482,10 +469,10 @@ 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 for
-texture sizes in the "gl" renderer. This can be used to debug issues with
-texture slicing on systems where the OpenGL texture size limit would
-otherwise make texture slicing difficult to test.
+Limit texture size to the minimum of this value and the OpenGL limit
+for texture sizes. This can be used to debug issues with texture slicing
+on systems where the OpenGL texture size limit would otherwise make
+texture slicing difficult to test.
 
 ### `GTK_CSD`
 

gdk/gdkdisplay.c

@@ -1538,7 +1538,6 @@ describe_egl_config (EGLDisplay egl_display,
                      EGLConfig  egl_config)
 {
   EGLint red, green, blue, alpha, type;
-  EGLint depth, stencil;
 
   if (egl_config == NULL)
     return g_strdup ("-");
@@ -1557,15 +1556,7 @@ describe_egl_config (EGLDisplay egl_display,
   else
     type = EGL_COLOR_COMPONENT_TYPE_FIXED_EXT;
 
-  if (!eglGetConfigAttrib (egl_display, egl_config, EGL_DEPTH_SIZE, &depth))
-    depth = 0;
-  if (!eglGetConfigAttrib (egl_display, egl_config, EGL_STENCIL_SIZE, &stencil))
-    stencil = 0;
-
-  return g_strdup_printf ("R%dG%dB%dA%d%s%s%s", red, green, blue, alpha,
-                          type == EGL_COLOR_COMPONENT_TYPE_FIXED_EXT ? "" : " float",
-                          depth > 0 ? ", depth buffer" : "",
-                          stencil > 0 ? ", stencil buffer" : "");
+  return g_strdup_printf ("R%dG%dB%dA%d%s", red, green, blue, alpha, type == EGL_COLOR_COMPONENT_TYPE_FIXED_EXT ? "" : " float");
 }
 
 gpointer

gdk/gdkgl.c

@@ -125,7 +125,7 @@ gdk_cairo_draw_from_gl (cairo_t              *cr,
    * the GL_UNPACK_ROW_LENGTH support
    */
   if (gdk_gl_context_get_use_es (paint_context) &&
-      !(version >= 300 || gdk_gl_context_has_feature (paint_context, GDK_GL_FEATURE_UNPACK_SUBIMAGE)))
+      !(version >= 300 || gdk_gl_context_has_unpack_subimage (paint_context)))
     return;
 
   /* TODO: avoid reading back non-required data due to dest clip */

gdk/gdkglcontext.c

@@ -103,14 +103,6 @@
 
 #define DEFAULT_ALLOWED_APIS GDK_GL_API_GL | GDK_GL_API_GLES
 
-static const GdkDebugKey gdk_gl_feature_keys[] = {
-  { "debug", GDK_GL_FEATURE_DEBUG, "GL_KHR_debug" },
-  { "unpack-subimage", GDK_GL_FEATURE_UNPACK_SUBIMAGE, "GL_EXT_unpack_subimage" },
-  { "half-float", GDK_GL_FEATURE_VERTEX_HALF_FLOAT, "GL_OES_vertex_half_float" },
-  { "sync", GDK_GL_FEATURE_SYNC, "GL_ARB_sync" },
-  { "base-instance", GDK_GL_FEATURE_BASE_INSTANCE, "GL_ARB_base_instance" },
-};
-
 typedef struct _GdkGLContextPrivate GdkGLContextPrivate;
 
 struct _GdkGLContextPrivate
@@ -120,9 +112,13 @@ struct _GdkGLContextPrivate
 
   GdkGLMemoryFlags memory_flags[GDK_MEMORY_N_FORMATS];
 
-  GdkGLFeatures features;
+  guint has_khr_debug : 1;
   guint use_khr_debug : 1;
+  guint has_half_float : 1;
+  guint has_sync : 1;
+  guint has_unpack_subimage : 1;
   guint has_debug_output : 1;
+  guint has_bgra : 1;
   guint extensions_checked : 1;
   guint debug_enabled : 1;
   guint forward_compatible : 1;
@@ -294,7 +290,7 @@ gdk_gl_context_create_egl_context (GdkGLContext *context,
   GdkDisplay *display = gdk_gl_context_get_display (context);
   EGLDisplay egl_display = gdk_display_get_egl_display (display);
   GdkGLContext *share = gdk_display_get_gl_context (display);
-  GdkGLContextPrivate *share_priv = share ? gdk_gl_context_get_instance_private (share) : NULL;
+  GdkGLContextPrivate *share_priv = gdk_gl_context_get_instance_private (share);
   EGLConfig egl_config;
   EGLContext ctx;
   EGLint context_attribs[N_EGL_ATTRS], i = 0, flags = 0;
@@ -902,12 +898,11 @@ gdk_gl_context_label_object_printf  (GdkGLContext *context,
 
 
 gboolean
-gdk_gl_context_has_feature (GdkGLContext  *self,
-                            GdkGLFeatures  feature)
+gdk_gl_context_has_unpack_subimage (GdkGLContext *context)
 {
-  GdkGLContextPrivate *priv = gdk_gl_context_get_instance_private (self);
+  GdkGLContextPrivate *priv = gdk_gl_context_get_instance_private (context);
 
-  return (priv->features & feature) == feature;
+  return priv->has_unpack_subimage;
 }
 
 static gboolean
@@ -1669,48 +1664,10 @@ gdk_gl_version_init_epoxy (GdkGLVersion *version)
   *version = GDK_GL_VERSION_INIT (epoxy_version / 10, epoxy_version % 10);
 }
 
-static GdkGLFeatures
-gdk_gl_context_check_features (GdkGLContext *context)
-{
-  GdkGLContextPrivate *priv = gdk_gl_context_get_instance_private (context);
-  GdkGLFeatures features = 0;
-
-  if (gdk_gl_context_get_use_es (context))
-    {
-      if (gdk_gl_version_greater_equal (&priv->gl_version, &GDK_GL_VERSION_INIT (3, 0)) ||
-          epoxy_has_gl_extension ("GL_EXT_unpack_subimage"))
-        features |= GDK_GL_FEATURE_UNPACK_SUBIMAGE;
-    }
-  else
-    {
-      features |= GDK_GL_FEATURE_UNPACK_SUBIMAGE;
-    }
-
-  if (epoxy_has_gl_extension ("GL_KHR_debug"))
-    features |= GDK_GL_FEATURE_DEBUG;
-
-  if (gdk_gl_context_check_version (context, "3.0", "3.0") ||
-      epoxy_has_gl_extension ("GL_OES_vertex_half_float"))
-    features |= GDK_GL_FEATURE_VERTEX_HALF_FLOAT;
-
-  if (gdk_gl_context_check_version (context, "3.2", "3.0") ||
-      epoxy_has_gl_extension ("GL_ARB_sync") ||
-      epoxy_has_gl_extension ("GL_APPLE_sync"))
-    features |= GDK_GL_FEATURE_SYNC;
-
-  if (gdk_gl_context_check_version (context, "4.2", "9.9") ||
-      epoxy_has_gl_extension ("GL_EXT_base_instance") ||
-      epoxy_has_gl_extension ("GL_ARB_base_instance"))
-    features |= GDK_GL_FEATURE_BASE_INSTANCE;
-
-  return features;
-}
-
 static void
 gdk_gl_context_check_extensions (GdkGLContext *context)
 {
   GdkGLContextPrivate *priv = gdk_gl_context_get_instance_private (context);
-  GdkGLFeatures supported_features, disabled_features;
   gboolean gl_debug = FALSE;
   GdkDisplay *display;
 
@@ -1728,54 +1685,69 @@ gdk_gl_context_check_extensions (GdkGLContext *context)
 
   if (priv->has_debug_output && gl_debug)
     {
+      gdk_gl_context_make_current (context);
       glEnable (GL_DEBUG_OUTPUT);
       glEnable (GL_DEBUG_OUTPUT_SYNCHRONOUS);
       glDebugMessageCallback (gl_debug_message_callback, NULL);
     }
 
-  /* If we asked for a core profile, but didn't get one, we're in legacy mode */
-  if (!gdk_gl_context_get_use_es (context) &&
-      !gdk_gl_version_greater_equal (&priv->gl_version, &GDK_GL_VERSION_INIT (3, 2)))
-    priv->is_legacy = TRUE;
+  if (gdk_gl_context_get_use_es (context))
+    {
+      priv->has_unpack_subimage = gdk_gl_version_greater_equal (&priv->gl_version, &GDK_GL_VERSION_INIT (3, 0)) ||
+                                  epoxy_has_gl_extension ("GL_EXT_unpack_subimage");
+      priv->has_khr_debug = epoxy_has_gl_extension ("GL_KHR_debug");
+      priv->has_bgra = epoxy_has_gl_extension ("GL_EXT_texture_format_BGRA8888");
+    }
+  else
+    {
+      priv->has_unpack_subimage = TRUE;
+      priv->has_khr_debug = epoxy_has_gl_extension ("GL_KHR_debug");
+      priv->has_bgra = TRUE;
 
-  supported_features = gdk_gl_context_check_features (context);
-  disabled_features = gdk_parse_debug_var ("GDK_GL_DISABLE",
-                                           gdk_gl_feature_keys,
-                                           G_N_ELEMENTS (gdk_gl_feature_keys));
+      /* We asked for a core profile, but we didn't get one, so we're in legacy mode */
+      if (!gdk_gl_version_greater_equal (&priv->gl_version, &GDK_GL_VERSION_INIT (3, 2)))
+        priv->is_legacy = TRUE;
+    }
 
-  priv->features = supported_features & ~disabled_features;
-
-  gdk_gl_context_init_memory_flags (context);
-
-  if ((priv->features & GDK_GL_FEATURE_DEBUG) && gl_debug)
+  if (priv->has_khr_debug && gl_debug)
     {
       priv->use_khr_debug = TRUE;
       glGetIntegerv (GL_MAX_LABEL_LENGTH, &priv->max_debug_label_length);
     }
 
-  if (GDK_DISPLAY_DEBUG_CHECK (display, OPENGL))
-    {
-      int i, max_texture_size;
-      glGetIntegerv (GL_MAX_TEXTURE_SIZE, &max_texture_size);
-      gdk_debug_message ("%s version: %d.%d (%s)\n"
-                         "* GLSL version: %s\n"
-                         "* Max texture size: %d\n",
-                         gdk_gl_context_get_use_es (context) ? "OpenGL ES" : "OpenGL",
-                         gdk_gl_version_get_major (&priv->gl_version), gdk_gl_version_get_minor (&priv->gl_version),
-                         priv->is_legacy ? "legacy" : "core",
-                         glGetString (GL_SHADING_LANGUAGE_VERSION),
-                         max_texture_size);
-      gdk_debug_message ("Enabled features (use GDK_GL_DISABLE env var to disable):");
-      for (i = 0; i < G_N_ELEMENTS (gdk_gl_feature_keys); i++)
-        {
-          gdk_debug_message ("    %s: %s",
-                             gdk_gl_feature_keys[i].key,
-                             (priv->features & gdk_gl_feature_keys[i].value) ? "YES" :
-                             ((disabled_features & gdk_gl_feature_keys[i].value) ? "disabled via env var" :
-                             (((supported_features & gdk_gl_feature_keys[i].value) == 0) ? "not supported" :
-                             "Hum, what? This should not happen.")));
-        }
-    }
+  priv->has_half_float = gdk_gl_context_check_version (context, "3.0", "3.0") ||
+                         epoxy_has_gl_extension ("GL_OES_vertex_half_float");
+
+  priv->has_sync = gdk_gl_context_check_version (context, "3.2", "3.0") ||
+                   epoxy_has_gl_extension ("GL_ARB_sync") ||
+                   epoxy_has_gl_extension ("GL_APPLE_sync");
+
+  gdk_gl_context_init_memory_flags (context);
+
+  {
+    int max_texture_size;
+    glGetIntegerv (GL_MAX_TEXTURE_SIZE, &max_texture_size);
+    GDK_DISPLAY_DEBUG (gdk_draw_context_get_display (GDK_DRAW_CONTEXT (context)), OPENGL,
+                       "%s version: %d.%d (%s)\n"
+                       "* GLSL version: %s\n"
+                       "* Max texture size: %d\n"
+                       "* Extensions checked:\n"
+                       " - GL_KHR_debug: %s\n"
+                       " - GL_EXT_unpack_subimage: %s\n"
+                       " - half float: %s\n"
+                       " - sync: %s\n"
+                       " - bgra: %s",
+                       gdk_gl_context_get_use_es (context) ? "OpenGL ES" : "OpenGL",
+                       gdk_gl_version_get_major (&priv->gl_version), gdk_gl_version_get_minor (&priv->gl_version),
+                       priv->is_legacy ? "legacy" : "core",
+                       glGetString (GL_SHADING_LANGUAGE_VERSION),
+                       max_texture_size,
+                       priv->has_khr_debug ? "yes" : "no",
+                       priv->has_unpack_subimage ? "yes" : "no",
+                       priv->has_half_float ? "yes" : "no",
+                       priv->has_sync ? "yes" : "no",
+                       priv->has_bgra ? "yes" : "no");
+  }
 
   priv->extensions_checked = TRUE;
 }
@@ -2044,6 +2016,30 @@ gdk_gl_context_get_format_flags (GdkGLContext    *self,
   return priv->memory_flags[format];
 }
 
+gboolean
+gdk_gl_context_has_debug (GdkGLContext *self)
+{
+  GdkGLContextPrivate *priv = gdk_gl_context_get_instance_private (self);
+
+  return priv->debug_enabled || priv->use_khr_debug;
+}
+
+gboolean
+gdk_gl_context_has_vertex_half_float (GdkGLContext *self)
+{
+  GdkGLContextPrivate *priv = gdk_gl_context_get_instance_private (self);
+
+  return priv->has_half_float;
+}
+
+gboolean
+gdk_gl_context_has_sync (GdkGLContext *self)
+{
+  GdkGLContextPrivate *priv = gdk_gl_context_get_instance_private (self);
+
+  return priv->has_sync;
+}
+
 /* Return if glGenVertexArrays, glBindVertexArray and glDeleteVertexArrays
  * can be used
  */

gdk/gdkglcontextprivate.h

@@ -27,14 +27,6 @@
 
 G_BEGIN_DECLS
 
-typedef enum {
-  GDK_GL_FEATURE_DEBUG                      = 1 << 0,
-  GDK_GL_FEATURE_UNPACK_SUBIMAGE            = 1 << 1,
-  GDK_GL_FEATURE_VERTEX_HALF_FLOAT          = 1 << 2,
-  GDK_GL_FEATURE_SYNC                       = 1 << 3,
-  GDK_GL_FEATURE_BASE_INSTANCE              = 1 << 4,
-} GdkGLFeatures;
-
 typedef enum {
   GDK_GL_NONE = 0,
   GDK_GL_EGL,
@@ -150,6 +142,7 @@ void                    gdk_gl_context_get_matching_version     (GdkGLContext
                                                                  gboolean                legacy,
                                                                  GdkGLVersion           *out_version);
 
+gboolean                gdk_gl_context_has_unpack_subimage      (GdkGLContext    *context);
 void                    gdk_gl_context_push_debug_group         (GdkGLContext    *context,
                                                                  const char      *message);
 void                    gdk_gl_context_push_debug_group_printf  (GdkGLContext    *context,
@@ -170,11 +163,14 @@ const char *            gdk_gl_context_get_glsl_version_string  (GdkGLContext
 
 GdkGLMemoryFlags        gdk_gl_context_get_format_flags         (GdkGLContext    *self,
                                                                  GdkMemoryFormat  format) G_GNUC_PURE;
-gboolean                gdk_gl_context_has_feature              (GdkGLContext    *self,
-                                                                 GdkGLFeatures    feature) G_GNUC_PURE;
+gboolean                gdk_gl_context_has_debug                (GdkGLContext    *self) G_GNUC_PURE;
 
 gboolean                gdk_gl_context_use_es_bgra              (GdkGLContext    *context);
 
+gboolean                gdk_gl_context_has_vertex_half_float    (GdkGLContext    *self) G_GNUC_PURE;
+
+gboolean                gdk_gl_context_has_sync                 (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);

gdk/gdkgltexture.c

@@ -494,7 +494,7 @@ gdk_gl_texture_new_from_builder (GdkGLTextureBuilder *builder,
   self->id = gdk_gl_texture_builder_get_id (builder);
   GDK_TEXTURE (self)->format = gdk_gl_texture_builder_get_format (builder);
   self->has_mipmap = gdk_gl_texture_builder_get_has_mipmap (builder);
-  if (gdk_gl_context_has_feature (self->context, GDK_GL_FEATURE_SYNC))
+  if (gdk_gl_context_has_sync (self->context))
     self->sync = gdk_gl_texture_builder_get_sync (builder);
   self->destroy = destroy;
   self->data = data;

gdk/gdkvulkancontext.c

@@ -552,8 +552,9 @@ physical_device_supports_extension (VkPhysicalDevice  device,
   return FALSE;
 }
 
-static GdkVulkanFeatures
-physical_device_check_features (VkPhysicalDevice device)
+static gboolean
+physical_device_check_features (VkPhysicalDevice   device,
+                                GdkVulkanFeatures *out_features)
 {
   VkPhysicalDeviceVulkan12Features v12_features = {
       .sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_2_FEATURES,
@@ -562,16 +563,15 @@ physical_device_check_features (VkPhysicalDevice device)
       .sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SAMPLER_YCBCR_CONVERSION_FEATURES,
       .pNext = &v12_features
   };
-  VkPhysicalDeviceFeatures2 v10_features = {
+  VkPhysicalDeviceFeatures2 features = {
       .sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2,
       .pNext = &ycbcr_features
   };
   VkExternalSemaphoreProperties semaphore_props = {
       .sType = VK_STRUCTURE_TYPE_EXTERNAL_SEMAPHORE_PROPERTIES,
   };
-  GdkVulkanFeatures features;
 
-  vkGetPhysicalDeviceFeatures2 (device, &v10_features);
+  vkGetPhysicalDeviceFeatures2 (device, &features);
   vkGetPhysicalDeviceExternalSemaphoreProperties (device,
                                                   &(VkPhysicalDeviceExternalSemaphoreInfo) {
 		                                      .sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_SEMAPHORE_INFO,
@@ -579,46 +579,46 @@ physical_device_check_features (VkPhysicalDevice device)
 	                                          },
                                                   &semaphore_props);
 
-  features = 0;
+  *out_features = 0;
 
-  if (v10_features.features.shaderUniformBufferArrayDynamicIndexing &&
-      v10_features.features.shaderSampledImageArrayDynamicIndexing)
-    features |= GDK_VULKAN_FEATURE_DYNAMIC_INDEXING;
+  if (features.features.shaderUniformBufferArrayDynamicIndexing &&
+      features.features.shaderSampledImageArrayDynamicIndexing)
+    *out_features |= GDK_VULKAN_FEATURE_DYNAMIC_INDEXING;
 
   if (v12_features.descriptorIndexing &&
       v12_features.descriptorBindingPartiallyBound &&
       v12_features.descriptorBindingVariableDescriptorCount &&
       v12_features.descriptorBindingSampledImageUpdateAfterBind &&
       v12_features.descriptorBindingStorageBufferUpdateAfterBind)
-    features |= GDK_VULKAN_FEATURE_DESCRIPTOR_INDEXING;
+    *out_features |= GDK_VULKAN_FEATURE_DESCRIPTOR_INDEXING;
   else if (physical_device_supports_extension (device, VK_EXT_DESCRIPTOR_INDEXING_EXTENSION_NAME))
-    features |= GDK_VULKAN_FEATURE_DESCRIPTOR_INDEXING;
+    *out_features |= GDK_VULKAN_FEATURE_DESCRIPTOR_INDEXING;
 
   if (v12_features.shaderSampledImageArrayNonUniformIndexing &&
       v12_features.shaderStorageBufferArrayNonUniformIndexing)
-    features |= GDK_VULKAN_FEATURE_NONUNIFORM_INDEXING;
+    *out_features |= GDK_VULKAN_FEATURE_NONUNIFORM_INDEXING;
 
   if (ycbcr_features.samplerYcbcrConversion ||
       physical_device_supports_extension (device, VK_KHR_SAMPLER_YCBCR_CONVERSION_EXTENSION_NAME))
-    features |= GDK_VULKAN_FEATURE_YCBCR;
+    *out_features |= GDK_VULKAN_FEATURE_YCBCR;
 
   if (physical_device_supports_extension (device, VK_KHR_EXTERNAL_MEMORY_FD_EXTENSION_NAME) &&
       physical_device_supports_extension (device, VK_EXT_IMAGE_DRM_FORMAT_MODIFIER_EXTENSION_NAME))
-    features |= GDK_VULKAN_FEATURE_DMABUF;
+    *out_features |= GDK_VULKAN_FEATURE_DMABUF;
 
   if (physical_device_supports_extension (device, VK_KHR_EXTERNAL_SEMAPHORE_FD_EXTENSION_NAME))
     {
       if (semaphore_props.externalSemaphoreFeatures & VK_EXTERNAL_SEMAPHORE_FEATURE_EXPORTABLE_BIT)
-        features |= GDK_VULKAN_FEATURE_SEMAPHORE_EXPORT;
+        *out_features |= GDK_VULKAN_FEATURE_SEMAPHORE_EXPORT;
 
       if (semaphore_props.externalSemaphoreFeatures & VK_EXTERNAL_SEMAPHORE_FEATURE_IMPORTABLE_BIT)
-        features |= GDK_VULKAN_FEATURE_SEMAPHORE_IMPORT;
+        *out_features |= GDK_VULKAN_FEATURE_SEMAPHORE_IMPORT;
     }
 
   if (physical_device_supports_extension (device, VK_KHR_INCREMENTAL_PRESENT_EXTENSION_NAME))
-    features |= GDK_VULKAN_FEATURE_INCREMENTAL_PRESENT;
+    *out_features |= GDK_VULKAN_FEATURE_INCREMENTAL_PRESENT;
 
-  return features;
+  return TRUE;
 }
 
 static void
@@ -1366,7 +1366,7 @@ gdk_display_create_vulkan_device (GdkDisplay  *display,
   first = 0;
   last = n_devices;
 
-  skip_features = gdk_parse_debug_var ("GDK_VULKAN_DISABLE",
+  skip_features = gdk_parse_debug_var ("GDK_VULKAN_SKIP",
                                        gsk_vulkan_feature_keys,
                                        G_N_ELEMENTS (gsk_vulkan_feature_keys));
 
@@ -1454,7 +1454,8 @@ gdk_display_create_vulkan_device (GdkDisplay  *display,
       GdkVulkanFeatures features, device_features;
       uint32_t n_queue_props;
 
-      device_features = physical_device_check_features (devices[i]);
+      if (!physical_device_check_features (devices[i], &device_features))
+        continue;
 
       features = device_features & ~skip_features;
 
@@ -1539,7 +1540,7 @@ gdk_display_create_vulkan_device (GdkDisplay  *display,
               display->vk_queue_family_index = j;
               display->vulkan_features = features;
 
-              GDK_DISPLAY_DEBUG (display, VULKAN, "Enabled features (use GDK_VULKAN_DISABLE env var to disable):");
+              GDK_DISPLAY_DEBUG (display, VULKAN, "Enabled features (use GDK_VULKAN_SKIP env var to disable):");
               for (i = 0; i < G_N_ELEMENTS (gsk_vulkan_feature_keys); i++)
                 {
                   GDK_DISPLAY_DEBUG (display, VULKAN, "    %s: %s",

gdk/macos/GdkMacosWindow.c

@@ -715,16 +715,26 @@ typedef NSString *CALayerContentsGravity;
 
 -(void)setStyleMask:(NSWindowStyleMask)styleMask
 {
+  gboolean was_fullscreen;
+  gboolean is_fullscreen;
   gboolean was_opaque;
   gboolean is_opaque;
 
+  was_fullscreen = (([self styleMask] & NSWindowStyleMaskFullScreen) != 0);
   was_opaque = (([self styleMask] & NSWindowStyleMaskTitled) != 0);
 
   [super setStyleMask:styleMask];
 
+  is_fullscreen = (([self styleMask] & NSWindowStyleMaskFullScreen) != 0);
   is_opaque = (([self styleMask] & NSWindowStyleMaskTitled) != 0);
 
-  _gdk_macos_surface_update_fullscreen_state (gdk_surface);
+  if (was_fullscreen != is_fullscreen)
+    {
+      if (was_fullscreen)
+        [self setFrame:lastUnfullscreenFrame display:NO];
+
+      _gdk_macos_surface_update_fullscreen_state (gdk_surface);
+    }
 
   if (was_opaque != is_opaque)
     {
@@ -767,6 +777,7 @@ typedef NSString *CALayerContentsGravity;
 -(void)windowWillEnterFullScreen:(NSNotification *)aNotification
 {
   inFullscreenTransition = YES;
+  lastUnfullscreenFrame = [self frame];
 }
 
 -(void)windowDidEnterFullScreen:(NSNotification *)aNotification

gdk/macos/GdkMacosWindow.h

@@ -49,6 +49,7 @@
 
   EdgeSnapping     snapping;
 
+  NSRect           lastUnfullscreenFrame;
   BOOL             inFullscreenTransition;
 }
 

gdk/macos/gdkmacossurface.c

@@ -56,6 +56,14 @@ enum {
 
 static GParamSpec *properties [LAST_PROP];
 
+static gboolean
+window_is_fullscreen (GdkMacosSurface *self)
+{
+  g_assert (GDK_IS_MACOS_SURFACE (self));
+
+  return ([self->window styleMask] & NSWindowStyleMaskFullScreen) != 0;
+}
+
 void
 _gdk_macos_surface_request_frame (GdkMacosSurface *self)
 {
@@ -750,7 +758,7 @@ _gdk_macos_surface_update_fullscreen_state (GdkMacosSurface *self)
   g_return_if_fail (GDK_IS_MACOS_SURFACE (self));
 
   state = GDK_SURFACE (self)->state;
-  is_fullscreen = ([self->window styleMask] & NSWindowStyleMaskFullScreen) != 0;
+  is_fullscreen = window_is_fullscreen (self);
   was_fullscreen = (state & GDK_TOPLEVEL_STATE_FULLSCREEN) != 0;
 
   if (is_fullscreen != was_fullscreen)

gsk/gl/gskglcommandqueue.c

@@ -488,14 +488,12 @@ gsk_gl_command_queue_new (GdkGLContext      *context,
       int max_texture_size = atoi (g_getenv ("GSK_MAX_TEXTURE_SIZE"));
       if (max_texture_size == 0)
         {
-          g_warning ("Failed to parse %s", "GSK_MAX_TEXTURE_SIZE");
+          g_warning ("Failed to parse GSK_MAX_TEXTURE_SIZE");
         }
       else
         {
           max_texture_size = MAX (max_texture_size, 512);
-          GSK_DEBUG (RENDERER,
-                     "Limiting texture size in the GL renderer to %d (via %s)",
-                     max_texture_size, "GSK_MAX_TEXTURE_SIZE");
+          GSK_DEBUG(OPENGL, "Limiting max texture size to %d", max_texture_size);
           self->max_texture_size = MIN (self->max_texture_size, max_texture_size);
         }
     }
@@ -1624,7 +1622,7 @@ gsk_gl_command_queue_do_upload_texture_chunk (GskGLCommandQueue *self,
     {
       glTexSubImage2D (GL_TEXTURE_2D, 0, x, y, width, height, gl_format, gl_type, data);
     }
-  else if (stride % bpp == 0 && gdk_gl_context_has_feature (self->context, GDK_GL_FEATURE_UNPACK_SUBIMAGE))
+  else if (stride % bpp == 0 && gdk_gl_context_has_unpack_subimage (self->context))
     {
       glPixelStorei (GL_UNPACK_ROW_LENGTH, stride / bpp);
 

gsk/gl/gskgldriver.c

@@ -1835,7 +1835,7 @@ gsk_gl_driver_create_gdk_texture (GskGLDriver     *self,
   state = g_new0 (GskGLTextureState, 1);
   state->texture_id = texture_id;
   state->context = g_object_ref (self->command_queue->context);
-  if (gdk_gl_context_has_feature (self->command_queue->context, GDK_GL_FEATURE_SYNC))
+  if (gdk_gl_context_has_sync (self->command_queue->context))
     state->sync = glFenceSync (GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
 
   g_hash_table_steal (self->textures, GUINT_TO_POINTER (texture_id));

gsk/gl/gskglrenderer.c

@@ -194,7 +194,7 @@ gsk_gl_renderer_realize (GskRenderer  *renderer,
     {
       gdk_gl_context_make_current (context);
 
-      if (!gdk_gl_context_has_feature (context, GDK_GL_FEATURE_VERTEX_HALF_FLOAT))
+      if (!gdk_gl_context_has_vertex_half_float (context))
         {
           int major, minor;
 

gsk/gl/gskglrenderjob.c

@@ -1235,7 +1235,7 @@ gsk_gl_render_job_visit_as_fallback (GskGLRenderJob      *job,
   texture = gdk_texture_new_for_surface (surface);
   texture_id = gsk_gl_driver_load_texture (job->driver, texture, FALSE);
 
-  if (gdk_gl_context_has_feature (job->command_queue->context, GDK_GL_FEATURE_DEBUG))
+  if (gdk_gl_context_has_debug (job->command_queue->context))
     gdk_gl_context_label_object_printf (job->command_queue->context, GL_TEXTURE, texture_id,
                                         "Fallback %s %d",
                                         g_type_name_from_instance ((GTypeInstance *) node),
@@ -2532,7 +2532,7 @@ gsk_gl_render_job_visit_blurred_outset_shadow_node (GskGLRenderJob      *job,
                                           get_target_format (job, node),
                                           &render_target);
 
-      if (gdk_gl_context_has_feature (context, GDK_GL_FEATURE_DEBUG))
+      if (gdk_gl_context_has_debug (context))
         {
           gdk_gl_context_label_object_printf (context,
                                               GL_TEXTURE,
@@ -4382,7 +4382,7 @@ gsk_gl_render_job_visit_node_with_offscreen (GskGLRenderJob       *job,
                                            &render_target))
     g_assert_not_reached ();
 
-  if (gdk_gl_context_has_feature (job->command_queue->context, GDK_GL_FEATURE_DEBUG))
+  if (gdk_gl_context_has_debug (job->command_queue->context))
     {
       gdk_gl_context_label_object_printf (job->command_queue->context,
                                           GL_TEXTURE,

gsk/gpu/gskglframe.c

@@ -20,7 +20,6 @@ struct _GskGLFrame
 
   GLuint globals_buffer_id;
   guint next_texture_slot;
-  GLsync sync;
 
   GHashTable *vaos;
 };
@@ -35,23 +34,7 @@ G_DEFINE_TYPE (GskGLFrame, gsk_gl_frame, GSK_TYPE_GPU_FRAME)
 static gboolean
 gsk_gl_frame_is_busy (GskGpuFrame *frame)
 {
-  GskGLFrame *self = GSK_GL_FRAME (frame);
-
-  if (!self->sync)
-    return FALSE;
-
-  return glClientWaitSync (self->sync, 0, 0) == GL_TIMEOUT_EXPIRED;
-}
-
-static void
-gsk_gl_frame_wait (GskGpuFrame *frame)
-{
-  GskGLFrame *self = GSK_GL_FRAME (frame);
-
-  if (!self->sync)
-    return;
-
-  glClientWaitSync (self->sync, 0, G_MAXINT64);
+  return FALSE;
 }
 
 static void
@@ -67,12 +50,6 @@ gsk_gl_frame_cleanup (GskGpuFrame *frame)
 {
   GskGLFrame *self = GSK_GL_FRAME (frame);
 
-  if (self->sync)
-    {
-      glClientWaitSync (self->sync, 0, -1);
-      g_clear_pointer (&self->sync, glDeleteSync);
-    }
-
   self->next_texture_slot = 0;
 
   GSK_GPU_FRAME_CLASS (gsk_gl_frame_parent_class)->cleanup (frame);
@@ -183,10 +160,6 @@ gsk_gl_frame_submit (GskGpuFrame  *frame,
     {
       op = gsk_gpu_op_gl_command (op, frame, &state);
     }
-
-  if (gdk_gl_context_has_feature (GDK_GL_CONTEXT (gsk_gpu_frame_get_context (frame)),
-                                  GDK_GL_FEATURE_SYNC))
-    self->sync = glFenceSync (GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
 }
 
 static void
@@ -207,7 +180,6 @@ gsk_gl_frame_class_init (GskGLFrameClass *klass)
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
   gpu_frame_class->is_busy = gsk_gl_frame_is_busy;
-  gpu_frame_class->wait = gsk_gl_frame_wait;
   gpu_frame_class->setup = gsk_gl_frame_setup;
   gpu_frame_class->cleanup = gsk_gl_frame_cleanup;
   gpu_frame_class->upload_texture = gsk_gl_frame_upload_texture;

gsk/gpu/gskgpublendmodeop.c

@@ -17,16 +17,23 @@ struct _GskGpuBlendModeOp
 };
 
 static void
-gsk_gpu_blend_mode_op_print_instance (GskGpuShaderOp *shader,
-                                      gpointer        instance_,
-                                      GString        *string)
+gsk_gpu_blend_mode_op_print (GskGpuOp    *op,
+                             GskGpuFrame *frame,
+                             GString     *string,
+                             guint        indent)
 {
-  GskGpuBlendmodeInstance *instance = (GskGpuBlendmodeInstance *) instance_;
+  GskGpuShaderOp *shader = (GskGpuShaderOp *) op;
+  GskGpuBlendmodeInstance *instance;
 
+  instance = (GskGpuBlendmodeInstance *) gsk_gpu_frame_get_vertex_data (frame, shader->vertex_offset);
+
+  gsk_gpu_print_op (string, indent, "blend-mode");
+  gsk_gpu_print_shader_info (string, shader->clip);
   gsk_gpu_print_rect (string, instance->rect);
   gsk_gpu_print_image_descriptor (string, shader->desc, instance->bottom_id);
   gsk_gpu_print_enum (string, GSK_TYPE_BLEND_MODE, shader->variation);
   gsk_gpu_print_image_descriptor (string, shader->desc, instance->top_id);
+  gsk_gpu_print_newline (string);
 }
 
 static const GskGpuShaderOpClass GSK_GPU_BLEND_MODE_OP_CLASS = {
@@ -34,7 +41,7 @@ static const GskGpuShaderOpClass GSK_GPU_BLEND_MODE_OP_CLASS = {
     GSK_GPU_OP_SIZE (GskGpuBlendModeOp),
     GSK_GPU_STAGE_SHADER,
     gsk_gpu_shader_op_finish,
-    gsk_gpu_shader_op_print,
+    gsk_gpu_blend_mode_op_print,
 #ifdef GDK_RENDERING_VULKAN
     gsk_gpu_shader_op_vk_command,
 #endif
@@ -45,7 +52,6 @@ static const GskGpuShaderOpClass GSK_GPU_BLEND_MODE_OP_CLASS = {
 #ifdef GDK_RENDERING_VULKAN
   &gsk_gpu_blendmode_info,
 #endif
-  gsk_gpu_blend_mode_op_print_instance,
   gsk_gpu_blendmode_setup_attrib_locations,
   gsk_gpu_blendmode_setup_vao
 };

gsk/gpu/gskgpublurop.c

@@ -20,15 +20,22 @@ struct _GskGpuBlurOp
 };
 
 static void
-gsk_gpu_blur_op_print_instance (GskGpuShaderOp *shader,
-                                gpointer        instance_,
-                                GString        *string)
+gsk_gpu_blur_op_print (GskGpuOp    *op,
+                       GskGpuFrame *frame,
+                       GString     *string,
+                       guint        indent)
 {
-  GskGpuBlurInstance *instance = (GskGpuBlurInstance *) instance_;
+  GskGpuShaderOp *shader = (GskGpuShaderOp *) op;
+  GskGpuBlurInstance *instance;
 
+  instance = (GskGpuBlurInstance *) gsk_gpu_frame_get_vertex_data (frame, shader->vertex_offset);
+
+  gsk_gpu_print_op (string, indent, "blur");
+  gsk_gpu_print_shader_info (string, shader->clip);
   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);
 }
 
 static const GskGpuShaderOpClass GSK_GPU_BLUR_OP_CLASS = {
@@ -36,7 +43,7 @@ static const GskGpuShaderOpClass GSK_GPU_BLUR_OP_CLASS = {
     GSK_GPU_OP_SIZE (GskGpuBlurOp),
     GSK_GPU_STAGE_SHADER,
     gsk_gpu_shader_op_finish,
-    gsk_gpu_shader_op_print,
+    gsk_gpu_blur_op_print,
 #ifdef GDK_RENDERING_VULKAN
     gsk_gpu_shader_op_vk_command,
 #endif
@@ -47,7 +54,6 @@ static const GskGpuShaderOpClass GSK_GPU_BLUR_OP_CLASS = {
 #ifdef GDK_RENDERING_VULKAN
   &gsk_gpu_blur_info,
 #endif
-  gsk_gpu_blur_op_print_instance,
   gsk_gpu_blur_setup_attrib_locations,
   gsk_gpu_blur_setup_vao
 };

gsk/gpu/gskgpuborderop.c

@@ -25,12 +25,18 @@ color_equal (const float *color1,
 }
 
 static void
-gsk_gpu_border_op_print_instance (GskGpuShaderOp *shader,
-                                  gpointer        instance_,
-                                  GString        *string)
+gsk_gpu_border_op_print (GskGpuOp    *op,
+                         GskGpuFrame *frame,
+                         GString     *string,
+                         guint        indent)
 {
-  GskGpuBorderInstance *instance = (GskGpuBorderInstance *) instance_;
+  GskGpuShaderOp *shader = (GskGpuShaderOp *) op;
+  GskGpuBorderInstance *instance;
 
+  instance = (GskGpuBorderInstance *) gsk_gpu_frame_get_vertex_data (frame, shader->vertex_offset);
+
+  gsk_gpu_print_op (string, indent, "border");
+  gsk_gpu_print_shader_info (string, shader->clip);
   gsk_gpu_print_rounded_rect (string, instance->outline);
 
   gsk_gpu_print_rgba (string, (const float *) &instance->border_colors[0]);
@@ -52,6 +58,8 @@ gsk_gpu_border_op_print_instance (GskGpuShaderOp *shader,
                               instance->border_widths[2],
                               instance->border_widths[3]);
     }
+
+  gsk_gpu_print_newline (string);
 }
 
 #ifdef GDK_RENDERING_VULKAN
@@ -77,7 +85,7 @@ static const GskGpuShaderOpClass GSK_GPU_BORDER_OP_CLASS = {
     GSK_GPU_OP_SIZE (GskGpuBorderOp),
     GSK_GPU_STAGE_SHADER,
     gsk_gpu_shader_op_finish,
-    gsk_gpu_shader_op_print,
+    gsk_gpu_border_op_print,
 #ifdef GDK_RENDERING_VULKAN
     gsk_gpu_border_op_vk_command,
 #endif
@@ -88,7 +96,6 @@ static const GskGpuShaderOpClass GSK_GPU_BORDER_OP_CLASS = {
 #ifdef GDK_RENDERING_VULKAN
   &gsk_gpu_border_info,
 #endif
-  gsk_gpu_border_op_print_instance,
   gsk_gpu_border_setup_attrib_locations,
   gsk_gpu_border_setup_vao
 };

gsk/gpu/gskgpuboxshadowop.c

@@ -20,17 +20,24 @@ struct _GskGpuBoxShadowOp
 };
 
 static void
-gsk_gpu_box_shadow_op_print_instance (GskGpuShaderOp *shader,
-                                      gpointer        instance_,
-                                      GString        *string)
+gsk_gpu_box_shadow_op_print (GskGpuOp    *op,
+                             GskGpuFrame *frame,
+                             GString     *string,
+                             guint        indent)
 {
-  GskGpuBoxshadowInstance *instance = (GskGpuBoxshadowInstance *) instance_;
+  GskGpuShaderOp *shader = (GskGpuShaderOp *) op;
+  GskGpuBoxshadowInstance *instance;
 
+  instance = (GskGpuBoxshadowInstance *) gsk_gpu_frame_get_vertex_data (frame, shader->vertex_offset);
+
+  gsk_gpu_print_op (string, indent, shader->variation & VARIATION_INSET ? "inset-shadow" : "outset-shadow");
+  gsk_gpu_print_shader_info (string, shader->clip);
   gsk_gpu_print_rounded_rect (string, instance->outline);
   gsk_gpu_print_rgba (string, instance->color);
   g_string_append_printf (string, "%g %g %g %g ",
                           instance->shadow_offset[0], instance->shadow_offset[1],
                           instance->blur_radius, instance->shadow_spread);
+  gsk_gpu_print_newline (string);
 }
 
 #ifdef GDK_RENDERING_VULKAN
@@ -56,7 +63,7 @@ static const GskGpuShaderOpClass GSK_GPU_BOX_SHADOW_OP_CLASS = {
     GSK_GPU_OP_SIZE (GskGpuBoxShadowOp),
     GSK_GPU_STAGE_SHADER,
     gsk_gpu_shader_op_finish,
-    gsk_gpu_shader_op_print,
+    gsk_gpu_box_shadow_op_print,
 #ifdef GDK_RENDERING_VULKAN
     gsk_gpu_box_shadow_op_vk_command,
 #endif
@@ -67,7 +74,6 @@ static const GskGpuShaderOpClass GSK_GPU_BOX_SHADOW_OP_CLASS = {
 #ifdef GDK_RENDERING_VULKAN
   &gsk_gpu_boxshadow_info,
 #endif
-  gsk_gpu_box_shadow_op_print_instance,
   gsk_gpu_boxshadow_setup_attrib_locations,
   gsk_gpu_boxshadow_setup_vao
 };

gsk/gpu/gskgpucolorizeop.c

@@ -16,15 +16,22 @@ struct _GskGpuColorizeOp
 };
 
 static void
-gsk_gpu_colorize_op_print_instance (GskGpuShaderOp *shader,
-                                    gpointer        instance_,
-                                    GString        *string)
+gsk_gpu_colorize_op_print (GskGpuOp    *op,
+                           GskGpuFrame *frame,
+                           GString     *string,
+                           guint        indent)
 {
-  GskGpuColorizeInstance *instance = (GskGpuColorizeInstance *) instance_;
+  GskGpuShaderOp *shader = (GskGpuShaderOp *) op;
+  GskGpuColorizeInstance *instance;
 
+  instance = (GskGpuColorizeInstance *) gsk_gpu_frame_get_vertex_data (frame, shader->vertex_offset);
+
+  gsk_gpu_print_op (string, indent, "colorize");
+  gsk_gpu_print_shader_info (string, shader->clip);
   gsk_gpu_print_rect (string, instance->rect);
   gsk_gpu_print_image_descriptor (string, shader->desc, instance->tex_id);
   gsk_gpu_print_rgba (string, instance->color);
+  gsk_gpu_print_newline (string);
 }
 
 static const GskGpuShaderOpClass GSK_GPU_COLORIZE_OP_CLASS = {
@@ -32,7 +39,7 @@ static const GskGpuShaderOpClass GSK_GPU_COLORIZE_OP_CLASS = {
     GSK_GPU_OP_SIZE (GskGpuColorizeOp),
     GSK_GPU_STAGE_SHADER,
     gsk_gpu_shader_op_finish,
-    gsk_gpu_shader_op_print,
+    gsk_gpu_colorize_op_print,
 #ifdef GDK_RENDERING_VULKAN
     gsk_gpu_shader_op_vk_command,
 #endif
@@ -43,7 +50,6 @@ static const GskGpuShaderOpClass GSK_GPU_COLORIZE_OP_CLASS = {
 #ifdef GDK_RENDERING_VULKAN
   &gsk_gpu_colorize_info,
 #endif
-  gsk_gpu_colorize_op_print_instance,
   gsk_gpu_colorize_setup_attrib_locations,
   gsk_gpu_colorize_setup_vao
 };

gsk/gpu/gskgpucolormatrixop.c

@@ -16,14 +16,21 @@ struct _GskGpuColorMatrixOp
 };
 
 static void
-gsk_gpu_color_matrix_op_print_instance (GskGpuShaderOp *shader,
-                                        gpointer        instance_,
-                                        GString        *string)
+gsk_gpu_color_matrix_op_print (GskGpuOp    *op,
+                               GskGpuFrame *frame,
+                               GString     *string,
+                               guint        indent)
 {
-  GskGpuColormatrixInstance *instance = (GskGpuColormatrixInstance *) instance_;
+  GskGpuShaderOp *shader = (GskGpuShaderOp *) op;
+  GskGpuColormatrixInstance *instance;
 
+  instance = (GskGpuColormatrixInstance *) gsk_gpu_frame_get_vertex_data (frame, shader->vertex_offset);
+
+  gsk_gpu_print_op (string, indent, "color-matrix");
+  gsk_gpu_print_shader_info (string, shader->clip);
   gsk_gpu_print_rect (string, instance->rect);
   gsk_gpu_print_image_descriptor (string, shader->desc, instance->tex_id);
+  gsk_gpu_print_newline (string);
 }
 
 static const GskGpuShaderOpClass GSK_GPU_COLOR_MATRIX_OP_CLASS = {
@@ -31,7 +38,7 @@ static const GskGpuShaderOpClass GSK_GPU_COLOR_MATRIX_OP_CLASS = {
     GSK_GPU_OP_SIZE (GskGpuColorMatrixOp),
     GSK_GPU_STAGE_SHADER,
     gsk_gpu_shader_op_finish,
-    gsk_gpu_shader_op_print,
+    gsk_gpu_color_matrix_op_print,
 #ifdef GDK_RENDERING_VULKAN
     gsk_gpu_shader_op_vk_command,
 #endif
@@ -42,7 +49,6 @@ static const GskGpuShaderOpClass GSK_GPU_COLOR_MATRIX_OP_CLASS = {
 #ifdef GDK_RENDERING_VULKAN
   &gsk_gpu_colormatrix_info,
 #endif
-  gsk_gpu_color_matrix_op_print_instance,
   gsk_gpu_colormatrix_setup_attrib_locations,
   gsk_gpu_colormatrix_setup_vao
 };

gsk/gpu/gskgpucolorop.c

@@ -17,14 +17,21 @@ struct _GskGpuColorOp
 };
 
 static void
-gsk_gpu_color_op_print_instance (GskGpuShaderOp *shader,
-                                 gpointer        instance_,
-                                 GString        *string)
+gsk_gpu_color_op_print (GskGpuOp    *op,
+                        GskGpuFrame *frame,
+                        GString     *string,
+                        guint        indent)
 {
-  GskGpuColorInstance *instance = (GskGpuColorInstance *) instance_;
+  GskGpuShaderOp *shader = (GskGpuShaderOp *) op;
+  GskGpuColorInstance *instance;
 
+  instance = (GskGpuColorInstance *) gsk_gpu_frame_get_vertex_data (frame, shader->vertex_offset);
+
+  gsk_gpu_print_op (string, indent, "color");
+  gsk_gpu_print_shader_info (string, shader->clip);
   gsk_gpu_print_rect (string, instance->rect);
   gsk_gpu_print_rgba (string, instance->color);
+  gsk_gpu_print_newline (string);
 }
 
 static const GskGpuShaderOpClass GSK_GPU_COLOR_OP_CLASS = {
@@ -32,7 +39,7 @@ static const GskGpuShaderOpClass GSK_GPU_COLOR_OP_CLASS = {
     GSK_GPU_OP_SIZE (GskGpuColorOp),
     GSK_GPU_STAGE_SHADER,
     gsk_gpu_shader_op_finish,
-    gsk_gpu_shader_op_print,
+    gsk_gpu_color_op_print,
 #ifdef GDK_RENDERING_VULKAN
     gsk_gpu_shader_op_vk_command,
 #endif
@@ -43,7 +50,6 @@ static const GskGpuShaderOpClass GSK_GPU_COLOR_OP_CLASS = {
 #ifdef GDK_RENDERING_VULKAN
   &gsk_gpu_color_info,
 #endif
-  gsk_gpu_color_op_print_instance,
   gsk_gpu_color_setup_attrib_locations,
   gsk_gpu_color_setup_vao
 };

gsk/gpu/gskgpuconicgradientop.c

@@ -18,13 +18,20 @@ struct _GskGpuConicGradientOp
 };
 
 static void
-gsk_gpu_conic_gradient_op_print_instance (GskGpuShaderOp *shader,
-                                          gpointer        instance_,
-                                          GString        *string)
+gsk_gpu_conic_gradient_op_print (GskGpuOp    *op,
+                                 GskGpuFrame *frame,
+                                 GString     *string,
+                                 guint        indent)
 {
-  GskGpuConicgradientInstance *instance = (GskGpuConicgradientInstance *) instance_;
+  GskGpuShaderOp *shader = (GskGpuShaderOp *) op;
+  GskGpuConicgradientInstance *instance;
 
+  instance = (GskGpuConicgradientInstance *) gsk_gpu_frame_get_vertex_data (frame, shader->vertex_offset);
+
+  gsk_gpu_print_op (string, indent, "conic-gradient");
+  gsk_gpu_print_shader_info (string, shader->clip);
   gsk_gpu_print_rect (string, instance->rect);
+  gsk_gpu_print_newline (string);
 }
 
 static const GskGpuShaderOpClass GSK_GPU_CONIC_GRADIENT_OP_CLASS = {
@@ -32,7 +39,7 @@ static const GskGpuShaderOpClass GSK_GPU_CONIC_GRADIENT_OP_CLASS = {
     GSK_GPU_OP_SIZE (GskGpuConicGradientOp),
     GSK_GPU_STAGE_SHADER,
     gsk_gpu_shader_op_finish,
-    gsk_gpu_shader_op_print,
+    gsk_gpu_conic_gradient_op_print,
 #ifdef GDK_RENDERING_VULKAN
     gsk_gpu_shader_op_vk_command,
 #endif
@@ -43,7 +50,6 @@ static const GskGpuShaderOpClass GSK_GPU_CONIC_GRADIENT_OP_CLASS = {
 #ifdef GDK_RENDERING_VULKAN
   &gsk_gpu_conicgradient_info,
 #endif
-  gsk_gpu_conic_gradient_op_print_instance,
   gsk_gpu_conicgradient_setup_attrib_locations,
   gsk_gpu_conicgradient_setup_vao
 };

gsk/gpu/gskgpucrossfadeop.c

@@ -16,16 +16,23 @@ struct _GskGpuCrossFadeOp
 };
 
 static void
-gsk_gpu_cross_fade_op_print_instance (GskGpuShaderOp *shader,
-                                      gpointer        instance_,
-                                      GString        *string)
+gsk_gpu_cross_fade_op_print (GskGpuOp    *op,
+                             GskGpuFrame *frame,
+                             GString     *string,
+                             guint        indent)
 {
-  GskGpuCrossfadeInstance *instance = (GskGpuCrossfadeInstance *) instance_;
+  GskGpuShaderOp *shader = (GskGpuShaderOp *) op;
+  GskGpuCrossfadeInstance *instance;
 
+  instance = (GskGpuCrossfadeInstance *) gsk_gpu_frame_get_vertex_data (frame, shader->vertex_offset);
+
+  gsk_gpu_print_op (string, indent, "cross-fade");
+  gsk_gpu_print_shader_info (string, shader->clip);
   gsk_gpu_print_rect (string, instance->rect);
   gsk_gpu_print_image_descriptor (string, shader->desc, instance->start_id);
   gsk_gpu_print_image_descriptor (string, shader->desc, instance->end_id);
   g_string_append_printf (string, "%g%%", 100 * instance->opacity_progress[1]);
+  gsk_gpu_print_newline (string);
 }
 
 static const GskGpuShaderOpClass GSK_GPU_CROSS_FADE_OP_CLASS = {
@@ -33,7 +40,7 @@ static const GskGpuShaderOpClass GSK_GPU_CROSS_FADE_OP_CLASS = {
     GSK_GPU_OP_SIZE (GskGpuCrossFadeOp),
     GSK_GPU_STAGE_SHADER,
     gsk_gpu_shader_op_finish,
-    gsk_gpu_shader_op_print,
+    gsk_gpu_cross_fade_op_print,
 #ifdef GDK_RENDERING_VULKAN
     gsk_gpu_shader_op_vk_command,
 #endif
@@ -44,7 +51,6 @@ static const GskGpuShaderOpClass GSK_GPU_CROSS_FADE_OP_CLASS = {
 #ifdef GDK_RENDERING_VULKAN
   &gsk_gpu_crossfade_info,
 #endif
-  gsk_gpu_cross_fade_op_print_instance,
   gsk_gpu_crossfade_setup_attrib_locations,
   gsk_gpu_crossfade_setup_vao
 };

gsk/gpu/gskgpudownloadop.c

@@ -272,7 +272,7 @@ gsk_gpu_download_op_gl_command (GskGpuOp          *op,
   data->context = g_object_ref (context);
   data->texture_id = gsk_gl_image_steal_texture (GSK_GL_IMAGE (self->image));
 
-  if (gdk_gl_context_has_feature (context, GDK_GL_FEATURE_SYNC))
+  if (gdk_gl_context_has_sync (context))
     data->sync = glFenceSync (GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
 
   builder = gdk_gl_texture_builder_new ();

gsk/gpu/gskgpuframe.c

@@ -40,7 +40,6 @@ struct _GskGpuFramePrivate
 
   GskGpuOps ops;
   GskGpuOp *first_op;
-  GskGpuOp *last_op;
 
   GskGpuBuffer *vertex_buffer;
   guchar *vertex_buffer_data;
@@ -71,8 +70,6 @@ gsk_gpu_frame_default_cleanup (GskGpuFrame *self)
       gsk_gpu_op_finish (op);
     }
   gsk_gpu_ops_set_size (&priv->ops, 0);
-
-  priv->last_op = NULL;
 }
 
 static void
@@ -251,35 +248,27 @@ gsk_gpu_frame_sort_render_pass (GskGpuFrame *self,
                                 SortData    *sort_data)
 {
   SortData subpasses = { { NULL, NULL }, { NULL, NULL } };
-  SortData pass = { { NULL, NULL }, { NULL, NULL } };
-
-  if (op->op_class->stage == GSK_GPU_STAGE_BEGIN_PASS)
-    {
-      pass.command.first = op;
-      pass.command.last = op;
-      op = op->next;
-    }
 
   while (op)
     {
       switch (op->op_class->stage)
       {
         case GSK_GPU_STAGE_UPLOAD:
-          if (pass.upload.first == NULL)
-            pass.upload.first = op;
+          if (sort_data->upload.first == NULL)
+            sort_data->upload.first = op;
           else
-            pass.upload.last->next = op;
-          pass.upload.last = op;
+            sort_data->upload.last->next = op;
+          sort_data->upload.last = op;
           op = op->next;
           break;
 
         case GSK_GPU_STAGE_COMMAND:
         case GSK_GPU_STAGE_SHADER:
-          if (pass.command.first == NULL)
-            pass.command.first = op;
+          if (sort_data->command.first == NULL)
+            sort_data->command.first = op;
           else
-            pass.command.last->next = op;
-          pass.command.last = op;
+            sort_data->command.last->next = op;
+          sort_data->command.last = op;
           op = op->next;
           break;
 
@@ -293,13 +282,19 @@ gsk_gpu_frame_sort_render_pass (GskGpuFrame *self,
           break;
 
         case GSK_GPU_STAGE_BEGIN_PASS:
+          if (subpasses.command.first == NULL)
+            subpasses.command.first = op;
+          else
+            subpasses.command.last->next = op;
+          subpasses.command.last = op;
+
           /* append subpass to existing subpasses */
-          op = gsk_gpu_frame_sort_render_pass (self, op, &subpasses);
+          op = gsk_gpu_frame_sort_render_pass (self, op->next, &subpasses);
           break;
 
         case GSK_GPU_STAGE_END_PASS:
-          pass.command.last->next = op;
-          pass.command.last = op;
+          sort_data->command.last->next = op;
+          sort_data->command.last = op;
           op = op->next;
           goto out;
 
@@ -310,38 +305,22 @@ gsk_gpu_frame_sort_render_pass (GskGpuFrame *self,
     }
 
 out:
-  /* append to the sort data, first the subpasses, then the current pass */
+  /* prepend subpasses to the current pass */
   if (subpasses.upload.first)
     {
       if (sort_data->upload.first != NULL)
-        sort_data->upload.last->next = subpasses.upload.first;
+        subpasses.upload.last->next = sort_data->upload.first;
       else
-        sort_data->upload.first = subpasses.upload.first;
-      sort_data->upload.last = subpasses.upload.last;
-    }
-  if (pass.upload.first)
-    {
-      if (sort_data->upload.first != NULL)
-        sort_data->upload.last->next = pass.upload.first;
-      else
-        sort_data->upload.first = pass.upload.first;
-      sort_data->upload.last = pass.upload.last;
+        sort_data->upload.last = subpasses.upload.last;
+      sort_data->upload.first = subpasses.upload.first;
     }
   if (subpasses.command.first)
     {
       if (sort_data->command.first != NULL)
-        sort_data->command.last->next = subpasses.command.first;
+        subpasses.command.last->next = sort_data->command.first;
       else
-        sort_data->command.first = subpasses.command.first;
-      sort_data->command.last = subpasses.command.last;
-    }
-  if (pass.command.first)
-    {
-      if (sort_data->command.first != NULL)
-        sort_data->command.last->next = pass.command.first;
-      else
-        sort_data->command.first = pass.command.first;
-      sort_data->command.last = pass.command.last;
+        sort_data->command.last = subpasses.command.last;
+      sort_data->command.first = subpasses.command.first;
     }
 
   return op;
@@ -352,13 +331,8 @@ gsk_gpu_frame_sort_ops (GskGpuFrame *self)
 {
   GskGpuFramePrivate *priv = gsk_gpu_frame_get_instance_private (self);
   SortData sort_data = { { NULL, }, };
-  GskGpuOp *op;
-
-  op = priv->first_op;
-  while (op)
-    {
-      op = gsk_gpu_frame_sort_render_pass (self, op, &sort_data);
-    }
+  
+  gsk_gpu_frame_sort_render_pass (self, priv->first_op, &sort_data);
 
   if (sort_data.upload.first)
     {
@@ -369,8 +343,6 @@ gsk_gpu_frame_sort_ops (GskGpuFrame *self)
     priv->first_op = sort_data.command.first;
   if (sort_data.command.last)
     sort_data.command.last->next = NULL;
-
-  priv->last_op = NULL;
 }
 
 gpointer
@@ -388,17 +360,7 @@ gsk_gpu_frame_alloc_op (GskGpuFrame *self,
                       NULL,
                       size);
 
-  priv->last_op = (GskGpuOp *) gsk_gpu_ops_index (&priv->ops, pos);
-
-  return priv->last_op;
-}
-
-GskGpuOp *
-gsk_gpu_frame_get_last_op (GskGpuFrame *self)
-{
-  GskGpuFramePrivate *priv = gsk_gpu_frame_get_instance_private (self);
-
-  return priv->last_op;
+  return gsk_gpu_ops_index (&priv->ops, pos);
 }
 
 GskGpuImage *
@@ -543,12 +505,6 @@ gsk_gpu_frame_is_busy (GskGpuFrame *self)
   return GSK_GPU_FRAME_GET_CLASS (self)->is_busy (self);
 }
 
-void
-gsk_gpu_frame_wait (GskGpuFrame *self)
-{
-  GSK_GPU_FRAME_GET_CLASS (self)->wait (self);
-}
-
 static void
 copy_texture (gpointer    user_data,
               GdkTexture *texture)

gsk/gpu/gskgpuframeprivate.h

@@ -24,7 +24,6 @@ struct _GskGpuFrameClass
   GObjectClass parent_class;
 
   gboolean              (* is_busy)                                     (GskGpuFrame            *self);
-  void                  (* wait)                                        (GskGpuFrame            *self);
   void                  (* setup)                                       (GskGpuFrame            *self);
   void                  (* cleanup)                                     (GskGpuFrame            *self);
   GskGpuImage *         (* upload_texture)                              (GskGpuFrame            *self,
@@ -70,7 +69,6 @@ GskGpuBuffer *          gsk_gpu_frame_write_storage_buffer              (GskGpuF
                                                                          gsize                  *out_offset);
 
 gboolean                gsk_gpu_frame_is_busy                           (GskGpuFrame            *self);
-void                    gsk_gpu_frame_wait                              (GskGpuFrame            *self);
 
 void                    gsk_gpu_frame_render                            (GskGpuFrame            *self,
                                                                          gint64                  timestamp,
@@ -85,7 +83,6 @@ void                    gsk_gpu_frame_download_texture                  (GskGpuF
                                                                          GdkMemoryFormat         format,
                                                                          guchar                 *data,
                                                                          gsize                   stride);
-GskGpuOp               *gsk_gpu_frame_get_last_op                       (GskGpuFrame            *self);
 
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GskGpuFrame, g_object_unref)
 

gsk/gpu/gskgpulineargradientop.c

@@ -19,15 +19,23 @@ struct _GskGpuLinearGradientOp
 };
 
 static void
-gsk_gpu_linear_gradient_op_print_instance (GskGpuShaderOp *shader,
-                                           gpointer        instance_,
-                                           GString        *string)
+gsk_gpu_linear_gradient_op_print (GskGpuOp    *op,
+                                  GskGpuFrame *frame,
+                                  GString     *string,
+                                  guint        indent)
 {
-  GskGpuLineargradientInstance *instance = (GskGpuLineargradientInstance *) instance_;
+  GskGpuShaderOp *shader = (GskGpuShaderOp *) op;
+  GskGpuLineargradientInstance *instance;
+
+  instance = (GskGpuLineargradientInstance *) gsk_gpu_frame_get_vertex_data (frame, shader->vertex_offset);
 
   if (shader->variation & VARIATION_REPEATING)
-    gsk_gpu_print_string (string, "repeating");
+    gsk_gpu_print_op (string, indent, "repeating-linear-gradient");
+  else
+    gsk_gpu_print_op (string, indent, "linear-gradient");
+  gsk_gpu_print_shader_info (string, shader->clip);
   gsk_gpu_print_rect (string, instance->rect);
+  gsk_gpu_print_newline (string);
 }
 
 static const GskGpuShaderOpClass GSK_GPU_LINEAR_GRADIENT_OP_CLASS = {
@@ -35,7 +43,7 @@ static const GskGpuShaderOpClass GSK_GPU_LINEAR_GRADIENT_OP_CLASS = {
     GSK_GPU_OP_SIZE (GskGpuLinearGradientOp),
     GSK_GPU_STAGE_SHADER,
     gsk_gpu_shader_op_finish,
-    gsk_gpu_shader_op_print,
+    gsk_gpu_linear_gradient_op_print,
 #ifdef GDK_RENDERING_VULKAN
     gsk_gpu_shader_op_vk_command,
 #endif
@@ -46,7 +54,6 @@ static const GskGpuShaderOpClass GSK_GPU_LINEAR_GRADIENT_OP_CLASS = {
 #ifdef GDK_RENDERING_VULKAN
   &gsk_gpu_lineargradient_info,
 #endif
-  gsk_gpu_linear_gradient_op_print_instance,
   gsk_gpu_lineargradient_setup_attrib_locations,
   gsk_gpu_lineargradient_setup_vao
 };

gsk/gpu/gskgpumaskop.c

@@ -16,15 +16,22 @@ struct _GskGpuMaskOp
 };
 
 static void
-gsk_gpu_mask_op_print_instance (GskGpuShaderOp *shader,
-                                gpointer        instance_,
-                                GString        *string)
+gsk_gpu_mask_op_print (GskGpuOp    *op,
+                       GskGpuFrame *frame,
+                       GString     *string,
+                       guint        indent)
 {
-  GskGpuMaskInstance *instance = (GskGpuMaskInstance *) instance_;
+  GskGpuShaderOp *shader = (GskGpuShaderOp *) op;
+  GskGpuMaskInstance *instance;
 
+  instance = (GskGpuMaskInstance *) gsk_gpu_frame_get_vertex_data (frame, shader->vertex_offset);
+
+  gsk_gpu_print_op (string, indent, "mask");
+  gsk_gpu_print_shader_info (string, shader->clip);
   gsk_gpu_print_rect (string, instance->rect);
   gsk_gpu_print_image_descriptor (string, shader->desc, instance->source_id);
   gsk_gpu_print_image_descriptor (string, shader->desc, instance->mask_id);
+  gsk_gpu_print_newline (string);
 }
 
 static const GskGpuShaderOpClass GSK_GPU_MASK_OP_CLASS = {
@@ -32,7 +39,7 @@ static const GskGpuShaderOpClass GSK_GPU_MASK_OP_CLASS = {
     GSK_GPU_OP_SIZE (GskGpuMaskOp),
     GSK_GPU_STAGE_SHADER,
     gsk_gpu_shader_op_finish,
-    gsk_gpu_shader_op_print,
+    gsk_gpu_mask_op_print,
 #ifdef GDK_RENDERING_VULKAN
     gsk_gpu_shader_op_vk_command,
 #endif
@@ -43,7 +50,6 @@ static const GskGpuShaderOpClass GSK_GPU_MASK_OP_CLASS = {
 #ifdef GDK_RENDERING_VULKAN
   &gsk_gpu_mask_info,
 #endif
-  gsk_gpu_mask_op_print_instance,
   gsk_gpu_mask_setup_attrib_locations,
   gsk_gpu_mask_setup_vao
 };

gsk/gpu/gskgpunodeprocessor.c

@@ -36,6 +36,7 @@
 #include "gskdebugprivate.h"
 #include "gskpath.h"
 #include "gskrectprivate.h"
+#include "gskvec2private.h"
 #include "gskrendernodeprivate.h"
 #include "gskroundedrectprivate.h"
 #include "gskstrokeprivate.h"
@@ -195,9 +196,9 @@ gsk_gpu_node_processor_init (GskGpuNodeProcessor         *self,
 
   self->modelview = NULL;
   gsk_gpu_image_get_projection_matrix (target, &self->projection);
-  graphene_vec2_init (&self->scale,
-                      width / viewport->size.width,
-                      height / viewport->size.height);
+  gsk_vec2_init (&self->scale,
+                 width / viewport->size.width,
+                 height / viewport->size.height);
   self->offset = GRAPHENE_POINT_INIT (-viewport->origin.x,
                                       -viewport->origin.y);
   self->opacity = 1.0;
@@ -319,8 +320,8 @@ rect_round_to_pixels (const graphene_rect_t  *src,
 {
   float x, y, xscale, yscale, inv_xscale, inv_yscale;
 
-  xscale = graphene_vec2_get_x (pixel_scale);
-  yscale = graphene_vec2_get_y (pixel_scale);
+  xscale = gsk_vec2_get_x (pixel_scale);
+  yscale = gsk_vec2_get_y (pixel_scale);
   inv_xscale = 1.0f / xscale;
   inv_yscale = 1.0f / yscale;
 
@@ -345,8 +346,8 @@ gsk_gpu_node_processor_init_draw (GskGpuNodeProcessor   *self,
 
   area.x = 0;
   area.y = 0;
-  area.width = ceilf (graphene_vec2_get_x (scale) * viewport->size.width - EPSILON);
-  area.height = ceilf (graphene_vec2_get_y (scale) * viewport->size.height - EPSILON);
+  area.width = ceilf (gsk_vec2_get_x (scale) * viewport->size.width - EPSILON);
+  area.height = ceilf (gsk_vec2_get_y (scale) * viewport->size.height - EPSILON);
 
   image = gsk_gpu_device_create_offscreen_image (gsk_gpu_frame_get_device (frame),
                                                  FALSE,
@@ -629,8 +630,8 @@ gsk_gpu_node_processor_rect_is_integer (GskGpuNodeProcessor   *self,
                                         cairo_rectangle_int_t *int_rect)
 {
   graphene_rect_t transformed_rect;
-  float scale_x = graphene_vec2_get_x (&self->scale);
-  float scale_y = graphene_vec2_get_y (&self->scale);
+  float scale_x = gsk_vec2_get_x (&self->scale);
+  float scale_y = gsk_vec2_get_y (&self->scale);
 
   switch (gsk_transform_get_category (self->modelview))
     {
@@ -1030,7 +1031,7 @@ gsk_gpu_node_processor_blur_op (GskGpuNodeProcessor       *self,
 
   gsk_gpu_node_processor_sync_globals (&other, 0);
 
-  graphene_vec2_init (&direction, blur_radius, 0.0f);
+  gsk_vec2_init (&direction, blur_radius, 0.0f);
   gsk_gpu_blur_op (other.frame,
                    gsk_gpu_clip_get_shader_clip (&other.clip, &other.offset, &intermediate_rect),
                    source_desc,
@@ -1044,7 +1045,7 @@ gsk_gpu_node_processor_blur_op (GskGpuNodeProcessor       *self,
 
   real_offset = GRAPHENE_POINT_INIT (self->offset.x + shadow_offset->x,
                                      self->offset.y + shadow_offset->y);
-  graphene_vec2_init (&direction, 0.0f, blur_radius);
+  gsk_vec2_init (&direction, 0.0f, blur_radius);
   intermediate_descriptor = gsk_gpu_node_processor_add_image (self, intermediate, GSK_GPU_SAMPLER_TRANSPARENT);
   if (shadow_color)
     {
@@ -1581,8 +1582,8 @@ gsk_gpu_node_processor_add_transform_node (GskGpuNodeProcessor *self,
         gsk_gpu_clip_scale (&self->clip, &old_clip, scale_x, scale_y);
         self->offset.x = (self->offset.x + dx) / scale_x;
         self->offset.y = (self->offset.y + dy) / scale_y;
-        graphene_vec2_init (&self->scale, fabs (scale_x), fabs (scale_y));
-        graphene_vec2_multiply (&self->scale, &old_scale, &self->scale);
+        gsk_vec2_init (&self->scale, fabs (scale_x), fabs (scale_y));
+        gsk_vec2_multiply (&self->scale, &old_scale, &self->scale);
         self->modelview = gsk_transform_scale (self->modelview,
                                                scale_x / fabs (scale_x),
                                                scale_y / fabs (scale_y));
@@ -1642,15 +1643,15 @@ gsk_gpu_node_processor_add_transform_node (GskGpuNodeProcessor *self,
         old_modelview = gsk_transform_ref (self->modelview);
 
         self->modelview = gsk_transform_scale (self->modelview,
-                                               graphene_vec2_get_x (&self->scale),
-                                               graphene_vec2_get_y (&self->scale));
+                                               gsk_vec2_get_x (&self->scale),
+                                               gsk_vec2_get_y (&self->scale));
         self->modelview = gsk_transform_transform (self->modelview, clip_transform);
         gsk_transform_unref (clip_transform);
 
         extract_scale_from_transform (self->modelview, &scale_x, &scale_y);
 
-        old_pixels = MAX (graphene_vec2_get_x (&old_scale) * old_clip.rect.bounds.size.width,
-                          graphene_vec2_get_y (&old_scale) * old_clip.rect.bounds.size.height);
+        old_pixels = MAX (gsk_vec2_get_x (&old_scale) * old_clip.rect.bounds.size.width,
+                          gsk_vec2_get_y (&old_scale) * old_clip.rect.bounds.size.height);
         new_pixels = MAX (scale_x * self->clip.rect.bounds.size.width,
                           scale_y * self->clip.rect.bounds.size.height);
 
@@ -1663,7 +1664,7 @@ gsk_gpu_node_processor_add_transform_node (GskGpuNodeProcessor *self,
           }
 
         self->modelview = gsk_transform_scale (self->modelview, 1 / scale_x, 1 / scale_y);
-        graphene_vec2_init (&self->scale, scale_x, scale_y);
+        gsk_vec2_init (&self->scale, scale_x, scale_y);
         self->offset = *graphene_point_zero ();
       }
       break;
@@ -1735,8 +1736,8 @@ gsk_gpu_node_processor_create_transform_pattern (GskGpuPatternWriter *self,
         self->bounds.size.width *= inv_sx;
         self->bounds.size.height *= inv_sy;
         self->offset = GRAPHENE_POINT_INIT (0, 0);
-        graphene_vec2_init (&self->scale, fabs (sx), fabs (sy));
-        graphene_vec2_multiply (&self->scale, &old_scale, &self->scale);
+        gsk_vec2_init (&self->scale, fabs (sx), fabs (sy));
+        gsk_vec2_multiply (&self->scale, &old_scale, &self->scale);
       }
       break;
 
@@ -1820,8 +1821,8 @@ gsk_gpu_node_processor_add_color_node (GskGpuNodeProcessor *self,
               return;
             }
 
-          scale_x = graphene_vec2_get_x (&self->scale);
-          scale_y = graphene_vec2_get_y (&self->scale);
+          scale_x = gsk_vec2_get_x (&self->scale);
+          scale_y = gsk_vec2_get_y (&self->scale);
           clipped = GRAPHENE_RECT_INIT (int_clipped.x / scale_x, int_clipped.y / scale_y,
                                         int_clipped.width / scale_x, int_clipped.height / scale_y);
           shader_clip = gsk_gpu_clip_get_shader_clip (&self->clip, graphene_point_zero(), &clipped);
@@ -1948,8 +1949,8 @@ gsk_gpu_node_processor_add_texture_node (GskGpuNodeProcessor *self,
     }
 
   if (gsk_gpu_frame_should_optimize (self->frame, GSK_GPU_OPTIMIZE_MIPMAP) &&
-      (gdk_texture_get_width (texture) > 2 * node->bounds.size.width * graphene_vec2_get_x (&self->scale) ||
-       gdk_texture_get_height (texture) > 2 * node->bounds.size.height * graphene_vec2_get_y (&self->scale)))
+      (gdk_texture_get_width (texture) > 2 * node->bounds.size.width * gsk_vec2_get_x (&self->scale) ||
+       gdk_texture_get_height (texture) > 2 * node->bounds.size.height * gsk_vec2_get_y (&self->scale)))
     {
       guint32 descriptor;
 
@@ -2015,8 +2016,8 @@ gsk_gpu_node_processor_create_texture_pattern (GskGpuPatternWriter *self,
     }
 
   if (gsk_gpu_frame_should_optimize (self->frame, GSK_GPU_OPTIMIZE_MIPMAP) &&
-      (gdk_texture_get_width (texture) > 2 * node->bounds.size.width * graphene_vec2_get_x (&self->scale) ||
-       gdk_texture_get_height (texture) > 2 * node->bounds.size.height * graphene_vec2_get_y (&self->scale)))
+      (gdk_texture_get_width (texture) > 2 * node->bounds.size.width * gsk_vec2_get_x (&self->scale) ||
+       gdk_texture_get_height (texture) > 2 * node->bounds.size.height * gsk_vec2_get_y (&self->scale)))
     {
       image = gsk_gpu_node_processor_ensure_image (self->frame,
                                                    image,
@@ -2060,7 +2061,7 @@ gsk_gpu_node_processor_add_texture_scale_node (GskGpuNodeProcessor *self,
   gboolean need_mipmap, need_offscreen;
 
   need_offscreen = self->modelview != NULL ||
-            !graphene_vec2_equal (&self->scale, graphene_vec2_one ());
+                   gsk_vec2_equal (&self->scale, graphene_vec2_one ());
   if (need_offscreen)
     {
       GskGpuImage *offscreen;
@@ -3000,12 +3001,8 @@ gsk_gpu_node_processor_add_glyph_node (GskGpuNodeProcessor *self,
   guint i, num_glyphs;
   float scale, inv_scale;
   GdkRGBA color;
-  float align_scale_x, align_scale_y;
-  float inv_align_scale_x, inv_align_scale_y;
-  unsigned int flags_mask;
-  GskGpuImage *last_image;
-  guint32 descriptor;
-  const float inv_pango_scale = 1.f / PANGO_SCALE;
+  gboolean glyph_align;
+  gboolean hinting;
 
   if (self->opacity < 1.0 &&
       gsk_text_node_has_color_glyphs (node))
@@ -3025,41 +3022,48 @@ gsk_gpu_node_processor_add_glyph_node (GskGpuNodeProcessor *self,
   offset.x += self->offset.x;
   offset.y += self->offset.y;
 
-  scale = MAX (graphene_vec2_get_x (&self->scale), graphene_vec2_get_y (&self->scale));
+  scale = MAX (gsk_vec2_get_x (&self->scale), gsk_vec2_get_y (&self->scale));
   inv_scale = 1.f / scale;
 
-  if (gsk_font_get_hint_style (font) != CAIRO_HINT_STYLE_NONE)
-    {
-      align_scale_x = scale * 4;
-      align_scale_y = scale;
-      flags_mask = 3;
-    }
-  else
-    {
-      align_scale_x = align_scale_y = scale * 4;
-      flags_mask = 15;
-    }
+  glyph_align = gsk_gpu_frame_should_optimize (self->frame, GSK_GPU_OPTIMIZE_GLYPH_ALIGN);
+  hinting = gsk_font_get_hint_style (font) != CAIRO_HINT_STYLE_NONE;
 
-  inv_align_scale_x = 1 / align_scale_x;
-  inv_align_scale_y = 1 / align_scale_y;
-
-  last_image = NULL;
-  descriptor = 0;
   for (i = 0; i < num_glyphs; i++)
     {
       GskGpuImage *image;
       graphene_rect_t glyph_bounds, glyph_tex_rect;
       graphene_point_t glyph_offset, glyph_origin;
+      guint32 descriptor;
       GskGpuGlyphLookupFlags flags;
 
-      glyph_origin = GRAPHENE_POINT_INIT (offset.x + glyphs[i].geometry.x_offset * inv_pango_scale,
-                                          offset.y + glyphs[i].geometry.y_offset * inv_pango_scale);
+      glyph_origin = GRAPHENE_POINT_INIT (offset.x + (float) glyphs[i].geometry.x_offset / PANGO_SCALE,
+                                          offset.y + (float) glyphs[i].geometry.y_offset / PANGO_SCALE);
 
-      glyph_origin.x = floorf (glyph_origin.x * align_scale_x + 0.5f);
-      glyph_origin.y = floorf (glyph_origin.y * align_scale_y + 0.5f);
-      flags = (((int) glyph_origin.x & 3) | (((int) glyph_origin.y & 3) << 2)) & flags_mask;
-      glyph_origin.x *= inv_align_scale_x;
-      glyph_origin.y *= inv_align_scale_y;
+      if (hinting && glyph_align)
+        {
+          /* Force glyph_origin.y to be device pixel aligned.
+           * The hinter expects that.
+           */
+          glyph_origin.x = floor (glyph_origin.x * scale * 4 + .5);
+          flags = ((int) glyph_origin.x & 3);
+          glyph_origin.x = 0.25 * inv_scale * glyph_origin.x;
+          glyph_origin.y = floor (glyph_origin.y * scale + .5) * inv_scale;
+        }
+      else if (glyph_align)
+        {
+          glyph_origin.x = floor (glyph_origin.x * scale * 4 + .5);
+          glyph_origin.y = floor (glyph_origin.y * scale * 4 + .5);
+          flags = ((int) glyph_origin.x & 3) |
+                  (((int) glyph_origin.y & 3) << 2);
+          glyph_origin.x = 0.25 * inv_scale * glyph_origin.x;
+          glyph_origin.y = 0.25 * inv_scale * glyph_origin.y;
+        }
+      else
+        {
+          glyph_origin.x = floor (glyph_origin.x * scale + .5) * inv_scale;
+          glyph_origin.y = floor (glyph_origin.y * scale + .5) * inv_scale;
+          flags = 0;
+        }
 
       image = gsk_gpu_device_lookup_glyph_image (device,
                                                  self->frame,
@@ -3081,11 +3085,7 @@ gsk_gpu_node_processor_add_glyph_node (GskGpuNodeProcessor *self,
       glyph_origin = GRAPHENE_POINT_INIT (glyph_origin.x - glyph_offset.x * inv_scale,
                                           glyph_origin.y - glyph_offset.y * inv_scale);
 
-      if (image != last_image)
-        {
-          descriptor = gsk_gpu_node_processor_add_image (self, image, GSK_GPU_SAMPLER_DEFAULT);
-          last_image = image;
-        }
+      descriptor = gsk_gpu_node_processor_add_image (self, image, GSK_GPU_SAMPLER_DEFAULT);
 
       if (glyphs[i].attr.is_color)
         gsk_gpu_texture_op (self->frame,
@@ -3105,7 +3105,7 @@ gsk_gpu_node_processor_add_glyph_node (GskGpuNodeProcessor *self,
                              &glyph_tex_rect,
                              &color);
 
-      offset.x += glyphs[i].geometry.width * inv_pango_scale;
+      offset.x += (float) glyphs[i].geometry.width / PANGO_SCALE;
     }
 }
 
@@ -3122,10 +3122,8 @@ gsk_gpu_node_processor_create_glyph_pattern (GskGpuPatternWriter *self,
   guint32 tex_id;
   GskGpuImage *last_image;
   graphene_point_t offset;
-  float align_scale_x, align_scale_y;
-  float inv_align_scale_x, inv_align_scale_y;
-  unsigned int flags_mask;
-  const float inv_pango_scale = 1.f / PANGO_SCALE;
+  gboolean glyph_align;
+  gboolean hinting;
 
   if (gsk_text_node_has_color_glyphs (node))
     return FALSE;
@@ -3138,27 +3136,15 @@ gsk_gpu_node_processor_create_glyph_pattern (GskGpuPatternWriter *self,
   offset.x += self->offset.x;
   offset.y += self->offset.y;
 
-  scale = MAX (graphene_vec2_get_x (&self->scale), graphene_vec2_get_y (&self->scale));
+  scale = MAX (gsk_vec2_get_x (&self->scale), gsk_vec2_get_y (&self->scale));
   inv_scale = 1.f / scale;
 
   gsk_gpu_pattern_writer_append_uint (self, GSK_GPU_PATTERN_GLYPHS);
   gsk_gpu_pattern_writer_append_rgba (self, gsk_text_node_get_color (node));
   gsk_gpu_pattern_writer_append_uint (self, num_glyphs);
 
-  if (gsk_font_get_hint_style (font) != CAIRO_HINT_STYLE_NONE)
-    {
-      align_scale_x = scale * 4;
-      align_scale_y = scale;
-      flags_mask = 3;
-    }
-  else
-    {
-      align_scale_x = align_scale_y = scale * 4;
-      flags_mask = 15;
-    }
-
-  inv_align_scale_x = 1 / align_scale_x;
-  inv_align_scale_y = 1 / align_scale_y;
+  glyph_align = gsk_gpu_frame_should_optimize (self->frame, GSK_GPU_OPTIMIZE_GLYPH_ALIGN);
+  hinting = gsk_font_get_hint_style (font) != CAIRO_HINT_STYLE_NONE;
 
   last_image = NULL;
   for (i = 0; i < num_glyphs; i++)
@@ -3168,14 +3154,34 @@ gsk_gpu_node_processor_create_glyph_pattern (GskGpuPatternWriter *self,
       graphene_point_t glyph_offset, glyph_origin;
       GskGpuGlyphLookupFlags flags;
 
-      glyph_origin = GRAPHENE_POINT_INIT (offset.x + glyphs[i].geometry.x_offset * inv_pango_scale,
-                                          offset.y + glyphs[i].geometry.y_offset * inv_pango_scale);
+      glyph_origin = GRAPHENE_POINT_INIT (offset.x + (float) glyphs[i].geometry.x_offset / PANGO_SCALE,
+                                          offset.y + (float) glyphs[i].geometry.y_offset / PANGO_SCALE);
 
-      glyph_origin.x = floorf (glyph_origin.x * align_scale_x + 0.5f);
-      glyph_origin.y = floorf (glyph_origin.y * align_scale_y + 0.5f);
-      flags = (((int) glyph_origin.x & 3) | (((int) glyph_origin.y & 3) << 2)) & flags_mask;
-      glyph_origin.x *= inv_align_scale_x;
-      glyph_origin.y *= inv_align_scale_y;
+      if (hinting && glyph_align)
+        {
+          /* Force glyph_origin.y to be device pixel aligned.
+           * The hinter expects that.
+           */
+          glyph_origin.x = roundf (glyph_origin.x * scale * 4);
+          flags = ((int) glyph_origin.x & 3);
+          glyph_origin.x = 0.25 * inv_scale * glyph_origin.x;
+          glyph_origin.y = roundf (glyph_origin.y * scale) * inv_scale;
+        }
+      else if (glyph_align)
+        {
+          glyph_origin.x = roundf (glyph_origin.x * scale * 4);
+          glyph_origin.y = roundf (glyph_origin.y * scale * 4);
+          flags = ((int) glyph_origin.x & 3) |
+                  (((int) glyph_origin.y & 3) << 2);
+          glyph_origin.x = 0.25 * inv_scale * glyph_origin.x;
+          glyph_origin.y = 0.25 * inv_scale * glyph_origin.y;
+        }
+      else
+        {
+          glyph_origin.x = roundf (glyph_origin.x * scale) * inv_scale;
+          glyph_origin.y = roundf (glyph_origin.y * scale) * inv_scale;
+          flags = 0;
+        }
 
       image = gsk_gpu_device_lookup_glyph_image (device,
                                                  self->frame,
@@ -3215,7 +3221,7 @@ gsk_gpu_node_processor_create_glyph_pattern (GskGpuPatternWriter *self,
                                           ),
                                           &glyph_origin);
 
-      offset.x += glyphs[i].geometry.width * inv_pango_scale;
+      offset.x += (float) glyphs[i].geometry.width / PANGO_SCALE;
     }
 
   return TRUE;

gsk/gpu/gskgpuradialgradientop.c

@@ -19,15 +19,23 @@ struct _GskGpuRadialGradientOp
 };
 
 static void
-gsk_gpu_radial_gradient_op_print_instance (GskGpuShaderOp *shader,
-                                           gpointer        instance_,
-                                           GString        *string)
+gsk_gpu_radial_gradient_op_print (GskGpuOp    *op,
+                                  GskGpuFrame *frame,
+                                  GString     *string,
+                                  guint        indent)
 {
-  GskGpuRadialgradientInstance *instance = (GskGpuRadialgradientInstance *) instance_;
+  GskGpuShaderOp *shader = (GskGpuShaderOp *) op;
+  GskGpuRadialgradientInstance *instance;
+
+  instance = (GskGpuRadialgradientInstance *) gsk_gpu_frame_get_vertex_data (frame, shader->vertex_offset);
 
   if (shader->variation & VARIATION_REPEATING)
-    gsk_gpu_print_string (string, "repeating");
+    gsk_gpu_print_op (string, indent, "repeating-radial-gradient");
+  else
+    gsk_gpu_print_op (string, indent, "radial-gradient");
+  gsk_gpu_print_shader_info (string, shader->clip);
   gsk_gpu_print_rect (string, instance->rect);
+  gsk_gpu_print_newline (string);
 }
 
 static const GskGpuShaderOpClass GSK_GPU_RADIAL_GRADIENT_OP_CLASS = {
@@ -35,7 +43,7 @@ static const GskGpuShaderOpClass GSK_GPU_RADIAL_GRADIENT_OP_CLASS = {
     GSK_GPU_OP_SIZE (GskGpuRadialGradientOp),
     GSK_GPU_STAGE_SHADER,
     gsk_gpu_shader_op_finish,
-    gsk_gpu_shader_op_print,
+    gsk_gpu_radial_gradient_op_print,
 #ifdef GDK_RENDERING_VULKAN
     gsk_gpu_shader_op_vk_command,
 #endif
@@ -46,7 +54,6 @@ static const GskGpuShaderOpClass GSK_GPU_RADIAL_GRADIENT_OP_CLASS = {
 #ifdef GDK_RENDERING_VULKAN
   &gsk_gpu_radialgradient_info,
 #endif
-  gsk_gpu_radial_gradient_op_print_instance,
   gsk_gpu_radialgradient_setup_attrib_locations,
   gsk_gpu_radialgradient_setup_vao
 };

gsk/gpu/gskgpurenderer.c

@@ -30,6 +30,9 @@ static const GdkDebugKey gsk_gpu_optimization_keys[] = {
   { "blit", GSK_GPU_OPTIMIZE_BLIT, "Use shaders instead of vkCmdBlit()/glBlitFramebuffer()" },
   { "gradients", GSK_GPU_OPTIMIZE_GRADIENTS, "Don't supersample gradients" },
   { "mipmap", GSK_GPU_OPTIMIZE_MIPMAP, "Avoid creating mipmaps" },
+  { "glyph-align", GSK_GPU_OPTIMIZE_GLYPH_ALIGN, "Never align glyphs to the subpixel grid" },
+
+  { "gl-baseinstance", GSK_GPU_OPTIMIZE_GL_BASE_INSTANCE, "Assume no ARB/EXT_base_instance support" },
 };
 
 typedef struct _GskGpuRendererPrivate GskGpuRendererPrivate;
@@ -164,36 +167,24 @@ static GskGpuFrame *
 gsk_gpu_renderer_get_frame (GskGpuRenderer *self)
 {
   GskGpuRendererPrivate *priv = gsk_gpu_renderer_get_instance_private (self);
-  GskGpuFrame *earliest_frame = NULL;
-  gint64 earliest_time = G_MAXINT64;
   guint i;
 
-  for (i = 0; i < G_N_ELEMENTS (priv->frames); i++)
+  while (TRUE)
     {
-      gint64 timestamp;
-
-      if (priv->frames[i] == NULL)
+      for (i = 0; i < G_N_ELEMENTS (priv->frames); i++)
         {
-          priv->frames[i] = gsk_gpu_renderer_create_frame (self);
-          return priv->frames[i];
+          if (priv->frames[i] == NULL)
+            {
+              priv->frames[i] = gsk_gpu_renderer_create_frame (self);
+              return priv->frames[i];
+            }
+
+          if (!gsk_gpu_frame_is_busy (priv->frames[i]))
+            return priv->frames[i];
         }
 
-      if (!gsk_gpu_frame_is_busy (priv->frames[i]))
-        return priv->frames[i];
-
-      timestamp = gsk_gpu_frame_get_timestamp (priv->frames[i]);
-      if (timestamp < earliest_time)
-        {
-          earliest_time = timestamp;
-          earliest_frame = priv->frames[i];
-        }
+      GSK_GPU_RENDERER_GET_CLASS (self)->wait (self, priv->frames, GSK_GPU_MAX_FRAMES);
     }
-
-  g_assert (earliest_frame);
-
-  gsk_gpu_frame_wait (earliest_frame);
-
-  return earliest_frame;
 }
 
 static gboolean
@@ -227,17 +218,31 @@ gsk_gpu_renderer_unrealize (GskRenderer *renderer)
 {
   GskGpuRenderer *self = GSK_GPU_RENDERER (renderer);
   GskGpuRendererPrivate *priv = gsk_gpu_renderer_get_instance_private (self);
-  gsize i;
+  gsize i, j;
 
   gsk_gpu_renderer_make_current (self);
 
-  for (i = 0; i < G_N_ELEMENTS (priv->frames); i++)
+  while (TRUE)
     {
-      if (priv->frames[i] == NULL)
+      for (i = 0, j = 0; i < G_N_ELEMENTS (priv->frames); i++)
+        {
+          if (priv->frames[i] == NULL)
+            break;
+          if (gsk_gpu_frame_is_busy (priv->frames[i]))
+            {
+              if (i > j)
+                {
+                  priv->frames[j] = priv->frames[i];
+                  priv->frames[i] = NULL;
+                }
+              j++;
+              continue;
+            }
+          g_clear_object (&priv->frames[i]);
+        }
+      if (j == 0)
         break;
-      if (gsk_gpu_frame_is_busy (priv->frames[i]))
-        gsk_gpu_frame_wait (priv->frames[i]);
-      g_clear_object (&priv->frames[i]);
+      GSK_GPU_RENDERER_GET_CLASS (self)->wait (self, priv->frames, j);
     }
 
   g_clear_object (&priv->context);
@@ -453,7 +458,7 @@ gsk_gpu_renderer_class_init (GskGpuRendererClass *klass)
   gsk_ensure_resources ();
 
   klass->optimizations = -1;
-  klass->optimizations &= ~gdk_parse_debug_var ("GSK_GPU_DISABLE",
+  klass->optimizations &= ~gdk_parse_debug_var ("GSK_GPU_SKIP",
                                                 gsk_gpu_optimization_keys,
                                                 G_N_ELEMENTS (gsk_gpu_optimization_keys));
   klass->get_scale = gsk_gpu_renderer_real_get_scale;

gsk/gpu/gskgpurendererprivate.h

@@ -35,6 +35,9 @@ struct _GskGpuRendererClass
 
   void                  (* make_current)                                (GskGpuRenderer         *self);
   GskGpuImage *         (* get_backbuffer)                              (GskGpuRenderer         *self);
+  void                  (* wait)                                        (GskGpuRenderer         *self,
+                                                                         GskGpuFrame           **frame,
+                                                                         gsize                   n_frames);
 
   double                (* get_scale)                                   (GskGpuRenderer         *self);
   GdkDmabufFormats *    (* get_dmabuf_formats)                          (GskGpuRenderer         *self);

gsk/gpu/gskgpuroundedcolorop.c

@@ -17,14 +17,21 @@ struct _GskGpuRoundedColorOp
 };
 
 static void
-gsk_gpu_rounded_color_op_print_instance (GskGpuShaderOp *shader,
-                                         gpointer        instance_,
-                                         GString        *string)
+gsk_gpu_rounded_color_op_print (GskGpuOp    *op,
+                                GskGpuFrame *frame,
+                                GString     *string,
+                                guint        indent)
 {
-  GskGpuRoundedcolorInstance *instance = (GskGpuRoundedcolorInstance *) instance_;
+  GskGpuShaderOp *shader = (GskGpuShaderOp *) op;
+  GskGpuRoundedcolorInstance *instance;
 
+  instance = (GskGpuRoundedcolorInstance *) gsk_gpu_frame_get_vertex_data (frame, shader->vertex_offset);
+
+  gsk_gpu_print_op (string, indent, "rounded-color");
+  gsk_gpu_print_shader_info (string, shader->clip);
   gsk_gpu_print_rounded_rect (string, instance->outline);
   gsk_gpu_print_rgba (string, instance->color);
+  gsk_gpu_print_newline (string);
 }
 
 static const GskGpuShaderOpClass GSK_GPU_ROUNDED_COLOR_OP_CLASS = {
@@ -32,7 +39,7 @@ static const GskGpuShaderOpClass GSK_GPU_ROUNDED_COLOR_OP_CLASS = {
     GSK_GPU_OP_SIZE (GskGpuRoundedColorOp),
     GSK_GPU_STAGE_SHADER,
     gsk_gpu_shader_op_finish,
-    gsk_gpu_shader_op_print,
+    gsk_gpu_rounded_color_op_print,
 #ifdef GDK_RENDERING_VULKAN
     gsk_gpu_shader_op_vk_command,
 #endif
@@ -43,7 +50,6 @@ static const GskGpuShaderOpClass GSK_GPU_ROUNDED_COLOR_OP_CLASS = {
 #ifdef GDK_RENDERING_VULKAN
   &gsk_gpu_roundedcolor_info,
 #endif
-  gsk_gpu_rounded_color_op_print_instance,
   gsk_gpu_roundedcolor_setup_attrib_locations,
   gsk_gpu_roundedcolor_setup_vao
 };

gsk/gpu/gskgpushaderop.c

@@ -3,7 +3,6 @@
 #include "gskgpushaderopprivate.h"
 
 #include "gskgpuframeprivate.h"
-#include "gskgpuprintprivate.h"
 #include "gskgldescriptorsprivate.h"
 #include "gskgldeviceprivate.h"
 #include "gskglframeprivate.h"
@@ -13,8 +12,6 @@
 #include "gskvulkandeviceprivate.h"
 #endif
 
-#include "gdkglcontextprivate.h"
-
 /* maximum number of ops to merge into one call
  * If this number is too high, the command may take too long
  * causing the driver to kill us.
@@ -29,36 +26,6 @@ gsk_gpu_shader_op_finish (GskGpuOp *op)
   g_clear_object (&self->desc);
 }
 
-void
-gsk_gpu_shader_op_print (GskGpuOp    *op,
-                         GskGpuFrame *frame,
-                         GString     *string,
-                         guint        indent)
-{
-  GskGpuShaderOp *self = (GskGpuShaderOp *) op;
-  const GskGpuShaderOpClass *shader_class = (const GskGpuShaderOpClass *) op->op_class;
-  const char *shader_name;
-  guchar *instance;
-  gsize i;
-
-  if (g_str_has_prefix (shader_class->shader_name, "gskgpu"))
-    shader_name = shader_class->shader_name + 6;
-  else
-    shader_name = shader_class->shader_name;
-
-  instance = gsk_gpu_frame_get_vertex_data (frame, self->vertex_offset);
-
-  for (i = 0; i < self->n_ops; i++)
-    {
-      gsk_gpu_print_op (string, indent, shader_name);
-      gsk_gpu_print_shader_info (string, self->clip);
-      shader_class->print_instance (self,
-                                    instance + i * shader_class->vertex_size,
-                                    string);
-      gsk_gpu_print_newline (string);
-    }
-}
-
 #ifdef GDK_RENDERING_VULKAN
 GskGpuOp *
 gsk_gpu_shader_op_vk_command_n (GskGpuOp              *op,
@@ -70,15 +37,15 @@ gsk_gpu_shader_op_vk_command_n (GskGpuOp              *op,
   GskGpuShaderOpClass *shader_op_class = (GskGpuShaderOpClass *) op->op_class;
   GskVulkanDescriptors *desc;
   GskGpuOp *next;
-  gsize i, n_ops, max_ops_per_draw;
+  gsize i, n;
 
   if (gsk_gpu_frame_should_optimize (frame, GSK_GPU_OPTIMIZE_MERGE) &&
       gsk_vulkan_device_has_feature (GSK_VULKAN_DEVICE (gsk_gpu_frame_get_device (frame)),
                                      GDK_VULKAN_FEATURE_NONUNIFORM_INDEXING))
-    max_ops_per_draw = MAX_MERGE_OPS;
+    n = MAX_MERGE_OPS;
   else
-    max_ops_per_draw = 1;
-
+    n = 1;
+  i = 1;
   desc = GSK_VULKAN_DESCRIPTORS (self->desc);
   if (desc && state->desc != desc)
     {
@@ -86,8 +53,7 @@ gsk_gpu_shader_op_vk_command_n (GskGpuOp              *op,
       state->desc = desc;
     }
 
-  n_ops = self->n_ops;
-  for (next = op->next; next; next = next->next)
+  for (next = op->next; next && i < n; next = next->next)
     {
       GskGpuShaderOp *next_shader = (GskGpuShaderOp *) next;
   
@@ -95,10 +61,10 @@ gsk_gpu_shader_op_vk_command_n (GskGpuOp              *op,
           next_shader->desc != self->desc ||
           next_shader->variation != self->variation ||
           next_shader->clip != self->clip ||
-          next_shader->vertex_offset != self->vertex_offset + n_ops * shader_op_class->vertex_size)
+          next_shader->vertex_offset != self->vertex_offset + i * shader_op_class->vertex_size)
         break;
 
-      n_ops += next_shader->n_ops;
+      i++;
     }
 
   vkCmdBindPipeline (state->vk_command_buffer,
@@ -112,13 +78,10 @@ gsk_gpu_shader_op_vk_command_n (GskGpuOp              *op,
                                                         state->vk_format,
                                                         state->vk_render_pass));
 
-  for (i = 0; i < n_ops; i += max_ops_per_draw)
-    {
-      vkCmdDraw (state->vk_command_buffer,
-                 6 * instance_scale, MIN (max_ops_per_draw, n_ops - i),
-                 0, self->vertex_offset / shader_op_class->vertex_size + i);
-    }
- 
+  vkCmdDraw (state->vk_command_buffer,
+             6 * instance_scale, i,
+             0, self->vertex_offset / shader_op_class->vertex_size);
+
   return next;
 }
 
@@ -141,7 +104,7 @@ gsk_gpu_shader_op_gl_command_n (GskGpuOp          *op,
   GskGpuShaderOpClass *shader_op_class = (GskGpuShaderOpClass *) op->op_class;
   GskGLDescriptors *desc;
   GskGpuOp *next;
-  gsize i, n_ops, n_external, max_ops_per_draw;
+  gsize i, n, n_external;
 
   desc = GSK_GL_DESCRIPTORS (self->desc);
   if (desc)
@@ -172,12 +135,11 @@ gsk_gpu_shader_op_gl_command_n (GskGpuOp          *op,
     }
 
   if (gsk_gpu_frame_should_optimize (frame, GSK_GPU_OPTIMIZE_MERGE))
-    max_ops_per_draw = MAX_MERGE_OPS;
+    n = MAX_MERGE_OPS;
   else
-    max_ops_per_draw = 1;
-
-  n_ops = self->n_ops;
-  for (next = op->next; next; next = next->next)
+    n = 1;
+  i = 1;
+  for (next = op->next; next && i < n; next = next->next)
     {
       GskGpuShaderOp *next_shader = (GskGpuShaderOp *) next;
 
@@ -185,32 +147,28 @@ gsk_gpu_shader_op_gl_command_n (GskGpuOp          *op,
           next_shader->desc != self->desc ||
           next_shader->variation != self->variation ||
           next_shader->clip != self->clip ||
-          next_shader->vertex_offset != self->vertex_offset + n_ops * shader_op_class->vertex_size)
+          next_shader->vertex_offset != self->vertex_offset + i * shader_op_class->vertex_size)
         break;
 
-      n_ops += next_shader->n_ops;
+      i++;
     }
 
-  for (i = 0; i < n_ops; i += max_ops_per_draw)
+  if (gsk_gpu_frame_should_optimize (frame, GSK_GPU_OPTIMIZE_GL_BASE_INSTANCE))
     {
-      if (gdk_gl_context_has_feature (GDK_GL_CONTEXT (gsk_gpu_frame_get_context (frame)),
-                                      GDK_GL_FEATURE_BASE_INSTANCE))
-        {
-          glDrawArraysInstancedBaseInstance (GL_TRIANGLES,
-                                             0,
-                                             6 * instance_scale,
-                                             MIN (max_ops_per_draw, n_ops - i),
-                                             self->vertex_offset / shader_op_class->vertex_size + i);
-        }
-      else
-        {
-          shader_op_class->setup_vao (self->vertex_offset + i * shader_op_class->vertex_size);
+      glDrawArraysInstancedBaseInstance (GL_TRIANGLES,
+                                         0,
+                                         6 * instance_scale,
+                                         i,
+                                         self->vertex_offset / shader_op_class->vertex_size);
+    }
+  else
+    {
+      shader_op_class->setup_vao (self->vertex_offset);
 
-          glDrawArraysInstanced (GL_TRIANGLES,
-                                 0,
-                                 6 * instance_scale,
-                                 MIN (max_ops_per_draw, n_ops - i));
-        }
+      glDrawArraysInstanced (GL_TRIANGLES,
+                             0,
+                             6 * instance_scale,
+                             i);
     }
 
   return next;
@@ -224,7 +182,7 @@ gsk_gpu_shader_op_gl_command (GskGpuOp          *op,
   return gsk_gpu_shader_op_gl_command_n (op, frame, state, 1);
 }
 
-void
+GskGpuShaderOp *
 gsk_gpu_shader_op_alloc (GskGpuFrame               *frame,
                          const GskGpuShaderOpClass *op_class,
                          guint32                    variation,
@@ -232,39 +190,20 @@ gsk_gpu_shader_op_alloc (GskGpuFrame               *frame,
                          GskGpuDescriptors         *desc,
                          gpointer                   out_vertex_data)
 {
-  GskGpuOp *last;
-  GskGpuShaderOp *last_shader;
-  gsize vertex_offset;
+  GskGpuShaderOp *self;
 
-  vertex_offset = gsk_gpu_frame_reserve_vertex_data (frame, op_class->vertex_size);
+  self = (GskGpuShaderOp *) gsk_gpu_op_alloc (frame, &op_class->parent_class);
 
-  last = gsk_gpu_frame_get_last_op (frame);
-  /* careful: We're casting without checking, but the if() does the check */
-  last_shader = (GskGpuShaderOp *) last;
-  if (last &&
-      last->op_class == (const GskGpuOpClass *) op_class &&
-      last_shader->desc == desc &&
-      last_shader->variation == variation &&
-      last_shader->clip == clip &&
-      last_shader->vertex_offset + last_shader->n_ops * op_class->vertex_size == vertex_offset)
-    {
-      last_shader->n_ops++;
-    }
+  self->variation = variation;
+  self->clip = clip;
+  if (desc)
+    self->desc = g_object_ref (desc);
   else
-    {
-      GskGpuShaderOp *self;
-      self = (GskGpuShaderOp *) gsk_gpu_op_alloc (frame, &op_class->parent_class);
+    self->desc = NULL;
+  self->vertex_offset = gsk_gpu_frame_reserve_vertex_data (frame, op_class->vertex_size);
 
-      self->variation = variation;
-      self->clip = clip;
-      self->vertex_offset = vertex_offset;
-      if (desc)
-        self->desc = g_object_ref (desc);
-      else
-        self->desc = NULL;
-      self->n_ops = 1;
-    }
+  *((gpointer *) out_vertex_data) = gsk_gpu_frame_get_vertex_data (frame, self->vertex_offset);
 
-  *((gpointer *) out_vertex_data) = gsk_gpu_frame_get_vertex_data (frame, vertex_offset);
+  return self;
 }
 

gsk/gpu/gskgpushaderopprivate.h

@@ -14,7 +14,6 @@ struct _GskGpuShaderOp
   guint32 variation;
   GskGpuShaderClip clip;
   gsize vertex_offset;
-  gsize n_ops;
 };
 
 struct _GskGpuShaderOpClass
@@ -26,14 +25,11 @@ struct _GskGpuShaderOpClass
 #ifdef GDK_RENDERING_VULKAN
   const VkPipelineVertexInputStateCreateInfo *vertex_input_state;
 #endif
-  void                  (* print_instance)                              (GskGpuShaderOp         *shader,
-                                                                         gpointer                instance,
-                                                                         GString                *string);
   void                  (* setup_attrib_locations)                      (GLuint                  program);
   void                  (* setup_vao)                                   (gsize                   offset);
 };
 
-void                    gsk_gpu_shader_op_alloc                         (GskGpuFrame            *frame,
+GskGpuShaderOp *        gsk_gpu_shader_op_alloc                         (GskGpuFrame            *frame,
                                                                          const GskGpuShaderOpClass *op_class,
                                                                          guint32                 variation,
                                                                          GskGpuShaderClip        clip,
@@ -42,10 +38,6 @@ void                    gsk_gpu_shader_op_alloc                         (GskGpuF
 
 void                    gsk_gpu_shader_op_finish                        (GskGpuOp               *op);
 
-void                    gsk_gpu_shader_op_print                         (GskGpuOp               *op,
-                                                                         GskGpuFrame            *frame,
-                                                                         GString                *string,
-                                                                         guint                   indent);
 #ifdef GDK_RENDERING_VULKAN
 GskGpuOp *              gsk_gpu_shader_op_vk_command_n                  (GskGpuOp               *op,
                                                                          GskGpuFrame            *frame,

gsk/gpu/gskgpustraightalphaop.c

@@ -19,14 +19,21 @@ struct _GskGpuStraightAlphaOp
 };
 
 static void
-gsk_gpu_straight_alpha_op_print_instance (GskGpuShaderOp *shader,
-                                          gpointer        instance_,
-                                          GString        *string)
+gsk_gpu_straight_alpha_op_print (GskGpuOp    *op,
+                                 GskGpuFrame *frame,
+                                 GString     *string,
+                                 guint        indent)
 {
-  GskGpuStraightalphaInstance *instance = (GskGpuStraightalphaInstance *) instance_;
+  GskGpuShaderOp *shader = (GskGpuShaderOp *) op;
+  GskGpuStraightalphaInstance *instance;
 
+  instance = (GskGpuStraightalphaInstance *) gsk_gpu_frame_get_vertex_data (frame, shader->vertex_offset);
+
+  gsk_gpu_print_op (string, indent, "straight-alpha");
+  gsk_gpu_print_shader_info (string, shader->clip);
   gsk_gpu_print_rect (string, instance->rect);
   gsk_gpu_print_image_descriptor (string, shader->desc, instance->tex_id);
+  gsk_gpu_print_newline (string);
 }
 
 static const GskGpuShaderOpClass GSK_GPU_STRAIGHT_ALPHA_OP_CLASS = {
@@ -34,7 +41,7 @@ static const GskGpuShaderOpClass GSK_GPU_STRAIGHT_ALPHA_OP_CLASS = {
     GSK_GPU_OP_SIZE (GskGpuStraightAlphaOp),
     GSK_GPU_STAGE_SHADER,
     gsk_gpu_shader_op_finish,
-    gsk_gpu_shader_op_print,
+    gsk_gpu_straight_alpha_op_print,
 #ifdef GDK_RENDERING_VULKAN
     gsk_gpu_shader_op_vk_command,
 #endif
@@ -45,7 +52,6 @@ static const GskGpuShaderOpClass GSK_GPU_STRAIGHT_ALPHA_OP_CLASS = {
 #ifdef GDK_RENDERING_VULKAN
   &gsk_gpu_straightalpha_info,
 #endif
-  gsk_gpu_straight_alpha_op_print_instance,
   gsk_gpu_straightalpha_setup_attrib_locations,
   gsk_gpu_straightalpha_setup_vao
 };

gsk/gpu/gskgputextureop.c

@@ -16,14 +16,21 @@ struct _GskGpuTextureOp
 };
 
 static void
-gsk_gpu_texture_op_print_instance (GskGpuShaderOp *shader,
-                                   gpointer        instance_,
-                                   GString        *string)
+gsk_gpu_texture_op_print (GskGpuOp    *op,
+                          GskGpuFrame *frame,
+                          GString     *string,
+                          guint        indent)
 {
-  GskGpuTextureInstance *instance = (GskGpuTextureInstance *) instance_;
+  GskGpuShaderOp *shader = (GskGpuShaderOp *) op;
+  GskGpuTextureInstance *instance;
 
+  instance = (GskGpuTextureInstance *) gsk_gpu_frame_get_vertex_data (frame, shader->vertex_offset);
+
+  gsk_gpu_print_op (string, indent, "texture");
+  gsk_gpu_print_shader_info (string, shader->clip);
   gsk_gpu_print_rect (string, instance->rect);
   gsk_gpu_print_image_descriptor (string, shader->desc, instance->tex_id);
+  gsk_gpu_print_newline (string);
 }
 
 static const GskGpuShaderOpClass GSK_GPU_TEXTURE_OP_CLASS = {
@@ -31,7 +38,7 @@ static const GskGpuShaderOpClass GSK_GPU_TEXTURE_OP_CLASS = {
     GSK_GPU_OP_SIZE (GskGpuTextureOp),
     GSK_GPU_STAGE_SHADER,
     gsk_gpu_shader_op_finish,
-    gsk_gpu_shader_op_print,
+    gsk_gpu_texture_op_print,
 #ifdef GDK_RENDERING_VULKAN
     gsk_gpu_shader_op_vk_command,
 #endif
@@ -42,7 +49,6 @@ static const GskGpuShaderOpClass GSK_GPU_TEXTURE_OP_CLASS = {
 #ifdef GDK_RENDERING_VULKAN
   &gsk_gpu_texture_info,
 #endif
-  gsk_gpu_texture_op_print_instance,
   gsk_gpu_texture_setup_attrib_locations,
   gsk_gpu_texture_setup_vao
 };

gsk/gpu/gskgputypesprivate.h

@@ -118,5 +118,8 @@ typedef enum {
   GSK_GPU_OPTIMIZE_BLIT                 = 1 <<  3,
   GSK_GPU_OPTIMIZE_GRADIENTS            = 1 <<  4,
   GSK_GPU_OPTIMIZE_MIPMAP               = 1 <<  5,
+  GSK_GPU_OPTIMIZE_GLYPH_ALIGN          = 1 <<  6,
+  /* These require hardware support */
+  GSK_GPU_OPTIMIZE_GL_BASE_INSTANCE     = 1 <<  7,
 } GskGpuOptimizations;
 

gsk/gpu/gskgpuuberop.c

@@ -17,13 +17,20 @@ struct _GskGpuUberOp
 };
 
 static void
-gsk_gpu_uber_op_print_instance (GskGpuShaderOp *shader,
-                                gpointer        instance_,
-                                GString        *string)
+gsk_gpu_uber_op_print (GskGpuOp    *op,
+                       GskGpuFrame *frame,
+                       GString     *string,
+                       guint        indent)
 {
-  GskGpuUberInstance *instance = instance_;
+  GskGpuShaderOp *shader = (GskGpuShaderOp *) op;
+  GskGpuUberInstance *instance;
 
+  instance = (GskGpuUberInstance *) gsk_gpu_frame_get_vertex_data (frame, shader->vertex_offset);
+
+  gsk_gpu_print_op (string, indent, "uber");
+  gsk_gpu_print_shader_info (string, shader->clip);
   gsk_gpu_print_rect (string, instance->rect);
+  gsk_gpu_print_newline (string);
 }
 
 static const GskGpuShaderOpClass GSK_GPU_UBER_OP_CLASS = {
@@ -31,7 +38,7 @@ static const GskGpuShaderOpClass GSK_GPU_UBER_OP_CLASS = {
     GSK_GPU_OP_SIZE (GskGpuUberOp),
     GSK_GPU_STAGE_SHADER,
     gsk_gpu_shader_op_finish,
-    gsk_gpu_shader_op_print,
+    gsk_gpu_uber_op_print,
 #ifdef GDK_RENDERING_VULKAN
     gsk_gpu_shader_op_vk_command,
 #endif
@@ -42,9 +49,8 @@ static const GskGpuShaderOpClass GSK_GPU_UBER_OP_CLASS = {
 #ifdef GDK_RENDERING_VULKAN
   &gsk_gpu_uber_info,
 #endif
-  gsk_gpu_uber_op_print_instance,
   gsk_gpu_uber_setup_attrib_locations,
-  gsk_gpu_uber_setup_vao,
+  gsk_gpu_uber_setup_vao
 };
 
 void

gsk/gpu/gskgpuuploadop.c

@@ -14,6 +14,7 @@
 
 #include "gdk/gdkglcontextprivate.h"
 #include "gsk/gskdebugprivate.h"
+#include "gskvec2private.h"
 
 static GskGpuOp *
 gsk_gpu_upload_op_gl_command_with_area (GskGpuOp                    *op,
@@ -52,7 +53,7 @@ gsk_gpu_upload_op_gl_command_with_area (GskGpuOp                    *op,
     {
       glTexSubImage2D (GL_TEXTURE_2D, 0, area->x, area->y, area->width, area->height, gl_format, gl_type, data);
     }
-  else if (stride % bpp == 0 && gdk_gl_context_has_feature (context, GDK_GL_FEATURE_UNPACK_SUBIMAGE))
+  else if (stride % bpp == 0 && gdk_gl_context_has_unpack_subimage (context))
     {
       glPixelStorei (GL_UNPACK_ROW_LENGTH, stride / bpp);
 
@@ -465,8 +466,8 @@ gsk_gpu_upload_cairo_op (GskGpuFrame           *frame,
   self->image = gsk_gpu_device_create_upload_image (gsk_gpu_frame_get_device (frame),
                                                     FALSE,
                                                     GDK_MEMORY_DEFAULT,
-                                                    ceil (graphene_vec2_get_x (scale) * viewport->size.width),
-                                                    ceil (graphene_vec2_get_y (scale) * viewport->size.height));
+                                                    ceil (gsk_vec2_get_x (scale) * viewport->size.width),
+                                                    ceil (gsk_vec2_get_y (scale) * viewport->size.height));
   self->viewport = *viewport;
   self->func = func;
   self->user_data = user_data;

gsk/gpu/gsknglrenderer.c

@@ -72,6 +72,11 @@ gsk_ngl_renderer_create_context (GskGpuRenderer       *renderer,
    */
   *supported &= ~GSK_GPU_OPTIMIZE_UBER;
 
+  if (!gdk_gl_context_check_version (context, "4.2", "9.9") &&
+      !epoxy_has_gl_extension ("GL_EXT_base_instance") &&
+      !epoxy_has_gl_extension ("GL_ARB_base_instance"))
+    *supported &= ~GSK_GPU_OPTIMIZE_GL_BASE_INSTANCE;
+
   return GDK_DRAW_CONTEXT (context);
 }
 
@@ -114,6 +119,13 @@ gsk_ngl_renderer_get_backbuffer (GskGpuRenderer *renderer)
   return self->backbuffer;
 }
 
+static void
+gsk_ngl_renderer_wait (GskGpuRenderer  *self,
+                       GskGpuFrame    **frame,
+                       gsize            n_frames)
+{
+}
+
 static double
 gsk_ngl_renderer_get_scale (GskGpuRenderer *self)
 {
@@ -152,6 +164,7 @@ gsk_ngl_renderer_class_init (GskNglRendererClass *klass)
   gpu_renderer_class->create_context = gsk_ngl_renderer_create_context;
   gpu_renderer_class->make_current = gsk_ngl_renderer_make_current;
   gpu_renderer_class->get_backbuffer = gsk_ngl_renderer_get_backbuffer;
+  gpu_renderer_class->wait = gsk_ngl_renderer_wait;
   gpu_renderer_class->get_scale = gsk_ngl_renderer_get_scale;
   gpu_renderer_class->get_dmabuf_formats = gsk_ngl_renderer_get_dmabuf_formats;
 

gsk/gpu/gskvulkanframe.c

@@ -74,21 +74,6 @@ gsk_vulkan_frame_is_busy (GskGpuFrame *frame)
   return vkGetFenceStatus (device, self->vk_fence) == VK_NOT_READY;
 }
 
-static void
-gsk_vulkan_frame_wait (GskGpuFrame *frame)
-{
-  GskVulkanFrame *self = GSK_VULKAN_FRAME (frame);
-  VkDevice vk_device;
-
-  vk_device = gsk_vulkan_device_get_vk_device (GSK_VULKAN_DEVICE (gsk_gpu_frame_get_device (frame)));
-
-  GSK_VK_CHECK (vkWaitForFences, vk_device,
-                                 1,
-                                 &self->vk_fence,
-                                 VK_FALSE,
-                                 INT64_MAX);
-}
-
 static void
 gsk_vulkan_frame_setup (GskGpuFrame *frame)
 {
@@ -402,7 +387,6 @@ gsk_vulkan_frame_class_init (GskVulkanFrameClass *klass)
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
   gpu_frame_class->is_busy = gsk_vulkan_frame_is_busy;
-  gpu_frame_class->wait = gsk_vulkan_frame_wait;
   gpu_frame_class->setup = gsk_vulkan_frame_setup;
   gpu_frame_class->cleanup = gsk_vulkan_frame_cleanup;
   gpu_frame_class->upload_texture = gsk_vulkan_frame_upload_texture;

gsk/gpu/gskvulkanrenderer.c

@@ -129,6 +129,31 @@ gsk_vulkan_renderer_get_backbuffer (GskGpuRenderer *renderer)
   return self->targets[gdk_vulkan_context_get_draw_index (context)];
 }
 
+static void
+gsk_vulkan_renderer_wait (GskGpuRenderer  *renderer,
+                          GskGpuFrame    **frames,
+                          gsize            n_frames)
+{
+  VkFence *fences;
+  VkDevice vk_device;
+  gsize i;
+
+  vk_device = gsk_vulkan_device_get_vk_device (GSK_VULKAN_DEVICE (gsk_gpu_renderer_get_device (renderer)));
+
+  fences = g_alloca (sizeof (VkFence) * n_frames);
+
+  for (i = 0; i < n_frames; i++)
+    {
+      fences[i] = gsk_vulkan_frame_get_vk_fence (GSK_VULKAN_FRAME (frames[i]));
+    }
+
+  GSK_VK_CHECK (vkWaitForFences, vk_device,
+                                 n_frames,
+                                 fences,
+                                 VK_FALSE,
+                                 INT64_MAX);
+}
+
 static GdkDmabufFormats *
 gsk_vulkan_renderer_get_dmabuf_formats (GskGpuRenderer *renderer)
 {
@@ -164,6 +189,7 @@ gsk_vulkan_renderer_class_init (GskVulkanRendererClass *klass)
   gpu_renderer_class->create_context = gsk_vulkan_renderer_create_context;
   gpu_renderer_class->make_current = gsk_vulkan_renderer_make_current;
   gpu_renderer_class->get_backbuffer = gsk_vulkan_renderer_get_backbuffer;
+  gpu_renderer_class->wait = gsk_vulkan_renderer_wait;
   gpu_renderer_class->get_dmabuf_formats = gsk_vulkan_renderer_get_dmabuf_formats;
 
   renderer_class->unrealize = gsk_vulkan_renderer_unrealize;

gsk/gskdebug.c

@@ -5,13 +5,16 @@
 
 static const GdkDebugKey gsk_debug_keys[] = {
   { "renderer", GSK_DEBUG_RENDERER, "General renderer information" },
+  { "opengl", GSK_DEBUG_OPENGL, "OpenGL renderer information" },
   { "vulkan", GSK_DEBUG_VULKAN, "Vulkan renderer information" },
   { "shaders", GSK_DEBUG_SHADERS, "Information about shaders" },
+  { "surface", GSK_DEBUG_SURFACE, "Information about surfaces" },
   { "fallback", GSK_DEBUG_FALLBACK, "Information about fallback usage in renderers" },
   { "glyphcache", GSK_DEBUG_GLYPH_CACHE, "Information about glyph caching" },
   { "verbose", GSK_DEBUG_VERBOSE, "Print verbose output while rendering" },
   { "geometry", GSK_DEBUG_GEOMETRY, "Show borders (when using cairo)" },
   { "full-redraw", GSK_DEBUG_FULL_REDRAW, "Force full redraws" },
+  { "sync", GSK_DEBUG_SYNC, "Sync after each frame" },
   { "staging", GSK_DEBUG_STAGING, "Use a staging image for texture upload (Vulkan only)" },
   { "offload-disable", GSK_DEBUG_OFFLOAD_DISABLE, "Disable graphics offload" },
   { "cairo", GSK_DEBUG_CAIRO, "Overlay error pattern over Cairo drawing (finds fallbacks)" },

gsk/gskdebugprivate.h

@@ -7,17 +7,20 @@ G_BEGIN_DECLS
 
 typedef enum {
   GSK_DEBUG_RENDERER              = 1 <<  0,
+  GSK_DEBUG_OPENGL                = 1 <<  1,
   GSK_DEBUG_SHADERS               = 1 <<  2,
-  GSK_DEBUG_VULKAN                = 1 <<  3,
-  GSK_DEBUG_FALLBACK              = 1 <<  4,
-  GSK_DEBUG_GLYPH_CACHE           = 1 <<  5,
-  GSK_DEBUG_VERBOSE               = 1 <<  6,
+  GSK_DEBUG_SURFACE               = 1 <<  3,
+  GSK_DEBUG_VULKAN                = 1 <<  4,
+  GSK_DEBUG_FALLBACK              = 1 <<  5,
+  GSK_DEBUG_GLYPH_CACHE           = 1 <<  6,
+  GSK_DEBUG_VERBOSE               = 1 <<  7,
   /* flags below may affect behavior */
-  GSK_DEBUG_GEOMETRY              = 1 <<  7,
-  GSK_DEBUG_FULL_REDRAW           = 1 <<  8,
-  GSK_DEBUG_STAGING               = 1 << 10,
-  GSK_DEBUG_OFFLOAD_DISABLE       = 1 << 11,
-  GSK_DEBUG_CAIRO                 = 1 << 12,
+  GSK_DEBUG_GEOMETRY              = 1 <<  8,
+  GSK_DEBUG_FULL_REDRAW           = 1 <<  9,
+  GSK_DEBUG_SYNC                  = 1 << 10,
+  GSK_DEBUG_STAGING               = 1 << 11,
+  GSK_DEBUG_OFFLOAD_DISABLE       = 1 << 12,
+  GSK_DEBUG_CAIRO                 = 1 << 13,
 } GskDebugFlags;
 
 #define GSK_DEBUG_ANY ((1 << 13) - 1)

gsk/gskpointprivate.h

@@ -0,0 +1,20 @@
+#pragma once
+
+#include <graphene.h>
+
+static inline void G_GNUC_PURE
+gsk_point_interpolate (const graphene_point_t *p1,
+                       const graphene_point_t *p2,
+                       float t,
+                       graphene_point_t *p)
+{
+  p->x = p1->x * (1 - t) + p2->x * t;
+  p->Y = p1->y * (1 - t) + p2->y * t;
+}
+
+static inline float G_GNUC_PURE
+gsk_point_distance (const graphene_point_t *p1,
+                    const graphene_point_t *p2)
+{
+  return sqrtf ((p1->x - p2->x)*(p1->x - p2->x) + (p1->y - p2->y)*(p1->y - p2->y));
+}

gsk/gskvec2private.h

@@ -0,0 +1,43 @@
+#pragma once
+
+#include <graphene.h>
+#include <math.h>
+
+static inline float
+gsk_vec2_get_x (const graphene_vec2_t *v)
+{
+  return graphene_simd4f_get_x (v->__graphene_private_value);
+}
+
+static inline float
+gsk_vec2_get_y (const graphene_vec2_t *v)
+{
+  return graphene_simd4f_get_y (v->__graphene_private_value);
+}
+
+static inline graphene_vec2_t *
+gsk_vec2_init (graphene_vec2_t *v,
+               float            x,
+               float            y)
+{
+  v->__graphene_private_value = graphene_simd4f_init (x, y, 0.f, 0.f);
+
+  return v;
+}
+
+static inline void
+gsk_vec2_multiply (const graphene_vec2_t *a,
+                   const graphene_vec2_t *b,
+                   graphene_vec2_t       *res)
+{
+  res->__graphene_private_value = graphene_simd4f_mul (a->__graphene_private_value,
+                                                       b->__graphene_private_value);
+}
+
+static inline bool
+gsk_vec2_equal (const graphene_vec2_t *v1,
+                const graphene_vec2_t *v2)
+{
+  return graphene_simd4f_cmp_eq (v1->__graphene_private_value, v2->__graphene_private_value);
+}
+

gtk/a11y/gtkatspicomponent.c

@@ -86,8 +86,6 @@ translate_coordinates_to_accessible (GtkAccessible  *accessible,
       parent = gtk_accessible_get_accessible_parent (accessible);
       while (parent != NULL)
         {
-          g_object_unref (parent);
-
           if (gtk_accessible_get_bounds (parent, &x, &y, &width, &height))
             {
               *xo = *xo - x;
@@ -140,8 +138,6 @@ translate_coordinates_from_accessible (GtkAccessible *accessible,
       parent = gtk_accessible_get_accessible_parent (accessible);
       while (parent != NULL)
         {
-          g_object_unref (parent);
-
           if (gtk_accessible_get_bounds (parent, &x, &y, &width, &height))
             {
               *xo = *xo + x;
@@ -176,7 +172,6 @@ accessible_at_point (GtkAccessible *parent,
        child = gtk_accessible_get_next_accessible_sibling (child))
     {
       GtkAccessible *found = accessible_at_point (child, x - px, y - py, FALSE);
-      g_object_unref (child);
       if (found)
         result = found;
     }

gtk/a11y/gtkatspisocket.c

@@ -183,7 +183,6 @@ gtk_at_spi_socket_get_bounds (GtkAccessible *accessible,
                               int           *height)
 {
   GtkAccessible *accessible_parent;
-  gboolean res = FALSE;
 
   g_assert (GTK_IS_AT_SPI_SOCKET (accessible));
 
@@ -191,11 +190,7 @@ gtk_at_spi_socket_get_bounds (GtkAccessible *accessible,
   if (accessible_parent == NULL)
     return FALSE;
 
-  res = gtk_accessible_get_bounds (accessible_parent, x, y, width, height);
-
-  g_object_unref (accessible_parent);
-
-  return res;
+  return gtk_accessible_get_bounds (accessible_parent, x, y, width, height);
 }
 
 static void

gtk/gtkaccessible.c

@@ -1087,7 +1087,6 @@ gtk_accessible_platform_changed (GtkAccessible               *self,
 
       if (parent != NULL)
         {
-          g_clear_object (&context);
           context = gtk_accessible_get_at_context (parent);
           g_object_unref (parent);
         }

gtk/gtkatcontext.c

@@ -541,7 +541,6 @@ gtk_at_context_set_accessible_parent (GtkATContext *self,
           parent_context = get_parent_context (self);
           if (parent_context && parent_context->realized)
             gtk_at_context_realize (self);
-          g_clear_object (&parent_context);
         }
     }
 }

gtk/gtkglarea.c

@@ -776,7 +776,7 @@ gtk_gl_area_snapshot (GtkWidget   *widget,
       priv->texture = NULL;
       priv->textures = g_list_prepend (priv->textures, texture);
 
-      if (gdk_gl_context_has_feature (priv->context, GDK_GL_FEATURE_SYNC))
+      if (gdk_gl_context_has_sync (priv->context))
         sync = glFenceSync (GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
 
       gdk_gl_texture_builder_set_sync (texture->builder, sync);

gtk/gtktextview.c

@@ -8754,11 +8754,11 @@ gtk_text_view_retrieve_surrounding_handler (GtkIMContext  *context,
   gboolean flip;
 
   gtk_text_buffer_get_iter_at_mark (text_view->priv->buffer, &start,
-                                    gtk_text_buffer_get_selection_bound (text_view->priv->buffer));
-  gtk_text_buffer_get_iter_at_mark (text_view->priv->buffer, &end,
                                     gtk_text_buffer_get_insert (text_view->priv->buffer));
+  gtk_text_buffer_get_iter_at_mark (text_view->priv->buffer, &end,
+                                    gtk_text_buffer_get_selection_bound (text_view->priv->buffer));
 
-  flip = gtk_text_iter_compare (&start, &end) > 0;
+  flip = gtk_text_iter_compare (&start, &end) < 0;
 
   gtk_text_iter_order (&start, &end);
 
@@ -8784,13 +8784,13 @@ gtk_text_view_retrieve_surrounding_handler (GtkIMContext  *context,
 
   if (flip)
     {
-      cursor_pos = strlen (pre);
-      anchor_pos = cursor_pos + strlen (sel);
+      anchor_pos = strlen (pre);
+      cursor_pos = anchor_pos + strlen (sel);
     }
   else
     {
-      anchor_pos = strlen (pre);
-      cursor_pos = anchor_pos + strlen (sel);
+      cursor_pos = strlen (pre);
+      anchor_pos = cursor_pos + strlen (sel);
     }
 
   text = g_strconcat (pre, sel, post, NULL);

gtk/inspector/logs.c

@@ -62,8 +62,10 @@ struct _GtkInspectorLogs
 
   GtkWidget *renderer;
   GtkWidget *cairo;
+  GtkWidget *opengl_gsk;
   GtkWidget *vulkan_gsk;
   GtkWidget *shaders;
+  GtkWidget *surface;
   GtkWidget *glyphcache;
   GtkWidget *verbose;
 
@@ -141,8 +143,10 @@ flag_toggled (GtkWidget        *button,
   flags = gsk_get_debug_flags ();
   update_flag (logs->renderer, &flags, GSK_DEBUG_RENDERER);
   update_flag (logs->cairo, &flags, GSK_DEBUG_CAIRO);
+  update_flag (logs->opengl_gsk, &flags, GSK_DEBUG_OPENGL);
   update_flag (logs->vulkan_gsk, &flags, GSK_DEBUG_VULKAN);
   update_flag (logs->shaders, &flags, GSK_DEBUG_SHADERS);
+  update_flag (logs->surface, &flags, GSK_DEBUG_SURFACE);
   update_flag (logs->glyphcache, &flags, GSK_DEBUG_GLYPH_CACHE);
   update_flag (logs->verbose, &flags, GSK_DEBUG_VERBOSE);
   gsk_set_debug_flags (flags);
@@ -203,8 +207,10 @@ gtk_inspector_logs_class_init (GtkInspectorLogsClass *klass)
 
   gtk_widget_class_bind_template_child (widget_class, GtkInspectorLogs, renderer);
   gtk_widget_class_bind_template_child (widget_class, GtkInspectorLogs, cairo);
+  gtk_widget_class_bind_template_child (widget_class, GtkInspectorLogs, opengl_gsk);
   gtk_widget_class_bind_template_child (widget_class, GtkInspectorLogs, vulkan_gsk);
   gtk_widget_class_bind_template_child (widget_class, GtkInspectorLogs, shaders);
+  gtk_widget_class_bind_template_child (widget_class, GtkInspectorLogs, surface);
   gtk_widget_class_bind_template_child (widget_class, GtkInspectorLogs, glyphcache);
   gtk_widget_class_bind_template_child (widget_class, GtkInspectorLogs, verbose);
 

gtk/inspector/logs.ui

@@ -128,6 +128,12 @@
                 <signal name="toggled" handler="flag_toggled"/>
               </object>
             </child>
+            <child>
+              <object class="GtkCheckButton" id="opengl_gsk">
+                <property name="label">OpenGL</property>
+                <signal name="toggled" handler="flag_toggled"/>
+              </object>
+            </child>
             <child>
               <object class="GtkCheckButton" id="vulkan_gsk">
                 <property name="label">Vulkan</property>
@@ -140,6 +146,12 @@
                 <signal name="toggled" handler="flag_toggled"/>
               </object>
             </child>
+            <child>
+              <object class="GtkCheckButton" id="surface">
+                <property name="label">Surface</property>
+                <signal name="toggled" handler="flag_toggled"/>
+              </object>
+            </child>
             <child>
               <object class="GtkCheckButton" id="glyphcache">
                 <property name="label">Glyph Cache</property>

modules/printbackends/gtkprintbackendcups.c

@@ -3639,19 +3639,6 @@ avahi_request_printer_list (GtkPrintBackendCups *cups_backend)
   g_bus_get (G_BUS_TYPE_SYSTEM, cups_backend->avahi_cancellable, avahi_create_browsers, cups_backend);
 }
 
-/*
- * Print backend can be disposed together with all its printers
- * as a reaction to user stopping enumeration of printers.
- */
-static void
-backend_finalized_cb (gpointer  data,
-                      GObject  *where_the_object_was)
-{
-  gboolean *backend_finalized = data;
-
-  *backend_finalized = TRUE;
-}
-
 static void
 cups_request_printer_list_cb (GtkPrintBackendCups *cups_backend,
                               GtkCupsResult       *result,
@@ -3664,7 +3651,6 @@ cups_request_printer_list_cb (GtkPrintBackendCups *cups_backend,
   GList *removed_printer_checklist;
   char *remote_default_printer = NULL;
   GList *iter;
-  gboolean backend_finalized = FALSE;
 
   list_has_changed = FALSE;
 
@@ -3697,8 +3683,6 @@ cups_request_printer_list_cb (GtkPrintBackendCups *cups_backend,
    */
   removed_printer_checklist = gtk_print_backend_get_printer_list (backend);
 
-  g_object_weak_ref (G_OBJECT (backend), backend_finalized_cb, &backend_finalized);
-
   response = gtk_cups_result_get_response (result);
   for (attr = ippFirstAttribute (response); attr != NULL;
        attr = ippNextAttribute (response))
@@ -3816,9 +3800,6 @@ cups_request_printer_list_cb (GtkPrintBackendCups *cups_backend,
         {
 	  g_signal_emit_by_name (backend, "printer-added", printer);
 
-          if (backend_finalized)
-            break;
-
 	  gtk_printer_set_is_new (printer, FALSE);
         }
 
@@ -3856,44 +3837,36 @@ cups_request_printer_list_cb (GtkPrintBackendCups *cups_backend,
         break;
     }
 
-  if (!backend_finalized)
+  /* look at the removed printers checklist and mark any printer
+     as inactive if it is in the list, emitting a printer_removed signal */
+  if (removed_printer_checklist != NULL)
     {
-      g_object_weak_unref (G_OBJECT (backend), backend_finalized_cb, &backend_finalized);
-
-      /* look at the removed printers checklist and mark any printer
-         as inactive if it is in the list, emitting a printer_removed signal */
-      if (removed_printer_checklist != NULL)
+      for (iter = removed_printer_checklist; iter; iter = iter->next)
         {
-          for (iter = removed_printer_checklist; iter; iter = iter->next)
+          if (!GTK_PRINTER_CUPS (iter->data)->avahi_browsed)
             {
-              if (!GTK_PRINTER_CUPS (iter->data)->avahi_browsed)
-                {
-                  mark_printer_inactive (GTK_PRINTER (iter->data), backend);
-                  list_has_changed = TRUE;
-                }
+              mark_printer_inactive (GTK_PRINTER (iter->data), backend);
+              list_has_changed = TRUE;
             }
         }
-    }
 
-  g_list_free (removed_printer_checklist);
+      g_list_free (removed_printer_checklist);
+    }
 
 done:
-  if (!backend_finalized)
+  if (list_has_changed)
+    g_signal_emit_by_name (backend, "printer-list-changed");
+
+  gtk_print_backend_set_list_done (backend);
+
+  if (!cups_backend->got_default_printer && remote_default_printer != NULL)
     {
-      if (list_has_changed)
-        g_signal_emit_by_name (backend, "printer-list-changed");
-
-      gtk_print_backend_set_list_done (backend);
-
-      if (!cups_backend->got_default_printer && remote_default_printer != NULL)
-        {
-          set_default_printer (cups_backend, remote_default_printer);
-          g_free (remote_default_printer);
-        }
-
-      if (!cups_backend->got_default_printer && cups_backend->avahi_default_printer != NULL)
-        set_default_printer (cups_backend, cups_backend->avahi_default_printer);
+      set_default_printer (cups_backend, remote_default_printer);
+      g_free (remote_default_printer);
     }
+
+  if (!cups_backend->got_default_printer && cups_backend->avahi_default_printer != NULL)
+    set_default_printer (cups_backend, cups_backend->avahi_default_printer);
 }
 
 static void

testsuite/gdk/gltexture.c

@@ -179,7 +179,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS
 
   id = make_gl_texture (context, surface);
 
-  if (gdk_gl_context_has_feature (context, GDK_GL_FEATURE_SYNC))
+  if (gdk_gl_context_has_sync (context))
     sync = glFenceSync (GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
   else
     sync = NULL;

testsuite/gsk/compare-render.c

@@ -339,9 +339,6 @@ main (int argc, char **argv)
 
   g_option_context_free (context);
 
-  if (!plain && !flip && !rotate && !repeat && !mask && !replay && !clip && !colorflip)
-    plain = TRUE;
-
   gtk_init ();
 
   node_file = argv[1];

testsuite/gsk/compare/reuse-of-texture-nested-in-offscreens.node

@@ -1,28 +0,0 @@
-clip {
-  clip: 0 0 12 8;
-  child: color-matrix "node1" {
-    matrix: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 255);
-    child: shadow "node2" {
-      shadows: rgb(255,0,0) 0 0 10;
-      child: texture "node3" {
-        bounds: 0 0 20 20;
-        texture: "texture1" url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABkAAAAZCAYAAADE6YVjAAAAOUlEQVRIiWNk+M/wn4HGgInWFoxa\
-QjJgwSrKyMBItolYEtLwCa5RS0YtGbVk1JKhaAnjaB0/Mi0BALtiBi9IMFUcAAAAAElFTkSuQmCC\
-\
-");
-      }
-    }
-  }
-}
-clip {
-  clip: 0 8 8 12;
-  child: "node1";
-}
-clip {
-  clip: 8 12 12 8;
-  child: "node1";
-}
-clip {
-  clip: 12 0 8 12;
-  child: "node1";
-}

testsuite/gsk/meson.build

@@ -136,7 +136,6 @@ compare_render_tests = [
   'repeat-scaling',
   'repeat-texture',
   'repeating-gradient-scaled',
-  'reuse-of-texture-nested-in-offscreens',
   'rounded-clip-with-huge-bounds-nogl',
   'scale-textures-negative-ngl',
   'scale-up-down',

testsuite/gtk/imcontext.c

@@ -73,10 +73,9 @@ test_textview_surrounding (void)
   GtkTextBuffer *buffer;
   GtkTextIter iter;
   GtkTextIter start, end;
-  GtkTextIter bound, insert;
   gboolean ret;
   char *text;
-  int anchor_pos, cursor_pos;
+  int cursor_pos, selection_bound;
 
   widget = gtk_text_view_new ();
   controller = gtk_text_view_get_key_controller (GTK_TEXT_VIEW (widget));
@@ -90,12 +89,12 @@ test_textview_surrounding (void)
   ret = gtk_im_context_get_surrounding_with_selection (context,
                                                        &text,
                                                        &cursor_pos,
-                                                       &anchor_pos);
+                                                       &selection_bound);
 
   g_assert_true (ret);
   g_assert_cmpstr (text, ==, "abcd\nefgh\nijkl");
   g_assert_cmpint (cursor_pos, ==, 7);
-  g_assert_cmpint (anchor_pos, ==, 7);
+  g_assert_cmpint (selection_bound, ==, 7);
 
   g_free (text);
 
@@ -123,19 +122,19 @@ test_textview_surrounding (void)
 
   buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (widget));
   gtk_text_buffer_set_text (buffer, "ab cd\nef gh\nijkl", -1);
-  gtk_text_buffer_get_iter_at_line_offset (buffer, &bound, 1, 4);
-  gtk_text_buffer_get_iter_at_line_offset (buffer, &insert, 2, 2);
-  gtk_text_buffer_select_range (buffer, &insert, &bound);
+  gtk_text_buffer_get_iter_at_line_offset (buffer, &start, 1, 4);
+  gtk_text_buffer_get_iter_at_line_offset (buffer, &end, 2, 2);
+  gtk_text_buffer_select_range (buffer, &start, &end);
 
   ret = gtk_im_context_get_surrounding_with_selection (context,
                                                        &text,
                                                        &cursor_pos,
-                                                       &anchor_pos);
+                                                       &selection_bound);
 
   g_assert_true (ret);
   g_assert_cmpstr (text, ==, "cd\nef gh\nijkl");
-  g_assert_cmpint (anchor_pos, ==, 7);
   g_assert_cmpint (cursor_pos, ==, 11);
+  g_assert_cmpint (selection_bound, ==, 7);
 
   g_free (text);
 

testsuite/tools/validate

@@ -4,9 +4,6 @@ GTK_BUILDER_TOOL=${GTK_BUILDER_TOOL:-gtk4-builder-tool}
 TEST_DATA_DIR=${G_TEST_SRCDIR:-.}/validate-data
 TEST_RESULT_DIR=${TEST_RESULT_DIR:-/tmp}/validate
 
-# https://gitlab.freedesktop.org/mesa/mesa/-/issues/10293
-export LIBGL_ALWAYS_SOFTWARE=true
-
 mkdir -p "$TEST_RESULT_DIR"
 
 shopt -s nullglob