Bump pango req to 1.49.1

We are using pango api that was introduced in 1.49.1 without ifdefs, so we should require it.
Avoid hand-rolled color glyph information
2021-09-04 09:41:20 -04:00 · 2021-09-04 09:39:29 -04:00 · 2021-09-04 09:37:29 -04:00 · 2021-09-04 09:37:01 -04:00
91 changed files with 26549 additions and 30543 deletions
@@ -0,0 +1,286 @@
+/* always defined to indicate that i18n is enabled */
+#define ENABLE_NLS 1
+
+/* Use structured logging */
+#define G_LOG_STRUCTURED 1
+
+/* The prefix for our gettext translation domains. */
+#mesondefine GETTEXT_PACKAGE
+
+/* Disable deprecation warnings from glib */
+#mesondefine GLIB_DISABLE_DEPRECATION_WARNINGS
+
+/* Define the location where the catalogs will be installed */
+#mesondefine GTK_LOCALEDIR
+
+/* Define to 1 if you have the `bind_textdomain_codeset' function. */
+#mesondefine HAVE_BIND_TEXTDOMAIN_CODESET
+
+/* Have the cloudproviders library */
+#mesondefine HAVE_CLOUDPROVIDERS
+
+/* define if we have colord */
+#mesondefine HAVE_COLORD
+
+/* Define to 1 if you have the <crt_externs.h> header file. */
+#mesondefine HAVE_CRT_EXTERNS_H
+
+/* Define to 1 if you have the `dcgettext' function. */
+#mesondefine HAVE_DCGETTEXT
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#mesondefine HAVE_DLFCN_H
+
+/* Have the ffmpeg library */
+#mesondefine HAVE_FFMPEG
+
+/* Define to 1 if you have the <ftw.h> header file. */
+#mesondefine HAVE_FTW_H
+
+/* Define to 1 if you have the `getpagesize' function. */
+#mesondefine HAVE_GETPAGESIZE
+
+/* Define to 1 if you have the `getresuid' function. */
+#mesondefine HAVE_GETRESUID
+
+/* Define if gio-unix is available */
+#mesondefine HAVE_GIO_UNIX
+
+/* Define if GStreamer support is available */
+#mesondefine HAVE_GSTREAMER
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#mesondefine HAVE_INTTYPES_H
+
+/* Define to 1 if the system has the type `IPrintDialogCallback'. */
+#mesondefine HAVE_IPRINTDIALOGCALLBACK
+
+/* Define to 1 if you have the <locale.h> header file. */
+#mesondefine HAVE_LOCALE_H
+
+/* Define to 1 if you have the `lstat' function. */
+#mesondefine HAVE_LSTAT
+
+/* Define to 1 if you have the `mallinfo' function. */
+#mesondefine HAVE_MALLINFO
+
+/* Define to 1 if you have the <memory.h> header file. */
+#mesondefine HAVE_MEMORY_H
+
+/* Define to 1 if you have the `mkstemp' function. */
+#mesondefine HAVE_MKSTEMP
+
+/* Define to 1 if you have the `mlock` function. */
+#mesondefine HAVE_MLOCK
+
+/* Define to 1 if you have a working `mmap' system call. */
+#mesondefine HAVE_MMAP
+
+/* Define to 1 if you have a working `madvise' system call. */
+#mesondefine HAVE_MADVISE
+
+/* Define to 1 if you have the `posix_fallocate' function. */
+#mesondefine HAVE_POSIX_FALLOCATE
+
+/* Have the Xrandr extension library */
+#mesondefine HAVE_RANDR
+
+/* Have the Xrandr 1.5 extension library */
+#mesondefine HAVE_RANDR15
+
+/* Define to 1 if you have the `sincos' function. */
+#mesondefine HAVE_SINCOS
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#mesondefine HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#mesondefine HAVE_STDLIB_H
+
+/* Define to 1 if you have the <strings.h> header file. */
+#mesondefine HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#mesondefine HAVE_STRING_H
+
+/* Define to 1 if you have the <sys/mman.h> header file. */
+#mesondefine HAVE_SYS_MMAN_H
+
+/* Define to 1 if you have the <sys/param.h> header file. */
+#mesondefine HAVE_SYS_PARAM_H
+
+/* Have the sysprof-capture library */
+#mesondefine HAVE_SYSPROF
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#mesondefine HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/time.h> header file. */
+#mesondefine HAVE_SYS_TIME_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#mesondefine HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#mesondefine HAVE_UNISTD_H
+
+/* Have the Xcursor library */
+#mesondefine HAVE_XCURSOR
+
+/* Have the XDAMAGE X extension */
+#mesondefine HAVE_XDAMAGE
+
+/* Have the XFIXES X extension */
+#mesondefine HAVE_XFIXES
+
+/* Define to 1 if XFree Xinerama is available */
+#mesondefine HAVE_XFREE_XINERAMA
+
+/* Have XGenericEvent */
+#mesondefine HAVE_XGENERICEVENTS
+
+/* Define to use XKB extension */
+#mesondefine HAVE_XKB
+
+/* Have the SYNC extension library */
+#mesondefine HAVE_XSYNC
+
+/* Define to 1 if you have the `_lock_file' function */
+#mesondefine HAVE__LOCK_FILE
+
+/* Define to 1 if you have the `flockfile' function */
+#mesondefine HAVE_FLOCKFILE
+
+/* Define if _NL_MEASUREMENT_MEASUREMENT is available */
+#mesondefine HAVE__NL_MEASUREMENT_MEASUREMENT
+
+/* Define if _NL_PAPER_HEIGHT is available */
+#mesondefine HAVE__NL_PAPER_HEIGHT
+
+/* Define if _NL_PAPER_WIDTH is available */
+#mesondefine HAVE__NL_PAPER_WIDTH
+
+/* Define if _NL_TIME_FIRST_WEEKDAY is available */
+#mesondefine HAVE__NL_TIME_FIRST_WEEKDAY
+
+/* Define to the sub-directory where libtool stores uninstalled libraries. */
+#mesondefine LT_OBJDIR
+
+/* Define to 1 if your C compiler doesn't accept -c and -o together. */
+#mesondefine NO_MINUS_C_MINUS_O
+
+/* Define to the address where bug reports for this package should be sent. */
+#mesondefine PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#mesondefine PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#mesondefine PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#mesondefine PACKAGE_TARNAME
+
+/* Define to the home page for this package. */
+#mesondefine PACKAGE_URL
+
+/* Define to the version of this package. */
+#mesondefine PACKAGE_VERSION
+
+/* Use NSBundle functions to determine load paths for libraries, translations,
+   etc. */
+#mesondefine QUARTZ_RELOCATION
+
+/* Define to 1 if you have the ANSI C header files. */
+#mesondefine STDC_HEADERS
+
+/* Enable extensions on AIX 3, Interix.  */
+#ifndef _ALL_SOURCE
+# undef _ALL_SOURCE
+#endif
+/* Enable GNU extensions on systems that have them.  */
+#ifndef _GNU_SOURCE
+# undef _GNU_SOURCE
+#endif
+/* Enable threading extensions on Solaris.  */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
+#endif
+/* Enable extensions on HP NonStop.  */
+#ifndef _TANDEM_SOURCE
+# undef _TANDEM_SOURCE
+#endif
+/* Enable general extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
+
+
+/* Define to 1 if XInput 2.2 is available */
+#mesondefine XINPUT_2_2
+
+/* Define to 1 if the X Window System is missing or not being used. */
+#mesondefine X_DISPLAY_MISSING
+
+/* Enable large inode numbers on Mac OS X 10.5.  */
+#ifndef _DARWIN_USE_64_BIT_INODE
+# define _DARWIN_USE_64_BIT_INODE 1
+#endif
+
+/* Number of bits in a file offset, on hosts where this is settable. */
+#mesondefine _FILE_OFFSET_BITS
+
+/* defines how to decorate public symbols while building */
+#mesondefine _GDK_EXTERN
+
+/* Define for large files, on AIX-style hosts. */
+#mesondefine _LARGE_FILES
+
+/* Define to 1 if on MINIX. */
+#mesondefine _MINIX
+
+/* Define to 2 if the system does not provide POSIX.1 features except with
+   this defined. */
+#mesondefine _POSIX_1_SOURCE
+
+/* Define to 1 if you need to in order for `stat' and other things to work. */
+#mesondefine _POSIX_SOURCE
+
+/* Define to `int' if <sys/types.h> doesn't define. */
+#mesondefine gid_t
+
+/* Define to `int' if <sys/types.h> doesn't define. */
+#mesondefine uid_t
+
+/* Define to 1 if linux/memfd.h exists */
+#mesondefine HAVE_LINUX_MEMFD_H
+
+#mesondefine HAVE_LINUX_INPUT_H
+
+#mesondefine HAVE_DEV_EVDEV_INPUT_H
+
+#mesondefine GTK_SYSCONFDIR
+
+#mesondefine GTK_LOCALEDIR
+
+#mesondefine GTK_DATADIR
+
+#mesondefine GTK_LIBDIR
+
+#mesondefine GTK_PRINT_BACKENDS
+
+#mesondefine HAVE_CAIRO_SCRIPT_INTERPRETER
+
+#mesondefine HAVE_HARFBUZZ
+
+#mesondefine HAVE_PANGOFT
+
+#mesondefine ISO_CODES_PREFIX
+
+/* Define if tracker3 is available */
+#mesondefine HAVE_TRACKER3
+
+#mesondefine HAVE_F16C
+
+/* Does the OS support GDesktopAppInfo? */
+#mesondefine HAVE_DESKTOPAPPINFO
@@ -1,11 +1,6 @@
 /* Pango/Font Rendering
 *
- * Demonstrates various aspects of font rendering,
- * such as hinting, antialiasing and grid alignment.
- *
- * The demo lets you explore font rendering options
- * interactively to get a feeling for they affect the
- * shape and positioning of the glyphs.
+ * Demonstrates various aspects of font rendering.
 */

 #include <gtk/gtk.h>
@@ -22,14 +17,10 @@ static GtkWidget *down_button = NULL;
 static GtkWidget *text_radio = NULL;
 static GtkWidget *show_grid = NULL;
 static GtkWidget *show_extents = NULL;
-static GtkWidget *show_pixels = NULL;
-static GtkWidget *show_outlines = NULL;

 static PangoContext *context;

-static int scale = 7;
-static double pixel_alpha = 1.0;
-static double outline_alpha = 0.0;
+static int scale = 9;

 static void
 update_image (void)
@@ -48,7 +39,6 @@ update_image (void)
  cairo_hint_style_t hintstyle;
  cairo_hint_metrics_t hintmetrics;
  cairo_antialias_t antialias;
-  cairo_path_t *path;

  if (!context)
    context = gtk_widget_create_pango_context (image);
@@ -104,14 +94,10 @@ update_image (void)
      cairo_set_source_rgb (cr, 1, 1, 1);
      cairo_paint (cr);

-      cairo_set_source_rgba (cr, 0, 0, 0, pixel_alpha);
-
+      cairo_set_source_rgb (cr, 0, 0, 0);
      cairo_move_to (cr, 10, 10);
      pango_cairo_show_layout (cr, layout);

-      pango_cairo_layout_path (cr, layout);
-      path = cairo_copy_path (cr);
-
      cairo_destroy (cr);
      g_object_unref (layout);

@@ -150,7 +136,7 @@ update_image (void)

      if (gtk_check_button_get_active (GTK_CHECK_BUTTON (show_extents)))
        {
-          cairo_set_source_rgb (cr, 0, 0, 1);
+          cairo_set_source_rgba (cr, 0, 0, 1, 1);

          cairo_rectangle (cr,
                           scale * (10 + pango_units_to_double (logical.x)) - 0.5,
@@ -163,7 +149,7 @@ update_image (void)
          cairo_line_to (cr, scale * (10 + pango_units_to_double (logical.x + logical.width)) + 1,
                             scale * (10 + pango_units_to_double (baseline)) - 0.5);
          cairo_stroke (cr);
-          cairo_set_source_rgb (cr, 1, 0, 0);
+          cairo_set_source_rgba (cr, 1, 0, 0, 1);
          cairo_rectangle (cr,
                           scale * (10 + pango_units_to_double (pink.x)) + 0.5,
                           scale * (10 + pango_units_to_double (pink.y)) + 0.5,
@@ -172,36 +158,8 @@ update_image (void)
          cairo_stroke (cr);
        }

-      for (int i = 0; i < path->num_data; i += path->data[i].header.length)
-        {
-          cairo_path_data_t *data = &path->data[i];
-          switch (data->header.type)
-            {
-            case CAIRO_PATH_CURVE_TO:
-              data[3].point.x *= scale; data[3].point.y *= scale;
-              data[2].point.x *= scale; data[2].point.y *= scale;
-              data[1].point.x *= scale; data[1].point.y *= scale;
-              break;
-            case CAIRO_PATH_LINE_TO:
-            case CAIRO_PATH_MOVE_TO:
-              data[1].point.x *= scale; data[1].point.y *= scale;
-              break;
-            case CAIRO_PATH_CLOSE_PATH:
-              break;
-            default:
-              g_assert_not_reached ();
-            }
-        }
-
-      cairo_set_source_rgba (cr, 0, 0, 1, outline_alpha);
-      cairo_move_to (cr, scale * 20 - 0.5, scale * 20 - 0.5);
-      cairo_append_path (cr, path);
-      cairo_stroke (cr);
-
      cairo_surface_destroy (surface);
      cairo_destroy (cr);
-
-      cairo_path_destroy (path);
    }
  else
    {
@@ -209,26 +167,10 @@ update_image (void)
      PangoLayoutRun *run;
      PangoGlyphInfo *g;
      int i, j;
-      GString *str;
-      gunichar ch;
-
-      if (*text == '\0')
-        text = " ";
-
-      ch = g_utf8_get_char (text);
-
-      str = g_string_new ("");
-
-      for (i = 0; i < 4; i++)
-        {
-          g_string_append_unichar (str, ch);
-          g_string_append_unichar (str, 0x200c);
-        }

      layout = pango_layout_new (context);
      pango_layout_set_font_description (layout, desc);
-      pango_layout_set_text (layout, str->str, -1);
-      g_string_free (str, TRUE);
+      pango_layout_set_text (layout, "aaaa", -1);
      pango_layout_get_extents (layout, &ink, &logical);
      pango_extents_to_pixels (&logical, NULL);

@@ -243,7 +185,7 @@ update_image (void)
      cairo_set_source_rgb (cr, 0, 0, 0);
      for (i = 0; i < 4; i++)
        {
-          g = &(run->glyphs->glyphs[2*i]);
+          g = &(run->glyphs->glyphs[i]);
          g->geometry.width = PANGO_UNITS_ROUND (g->geometry.width * 3 / 2);
        }

@@ -251,7 +193,7 @@ update_image (void)
        {
          for (i = 0; i < 4; i++)
            {
-              g = &(run->glyphs->glyphs[2*i]);
+              g = &(run->glyphs->glyphs[i]);
              g->geometry.x_offset = i * (PANGO_SCALE / 4);
              g->geometry.y_offset = j * (PANGO_SCALE / 4);
            }
@@ -270,6 +212,7 @@ update_image (void)
      cairo_surface_destroy (surface);
    }

+
  gtk_picture_set_pixbuf (GTK_PICTURE (image), pixbuf2);

  g_object_unref (pixbuf2);
@@ -277,78 +220,6 @@ update_image (void)
  pango_font_description_free (desc);
 }

-static gboolean fading = FALSE;
-static double start_pixel_alpha;
-static double end_pixel_alpha;
-static double start_outline_alpha;
-static double end_outline_alpha;
-static gint64 start_time;
-static gint64 end_time;
-
-static double
-ease_out_cubic (double t)
-{
-  double p = t - 1;
-  return p * p * p + 1;
-}
-
-static gboolean
-change_alpha (GtkWidget     *widget,
-              GdkFrameClock *clock,
-              gpointer       user_data)
-{
-  gint64 now = g_get_monotonic_time ();
-  double t;
-
-  t = ease_out_cubic ((now - start_time) / (double) (end_time - start_time));
-
-  pixel_alpha = start_pixel_alpha + (end_pixel_alpha - start_pixel_alpha) * t;
-  outline_alpha = start_outline_alpha + (end_outline_alpha - start_outline_alpha) * t;
-
-  update_image ();
-
-  if (now >= end_time)
-    {
-      fading = FALSE;
-      return G_SOURCE_REMOVE;
-    }
-
-  return G_SOURCE_CONTINUE;
-}
-
-static void
-start_alpha_fade (void)
-{
-  gboolean pixels;
-  gboolean outlines;
-
-  if (fading)
-    return;
-
-  pixels = gtk_check_button_get_active (GTK_CHECK_BUTTON (show_pixels));
-  outlines = gtk_check_button_get_active (GTK_CHECK_BUTTON (show_outlines));
-
-  start_pixel_alpha = pixel_alpha;
-  if (pixels && outlines)
-    end_pixel_alpha = 0.5;
-  else if (pixels)
-    end_pixel_alpha = 1;
-  else
-    end_pixel_alpha = 0;
-
-  start_outline_alpha = outline_alpha;
-  if (outlines)
-    end_outline_alpha = 1.0;
-  else
-    end_outline_alpha = 0.0;
-
-  start_time = g_get_monotonic_time ();
-  end_time = start_time + G_TIME_SPAN_SECOND / 2;
-
-  fading = TRUE;
-  gtk_widget_add_tick_callback (window, change_alpha, NULL, NULL);
-}
-
 static void
 update_buttons (void)
 {
@@ -356,26 +227,20 @@ update_buttons (void)
  gtk_widget_set_sensitive (down_button, scale > 1);
 }

-static gboolean
-scale_up (GtkWidget *widget,
-          GVariant  *args,
-          gpointer   user_data)
+static void
+scale_up (void)
 {
  scale += 1;
  update_buttons ();
  update_image ();
-  return TRUE;
 }

-static gboolean
-scale_down (GtkWidget *widget,
-            GVariant  *args,
-            gpointer   user_data)
+static void
+scale_down (void)
 {
  scale -= 1;
  update_buttons ();
  update_image ();
-  return TRUE;
 }

 GtkWidget *
@@ -401,8 +266,6 @@ do_fontrendering (GtkWidget *do_widget)
      text_radio = GTK_WIDGET (gtk_builder_get_object (builder, "text_radio"));
      show_grid = GTK_WIDGET (gtk_builder_get_object (builder, "show_grid"));
      show_extents = GTK_WIDGET (gtk_builder_get_object (builder, "show_extents"));
-      show_pixels = GTK_WIDGET (gtk_builder_get_object (builder, "show_pixels"));
-      show_outlines = GTK_WIDGET (gtk_builder_get_object (builder, "show_outlines"));

      g_signal_connect (up_button, "clicked", G_CALLBACK (scale_up), NULL);
      g_signal_connect (down_button, "clicked", G_CALLBACK (scale_down), NULL);
@@ -414,8 +277,6 @@ do_fontrendering (GtkWidget *do_widget)
      g_signal_connect (text_radio, "notify::active", G_CALLBACK (update_image), NULL);
      g_signal_connect (show_grid, "notify::active", G_CALLBACK (update_image), NULL);
      g_signal_connect (show_extents, "notify::active", G_CALLBACK (update_image), NULL);
-      g_signal_connect (show_pixels, "notify::active", G_CALLBACK (start_alpha_fade), NULL);
-      g_signal_connect (show_outlines, "notify::active", G_CALLBACK (start_alpha_fade), NULL);

      update_image ();

@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
+  <object class="GtkAdjustment" id="scale_adj">
+    <property name="upper">24</property>
+    <property name="step-increment">1</property>
+    <property name="page-increment">4</property>
+  </object>
  <object class="GtkWindow" id="window">
-    <property name="default-width">1024</property>
-    <property name="default-height">768</property>
+    <property name="default-width">1080</property>
+    <property name="default-height">430</property>
    <child type="titlebar">
      <object class="GtkHeaderBar">
        <child type="title">
@@ -82,94 +87,66 @@
              </object>
            </child>
            <child>
-              <object class="GtkCheckButton" id="show_pixels">
-                <property name="label">Show _Pixels</property>
-                <property name="use-underline">1</property>
-                <property name="active">1</property>
+              <object class="GtkLabel">
+                <property name="label">Hinting</property>
+                <property name="xalign">1</property>
+                <style>
+                  <class name="dim-label"/>
+                </style>
                <layout>
                  <property name="column">3</property>
-                  <property name="row">0</property>
-                </layout>
-              </object>
-            </child>
-            <child>
-              <object class="GtkCheckButton" id="show_outlines">
-                <property name="label">Show _Outline</property>
-                <property name="use-underline">1</property>
-                <layout>
-                  <property name="column">3</property>
-                  <property name="row">1</property>
-                </layout>
-              </object>
-            </child>
-            <child>
-              <object class="GtkBox">
-                <property name="spacing">6</property>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="label">_Hinting</property>
-                    <property name="use-underline">1</property>
-                    <property name="mnemonic-widget">hinting</property>
-                    <style>
-                      <class name="dim-label"/>
-                    </style>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkComboBoxText" id="hinting">
-                    <property name="active">0</property>
-                    <property name="valign">center</property>
-                    <items>
-                      <item translatable="yes" id="none">None</item>
-                      <item translatable="yes" id="slight">Slight</item>
-                      <item translatable="yes" id="medium">Medium</item>
-                      <item translatable="yes" id="full">Full</item>
-                    </items>
-                  </object>
-                </child>
-                <layout>
-                  <property name="column">4</property>
-                  <property name="column-span">2</property>
                </layout>
              </object>
            </child>
            <child>
              <object class="GtkCheckButton" id="antialias">
-                <property name="label">_Antialias</property>
-                <property name="use-underline">1</property>
-                <property name="active">1</property>
+                <property name="label">Antialias</property>
                <layout>
-                  <property name="column">4</property>
+                  <property name="column">3</property>
                  <property name="row">1</property>
                </layout>
              </object>
            </child>
            <child>
-              <object class="GtkCheckButton" id="hint_metrics">
-                <property name="label">Hint _Metrics</property>
-                <property name="use-underline">1</property>
+              <object class="GtkComboBoxText" id="hinting">
+                <property name="active">0</property>
+                <property name="valign">center</property>
+                <items>
+                  <item translatable="yes" id="none">None</item>
+                  <item translatable="yes" id="slight">Slight</item>
+                  <item translatable="yes" id="medium">Medium</item>
+                  <item translatable="yes" id="full">Full</item>
+                </items>
                <layout>
-                  <property name="column">5</property>
+                  <property name="column">4</property>
+                </layout>
+              </object>
+            </child>
+            <child>
+              <object class="GtkCheckButton" id="hint_metrics">
+                <property name="label">Hint Metrics</property>
+                <layout>
+                  <property name="column">4</property>
                  <property name="row">1</property>
                </layout>
              </object>
            </child>
            <child>
              <object class="GtkCheckButton" id="show_extents">
-                <property name="label">Show _Extents</property>
-                <property name="use-underline">1</property>
+                <property name="label">Show Extents</property>
+                <property name="active">1</property>
                <layout>
-                  <property name="column">6</property>
+                  <property name="column">5</property>
                  <property name="row">0</property>
                </layout>
              </object>
            </child>
            <child>
              <object class="GtkCheckButton" id="show_grid">
-                <property name="label">Show _Grid</property>
-                <property name="use-underline">1</property>
+                <property name="active">1</property>
+                <property name="label">Show Grid</property>
                <layout>
-                  <property name="column">6</property>
+                  <property name="column">5</property>
                  <property name="row">1</property>
                </layout>
              </object>
@@ -180,19 +157,8 @@
                <style>
                  <class name="circular"/>
                </style>
-                <child>
-                  <object class="GtkShortcutController">
-                    <property name="scope">managed</property>
-                    <child>
-                      <object class="GtkShortcut">
-                        <property name="trigger">&lt;Control&gt;plus</property>
-                        <property name="action">activate</property>
-                      </object>
-                    </child>
-                  </object>
-                </child>
                <layout>
-                  <property name="column">7</property>
+                  <property name="column">6</property>
                  <property name="row">0</property>
                </layout>
              </object>
@@ -203,19 +169,8 @@
                <style>
                  <class name="circular"/>
                </style>
-                <child>
-                  <object class="GtkShortcutController">
-                    <property name="scope">managed</property>
-                    <child>
-                      <object class="GtkShortcut">
-                        <property name="trigger">&lt;Control&gt;minus</property>
-                        <property name="action">activate</property>
-                      </object>
-                    </child>
-                  </object>
-                </child>
                <layout>
-                  <property name="column">7</property>
+                  <property name="column">6</property>
                  <property name="row">1</property>
                </layout>
              </object>
@@ -224,7 +179,7 @@
              <object class="GtkLabel">
                <property name="hexpand">1</property>
                <layout>
-                  <property name="column">8</property>
+                  <property name="column">7</property>
                </layout>
              </object>
            </child>
@@ -50,7 +50,7 @@ cairo_region_t *
           gdk_cairo_region_create_from_surface
                                        (cairo_surface_t      *surface);

-GDK_DEPRECATED_IN_4_6_FOR(gdk_gl_texture_new)
+GDK_AVAILABLE_IN_ALL
 void       gdk_cairo_draw_from_gl (cairo_t              *cr,
                                   GdkSurface            *surface,
                                   int                   source,
@@ -25,8 +25,6 @@
 #include "filetransferportalprivate.h"
 #include "gdktexture.h"
 #include "gdkrgbaprivate.h"
-#include "loaders/gdkpngprivate.h"
-#include "loaders/gdktiffprivate.h"

 #include <gdk-pixbuf/gdk-pixbuf.h>

@@ -657,88 +655,6 @@ pixbuf_deserializer (GdkContentDeserializer *deserializer)
                                    deserializer);
 }

-static void
-texture_deserializer_finish (GObject      *source,
-                             GAsyncResult *res,
-                             gpointer      data)
-{
-  GdkContentDeserializer *deserializer = GDK_CONTENT_DESERIALIZER (source);
-  GdkTexture *texture;
-  GValue *value;
-  GError *error = NULL;
-
-  texture = g_task_propagate_pointer (G_TASK (res), &error);
-  if (texture == NULL)
-    {
-      gdk_content_deserializer_return_error (deserializer, error);
-      return;
-    }
-
-  value = gdk_content_deserializer_get_value (deserializer);
-  g_value_take_object (value, texture);
-  gdk_content_deserializer_return_success (deserializer);
-}
-
-static GBytes *
-read_all_data (GInputStream  *source,
-               GError       **error)
-{
-  GOutputStream *output;
-  gssize size;
-  GBytes *bytes;
-
-  output = g_memory_output_stream_new (NULL, 0, g_realloc, g_free);
-  size = g_output_stream_splice (output, source, 0, NULL, error);
-  if (size == -1)
-    {
-      g_object_unref (output);
-      return NULL;
-    }
-
-  g_output_stream_close (output, NULL, NULL);
-  bytes = g_memory_output_stream_steal_as_bytes (G_MEMORY_OUTPUT_STREAM (output));
-  g_object_unref (output);
-
-  return bytes;
-}
-
-static void
-deserialize_texture_in_thread (GTask        *task,
-                               gpointer      source_object,
-                               gpointer      task_data,
-                               GCancellable *cancellable)
-{
-  GdkContentDeserializer *deserializer = source_object;
-  GBytes *bytes;
-  GError *error = NULL;
-  GdkTexture *texture = NULL;
-
-  bytes = read_all_data (gdk_content_deserializer_get_input_stream (deserializer), &error);
-  if (bytes)
-    {
-      texture = gdk_texture_new_from_bytes (bytes, &error);
-      g_bytes_unref (bytes);
-    }
-
-  if (texture)
-    g_task_return_pointer (task, texture, g_object_unref);
-  else
-    g_task_return_error (task, error);
-}
-
-static void
-texture_deserializer (GdkContentDeserializer *deserializer)
-{
-  GTask *task;
-
-  task = g_task_new (deserializer,
-                     gdk_content_deserializer_get_cancellable (deserializer),
-                     texture_deserializer_finish,
-                     NULL);
-  g_task_run_in_thread (task, deserialize_texture_in_thread);
-  g_object_unref (task);
-}
-
 static void
 string_deserializer_finish (GObject      *source,
                            GAsyncResult *result,
@@ -947,65 +863,48 @@ init (void)

  initialized = TRUE;

-  gdk_content_register_deserializer ("image/png",
-                                     GDK_TYPE_TEXTURE,
-                                     texture_deserializer,
-                                     NULL,
-                                     NULL);
-
-  gdk_content_register_deserializer ("image/tiff",
-                                     GDK_TYPE_TEXTURE,
-                                     texture_deserializer,
-                                     NULL,
-                                     NULL);
-
  formats = gdk_pixbuf_get_formats ();

  /* Make sure png comes first */
  for (f = formats; f; f = f->next)
    {
      GdkPixbufFormat *fmt = f->data;
-      char *name;
-
+      char *name; 
+ 
      name = gdk_pixbuf_format_get_name (fmt);
      if (g_str_equal (name, "png"))
-        {
-          formats = g_slist_delete_link (formats, f);
-          formats = g_slist_prepend (formats, fmt);
+	{
+	  formats = g_slist_delete_link (formats, f);
+	  formats = g_slist_prepend (formats, fmt);

-          g_free (name);
-          break;
-        }
+	  g_free (name);
+
+	  break;
+	}

      g_free (name);
-    }
+    }  

  for (f = formats; f; f = f->next)
    {
      GdkPixbufFormat *fmt = f->data;
      char **mimes, **m;
-      char *name;

-      name = gdk_pixbuf_format_get_name (fmt);
      mimes = gdk_pixbuf_format_get_mime_types (fmt);
      for (m = mimes; *m; m++)
-        {
-          /* Turning pngs and tiffs into textures is handled above */
-          if (!g_str_equal (name, "png") &&
-              !g_str_equal (name, "tiff"))
-            gdk_content_register_deserializer (*m,
-                                               GDK_TYPE_TEXTURE,
-                                               pixbuf_deserializer,
-                                               NULL,
-                                               NULL);
+	{
+          gdk_content_register_deserializer (*m,
+                                             GDK_TYPE_TEXTURE,
+                                             pixbuf_deserializer,
+                                             NULL,
+                                             NULL);
          gdk_content_register_deserializer (*m,
                                             GDK_TYPE_PIXBUF,
                                             pixbuf_deserializer,
                                             NULL,
                                             NULL);
-        }
+	}
      g_strfreev (mimes);
-      g_free (name);
    }

  g_slist_free (formats);
@@ -26,9 +26,6 @@
 #include "filetransferportalprivate.h"
 #include "gdktextureprivate.h"
 #include "gdkrgba.h"
-#include "loaders/gdkpngprivate.h"
-#include "loaders/gdktiffprivate.h"
-#include "gdkmemorytextureprivate.h"

 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <string.h>
@@ -609,7 +606,6 @@ gdk_content_serialize_finish (GAsyncResult  *result,

 /*** SERIALIZERS ***/

-
 static void
 pixbuf_serializer_finish (GObject      *source,
                          GAsyncResult *res,
@@ -662,82 +658,6 @@ pixbuf_serializer (GdkContentSerializer *serializer)
  g_object_unref (pixbuf);
 }

-static void
-texture_serializer_finish (GObject      *source,
-                           GAsyncResult *res,
-                           gpointer      user_data)
-{
-  GdkContentSerializer *serializer = GDK_CONTENT_SERIALIZER (source);
-  GError *error = NULL;
-
-  if (!g_task_propagate_boolean (G_TASK (res), &error))
-    gdk_content_serializer_return_error (serializer, error);
-  else
-    gdk_content_serializer_return_success (serializer);
-}
-
-static void
-serialize_texture_in_thread (GTask        *task,
-                             gpointer      source_object,
-                             gpointer      task_data,
-                             GCancellable *cancellable)
-{
-  GdkContentSerializer *serializer = source_object;
-  const GValue *value;
-  GdkTexture *texture;
-  GBytes *bytes = NULL;
-  GError *error = NULL;
-  gboolean result = FALSE;
-
-  value = gdk_content_serializer_get_value (serializer);
-  texture = g_value_get_object (value);
-
-  if (strcmp (gdk_content_serializer_get_mime_type (serializer), "image/png") == 0)
-    bytes = gdk_save_png (texture);
-  else if (strcmp (gdk_content_serializer_get_mime_type (serializer), "image/tiff") == 0)
-    bytes = gdk_save_tiff (texture);
-  else
-    g_assert_not_reached ();
-
-  if (bytes)
-    {
-      GInputStream *input = g_memory_input_stream_new_from_bytes (bytes);
-      gssize spliced;
-
-      spliced = g_output_stream_splice (gdk_content_serializer_get_output_stream (serializer),
-                                        input,
-                                        G_OUTPUT_STREAM_SPLICE_CLOSE_SOURCE,
-                                        gdk_content_serializer_get_cancellable (serializer),
-                                        &error);
-      g_object_unref (input);
-      g_bytes_unref (bytes);
-
-      result = spliced != -1;
-    }
-  else
-    g_set_error_literal (&error,
-                         G_IO_ERROR, G_IO_ERROR_FAILED,
-                         "Saving png failed");
-
-  if (result)
-    g_task_return_boolean (task, result);
-  else
-    g_task_return_error (task, error);
-}
-
-static void
-texture_serializer (GdkContentSerializer *serializer)
-{
-  GTask *task;
-
-  task = g_task_new (serializer,
-                     gdk_content_serializer_get_cancellable (serializer),
-                     texture_serializer_finish,
-                     NULL);
-  g_task_run_in_thread (task, serialize_texture_in_thread);
-  g_object_unref (task);
-}
-
 static void
 string_serializer_finish (GObject      *source,
                          GAsyncResult *result,
@@ -957,66 +877,51 @@ init (void)

  initialized = TRUE;

-  gdk_content_register_serializer (GDK_TYPE_TEXTURE,
-                                   "image/png",
-                                   texture_serializer,
-                                   NULL, NULL);
-
-  gdk_content_register_serializer (GDK_TYPE_TEXTURE,
-                                   "image/tiff",
-                                   texture_serializer,
-                                   NULL, NULL);
-
  formats = gdk_pixbuf_get_formats ();

  /* Make sure png comes first */
  for (f = formats; f; f = f->next)
    {
      GdkPixbufFormat *fmt = f->data;
-      char *name;
-
+      char *name; 
+ 
      name = gdk_pixbuf_format_get_name (fmt);
      if (g_str_equal (name, "png"))
-        {
-          formats = g_slist_delete_link (formats, f);
-          formats = g_slist_prepend (formats, fmt);
+	{
+	  formats = g_slist_delete_link (formats, f);
+	  formats = g_slist_prepend (formats, fmt);

-          g_free (name);
-          break;
-        }
+	  g_free (name);
+
+	  break;
+	}

      g_free (name);
-    }
+    }  

  for (f = formats; f; f = f->next)
    {
      GdkPixbufFormat *fmt = f->data;
      char **mimes, **m;
-      char *name;

      if (!gdk_pixbuf_format_is_writable (fmt))
-        continue;
+	continue;

-      name = gdk_pixbuf_format_get_name (fmt);
      mimes = gdk_pixbuf_format_get_mime_types (fmt);
      for (m = mimes; *m; m++)
-        {
-          /* Turning textures into pngs or tiffs is handled above */
-          if (!g_str_equal (name, "png") &&
-              !g_str_equal (name, "tiff"))
-            gdk_content_register_serializer (GDK_TYPE_TEXTURE,
-                                             *m,
-                                             pixbuf_serializer,
-                                             gdk_pixbuf_format_get_name (fmt),
-                                             g_free);
+	{
+          gdk_content_register_serializer (GDK_TYPE_TEXTURE,
+                                           *m,
+                                           pixbuf_serializer,
+                                           gdk_pixbuf_format_get_name (fmt),
+                                           g_free);
          gdk_content_register_serializer (GDK_TYPE_PIXBUF,
                                           *m,
                                           pixbuf_serializer,
                                           gdk_pixbuf_format_get_name (fmt),
                                           g_free);
-        }
+	}
      g_strfreev (mimes);
-      g_free (name);
    }

  g_slist_free (formats);
@@ -301,7 +301,7 @@ gdk_gl_texture_quads (GdkGLContext *paint_context,
 * @width: The width of the region to draw
 * @height: The height of the region to draw
 *
- * The main way to not draw GL content in GTK.
+ * The main way to draw GL content in GTK.
 *
 * It takes a render buffer ID (@source_type == GL_RENDERBUFFER) or a texture
 * id (@source_type == GL_TEXTURE) and draws it onto @cr with an OVER operation,
@@ -319,12 +319,6 @@ gdk_gl_texture_quads (GdkGLContext *paint_context,
 * with alpha components, so make sure you use GL_TEXTURE if using alpha.
 *
 * Calling this may change the current GL context.
- *
- * Deprecated: 4.6: The function is overly complex and produces broken output
- *   in various combinations of arguments. If you want to draw with GL textures
- *   in GTK, use [ctor@Gdk.GLTexture.new]; if you want to use that texture in
- *   Cairo, use [method@Gdk.Texture.download] to download the data into a Cairo
- *   image surface.
 */
 void
 gdk_cairo_draw_from_gl (cairo_t              *cr,
@@ -229,83 +229,64 @@ gdk_gl_context_upload_texture (GdkGLContext    *context,
 {
  GdkGLContextPrivate *priv = gdk_gl_context_get_instance_private (context);
  guchar *copy = NULL;
-  GLint gl_internalformat;
-  GLint gl_format;
-  GLint gl_type;
-  gsize bpp;
+  guint gl_format;
+  guint gl_type;
+  guint bpp;

  g_return_if_fail (GDK_IS_GL_CONTEXT (context));

-  if (!priv->use_es && data_format == GDK_MEMORY_DEFAULT) /* Cairo surface format */
+  if (priv->use_es)
    {
-      gl_internalformat = GL_RGBA8;
-      gl_format = GL_BGRA;
-      gl_type = GL_UNSIGNED_INT_8_8_8_8_REV;
-    }
-  else if (data_format == GDK_MEMORY_R8G8B8) /* Pixmap non-alpha data */
-    {
-      gl_internalformat = GL_RGBA8;
-      gl_format = GL_RGB;
-      gl_type = GL_UNSIGNED_BYTE;
-    }
-  else if (priv->use_es && data_format == GDK_MEMORY_B8G8R8)
-    {
-      gl_internalformat = GL_RGBA8;
-      gl_format = GL_BGR;
-      gl_type = GL_UNSIGNED_BYTE;
-    }
-  else if (data_format == GDK_MEMORY_R16G16B16)
-    {
-      gl_internalformat = GL_RGBA16;
-      gl_format = GL_RGB;
-      gl_type = GL_UNSIGNED_SHORT;
-    }
-  else if (data_format == GDK_MEMORY_R16G16B16A16_PREMULTIPLIED)
-    {
-      gl_internalformat = GL_RGBA16;
-      gl_format = GL_RGBA;
-      gl_type = GL_UNSIGNED_SHORT;
-    }
-  else if (data_format == GDK_MEMORY_R16G16B16_FLOAT)
-    {
-      gl_internalformat = GL_RGB16F;
-      gl_format = GL_RGB;
-      gl_type = GL_HALF_FLOAT;
-    }
-  else if (data_format == GDK_MEMORY_R16G16B16A16_FLOAT_PREMULTIPLIED)
-    {
-      gl_internalformat = GL_RGBA16F;
-      gl_format = GL_RGBA;
-      gl_type = GL_HALF_FLOAT;
-    }
-  else if (data_format == GDK_MEMORY_R32G32B32_FLOAT)
-    {
-      gl_internalformat = GL_RGB32F;
-      gl_format = GL_RGB;
-      gl_type = GL_FLOAT;
-    }
-  else if (data_format == GDK_MEMORY_R32G32B32A32_FLOAT_PREMULTIPLIED)
-    {
-      gl_internalformat = GL_RGBA32F;
-      gl_format = GL_RGBA;
-      gl_type = GL_FLOAT;
-    }
-  else /* Fall-back, convert to GLES format */
-    {
-      copy = g_malloc (width * height * 4);
-      gdk_memory_convert (copy, width * 4,
-                          GDK_MEMORY_CONVERT_GLES_RGBA,
-                          data, stride, data_format,
-                          width, height);
-      data_format = GDK_MEMORY_R8G8B8A8_PREMULTIPLIED;
-      stride = width * 4;
-      data = copy;
-      gl_internalformat = GL_RGBA8;
-      gl_format = GL_RGBA;
-      gl_type = GL_UNSIGNED_BYTE;
-    }
+      /* GLES only supports rgba, so convert if necessary */
+      if (data_format != GDK_MEMORY_R8G8B8A8_PREMULTIPLIED)
+        {
+          copy = g_malloc (width * height * 4);
+          gdk_memory_convert (copy, width * 4,
+                              GDK_MEMORY_R8G8B8A8_PREMULTIPLIED,
+                              data, stride, data_format,
+                              width, height);
+          stride = width * 4;
+          data = copy;
+        }

-  bpp = gdk_memory_format_bytes_per_pixel (data_format);
+      bpp = 4;
+      gl_format = GL_RGBA;
+      gl_type = GL_UNSIGNED_BYTE;
+    }
+  else
+    {
+      if (data_format == GDK_MEMORY_DEFAULT) /* Cairo surface format */
+        {
+          gl_format = GL_BGRA;
+          gl_type = GL_UNSIGNED_INT_8_8_8_8_REV;
+          bpp = 4;
+        }
+      else if (data_format == GDK_MEMORY_R8G8B8) /* Pixmap non-alpha data */
+        {
+          gl_format = GL_RGB;
+          gl_type = GL_UNSIGNED_BYTE;
+          bpp = 3;
+        }
+      else if (data_format == GDK_MEMORY_B8G8R8)
+        {
+          gl_format = GL_BGR;
+          gl_type = GL_UNSIGNED_BYTE;
+          bpp = 3;
+        }
+      else /* Fall-back, convert to cairo-surface-format */
+        {
+          copy = g_malloc (width * height * 4);
+          gdk_memory_convert (copy, width * 4,
+                              GDK_MEMORY_DEFAULT,
+                              data, stride, data_format,
+                              width, height);
+          stride = width * 4;
+          bpp = 4;
+          data = copy;
+          gl_format = GL_BGRA;
+          gl_type = GL_UNSIGNED_INT_8_8_8_8_REV;
+        }
+    }

  /* GL_UNPACK_ROW_LENGTH is available on desktop GL, OpenGL ES >= 3.0, or if
   * the GL_EXT_unpack_subimage extension for OpenGL ES 2.0 is available
@@ -314,7 +295,7 @@ gdk_gl_context_upload_texture (GdkGLContext    *context,
    {
      glPixelStorei (GL_UNPACK_ALIGNMENT, 1);

-      glTexImage2D (texture_target, 0, gl_internalformat, width, height, 0, gl_format, gl_type, data);
+      glTexImage2D (texture_target, 0, GL_RGBA, width, height, 0, gl_format, gl_type, data);
      glPixelStorei (GL_UNPACK_ALIGNMENT, 4);
    }
  else if ((!priv->use_es ||
@@ -322,14 +303,14 @@ gdk_gl_context_upload_texture (GdkGLContext    *context,
    {
      glPixelStorei (GL_UNPACK_ROW_LENGTH, stride / bpp);

-      glTexImage2D (texture_target, 0, gl_internalformat, width, height, 0, gl_format, gl_type, data);
+      glTexImage2D (texture_target, 0, GL_RGBA, width, height, 0, gl_format, gl_type, data);

      glPixelStorei (GL_UNPACK_ROW_LENGTH, 0);
    }
  else
    {
      int i;
-      glTexImage2D (texture_target, 0, gl_internalformat, width, height, 0, gl_format, gl_type, NULL);
+      glTexImage2D (texture_target, 0, GL_RGBA, width, height, 0, gl_format, gl_type, NULL);
      for (i = 0; i < height; i++)
        glTexSubImage2D (texture_target, 0, 0, i, width, 1, gl_format, gl_type, data + (i * stride));
    }
@@ -20,8 +20,7 @@

 #include "gdkgltextureprivate.h"

-#include "gdkdisplayprivate.h"
-#include "gdkmemorytextureprivate.h"
+#include "gdkcairo.h"
 #include "gdktextureprivate.h"

 #include <epoxy/gl.h>
@@ -38,7 +37,7 @@ struct _GdkGLTexture {
  GdkGLContext *context;
  guint id;

-  GdkTexture *saved;
+  cairo_surface_t *saved;

  GDestroyNotify destroy;
  gpointer data;
@@ -65,239 +64,50 @@ gdk_gl_texture_dispose (GObject *object)
  g_clear_object (&self->context);
  self->id = 0;

-  g_clear_object (&self->saved);
+  if (self->saved)
+    {
+      cairo_surface_destroy (self->saved);
+      self->saved = NULL;
+    }

  G_OBJECT_CLASS (gdk_gl_texture_parent_class)->dispose (object);
 }

-typedef struct _InvokeData
-{
-  GdkGLTexture *self;
-  volatile int spinlock;
-  GFunc func;
-  gpointer data;
-} InvokeData;
-
-static gboolean
-gdk_gl_texture_invoke_callback (gpointer data)
-{
-  InvokeData *invoke = data;
-  GdkGLContext *context;
-
-  context = gdk_display_get_gl_context (gdk_gl_context_get_display (invoke->self->context));
-
-  gdk_gl_context_make_current (context);
-  glBindTexture (GL_TEXTURE_2D, invoke->self->id);
-
-  invoke->func (invoke->self, invoke->data);
-
-  g_atomic_int_set (&invoke->spinlock, 1);
-
-  return FALSE;
-}
-
 static void
-gdk_gl_texture_run (GdkGLTexture *self,
-                    GFunc         func,
-                    gpointer      data)
-{
-  InvokeData invoke = { self, 0, func, data };
-
-  g_main_context_invoke (NULL, gdk_gl_texture_invoke_callback, &invoke);
-
-  while (g_atomic_int_get (&invoke.spinlock) == 0);
-}
-
-static void
-gdk_gl_texture_do_download_texture (gpointer texture_,
-                                    gpointer result_)
-{
-  GdkTexture *texture = texture_;
-  GdkTexture **result = result_;
-  GdkMemoryFormat format;
-  GLint internal_format, gl_format, gl_type;
-  guchar *data;
-  gsize stride;
-  GBytes *bytes;
-
-  glGetTexLevelParameteriv (GL_TEXTURE_2D, 0, GL_TEXTURE_INTERNAL_FORMAT, &internal_format);
-
-  switch (internal_format)
-  {
-    case GL_RGB8:
-      format = GDK_MEMORY_R8G8B8;
-      gl_format = GL_RGB;
-      gl_type = GL_UNSIGNED_BYTE;
-      break;
-
-    case GL_RGBA8:
-      format = GDK_MEMORY_R8G8B8A8_PREMULTIPLIED;
-      gl_format = GL_RGBA;
-      gl_type = GL_UNSIGNED_BYTE;
-      break;
-
-    case GL_RGB16:
-      format = GDK_MEMORY_R16G16B16;
-      gl_format = GL_RGB;
-      gl_type = GL_UNSIGNED_SHORT;
-      break;
-
-    case GL_RGBA16:
-      format = GDK_MEMORY_R16G16B16A16_PREMULTIPLIED;
-      gl_format = GL_RGBA;
-      gl_type = GL_UNSIGNED_SHORT;
-      break;
-
-    case GL_RGB16F:
-      format = GDK_MEMORY_R16G16B16_FLOAT;
-      gl_format = GL_RGB;
-      gl_type = GL_HALF_FLOAT;
-      break;
-
-    case GL_RGBA16F:
-      format = GDK_MEMORY_R16G16B16A16_FLOAT_PREMULTIPLIED;
-      gl_format = GL_RGBA;
-      gl_type = GL_HALF_FLOAT;
-      break;
-
-    case GL_RGB32F:
-      format = GDK_MEMORY_R32G32B32_FLOAT;
-      gl_format = GL_RGB;
-      gl_type = GL_FLOAT;
-      break;
-
-    case GL_RGBA32F:
-      format = GDK_MEMORY_R32G32B32A32_FLOAT_PREMULTIPLIED;
-      gl_format = GL_RGBA;
-      gl_type = GL_FLOAT;
-      break;
-
-    default:
-      g_warning ("Texture in unexpected format 0x%X (%d). File a bug about adding it to GTK", internal_format, internal_format);
-      /* fallback to the dumbest possible format
-       * so that even age old GLES can do it */
-      format = GDK_MEMORY_R8G8B8A8_PREMULTIPLIED;
-      gl_format = GL_RGBA;
-      gl_type = GL_UNSIGNED_BYTE;
-      break;
-  }
-
-  stride = gdk_memory_format_bytes_per_pixel (format) * texture->width;
-  data = g_malloc (stride * texture->height);
-
-  glGetTexImage (GL_TEXTURE_2D,
-                 0,
-                 gl_format,
-                 gl_type,
-                 data);
-
-  bytes = g_bytes_new_take (data, stride * texture->height);
-  *result = gdk_memory_texture_new (texture->width,
-                                    texture->height,
-                                    format,
-                                    bytes,
-                                    stride);
-
-  g_bytes_unref (bytes);
-}
-
-static GdkTexture *
-gdk_gl_texture_download_texture (GdkTexture *texture)
+gdk_gl_texture_download (GdkTexture         *texture,
+                         const GdkRectangle *area,
+                         guchar             *data,
+                         gsize               stride)
 {
  GdkGLTexture *self = GDK_GL_TEXTURE (texture);
-  GdkTexture *result;
+  cairo_surface_t *surface;
+  cairo_t *cr;

-  if (self->saved)
-    return g_object_ref (self->saved);
+  surface = cairo_image_surface_create_for_data (data,
+                                                 CAIRO_FORMAT_ARGB32,
+                                                 area->width, area->height,
+                                                 stride);

-  gdk_gl_texture_run (self, gdk_gl_texture_do_download_texture, &result);
-
-  return result;
-}
-
-static void
-gdk_gl_texture_do_download (gpointer texture,
-                            gpointer data)
-{
-  glGetTexImage (GL_TEXTURE_2D,
-                 0,
-                 GL_BGRA,
-#if G_BYTE_ORDER == G_LITTLE_ENDIAN
-                 GL_UNSIGNED_INT_8_8_8_8_REV,
-#elif G_BYTE_ORDER == G_BIG_ENDIAN
-                 GL_UNSIGNED_BYTE,
-#else
-#error "Unknown byte order for gdk_gl_texture_download()"
-#endif
-                 data);
-
-}
-
-static void
-gdk_gl_texture_download (GdkTexture *texture,
-                         guchar     *data,
-                         gsize       stride)
-{
-  GdkGLTexture *self = GDK_GL_TEXTURE (texture);
+  cr = cairo_create (surface);

  if (self->saved)
    {
-      gdk_texture_download (self->saved, data, stride);
-      return;
+      cairo_set_source_surface (cr, self->saved, 0, 0);
+      cairo_paint (cr);
    }
-
-  if (gdk_gl_context_get_use_es (self->context) ||
-      stride != texture->width * 4)
+  else
    {
-      GDK_TEXTURE_CLASS (gdk_gl_texture_parent_class)->download (texture, data, stride);
-      return;
+      GdkSurface *gl_surface;
+
+      gl_surface = gdk_gl_context_get_surface (self->context);
+      gdk_cairo_draw_from_gl (cr, gl_surface, self->id, GL_TEXTURE, 1, 
+                              area->x, area->y,
+                              area->width, area->height);
    }

-  gdk_gl_texture_run (self, gdk_gl_texture_do_download, data);
-}
-
-static void
-gdk_gl_texture_do_download_float (gpointer texture,
-                                  gpointer data)
-{
-  glGetTexImage (GL_TEXTURE_2D,
-                 0,
-                 GL_RGBA,
-                 GL_FLOAT,
-                 data);
-}
-
-static void
-gdk_gl_texture_download_float (GdkTexture *texture,
-                               float      *data,
-                               gsize       stride)
-{
-  GdkGLTexture *self = GDK_GL_TEXTURE (texture);
-  int width, height, y;
-  float *copy;
-
-  if (self->saved)
-    {
-      gdk_texture_download_float (self->saved, data, stride);
-      return;
-    }
-
-  width = gdk_texture_get_width (texture);
-  height = gdk_texture_get_height (texture);
-
-  if (stride == width * 4)
-    {
-      gdk_gl_texture_run (self, gdk_gl_texture_do_download_float, data);
-      return;
-    }
-
-  copy = g_new (float, width * height * 4);
-
-  gdk_gl_texture_run (self, gdk_gl_texture_do_download_float, copy);
-  for (y = 0; y < height; y++)
-    memcpy (data + y * stride, copy + y * 4 * width, 4 * width);
-
-  g_free (copy);
+  cairo_destroy (cr);
+  cairo_surface_finish (surface);
+  cairo_surface_destroy (surface);
 }

 static void
@@ -306,9 +116,7 @@ gdk_gl_texture_class_init (GdkGLTextureClass *klass)
  GdkTextureClass *texture_class = GDK_TEXTURE_CLASS (klass);
  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);

-  texture_class->download_texture = gdk_gl_texture_download_texture;
  texture_class->download = gdk_gl_texture_download;
-  texture_class->download_float = gdk_gl_texture_download_float;
  gobject_class->dispose = gdk_gl_texture_dispose;
 }

@@ -342,10 +150,24 @@ gdk_gl_texture_get_id (GdkGLTexture *self)
 void
 gdk_gl_texture_release (GdkGLTexture *self)
 {
+  GdkSurface *surface;
+  GdkTexture *texture;
+  cairo_t *cr;
+
  g_return_if_fail (GDK_IS_GL_TEXTURE (self));
  g_return_if_fail (self->saved == NULL);

-  self->saved = gdk_texture_download_texture (GDK_TEXTURE (self));
+  texture = GDK_TEXTURE (self);
+  self->saved = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
+                                            texture->width, texture->height);
+
+  cr = cairo_create (self->saved);
+
+  surface = gdk_gl_context_get_surface (self->context);
+  gdk_cairo_draw_from_gl (cr, surface, self->id, GL_TEXTURE, 1, 0, 0,
+                          texture->width, texture->height);
+
+  cairo_destroy (cr);

  if (self->destroy)
    {
@@ -20,7 +20,6 @@
 #include "config.h"

 #include "gdkmemorytextureprivate.h"
-#include "gsk/ngl/fp16private.h"

 /**
 * GdkMemoryTexture:
@@ -50,33 +49,19 @@ gdk_memory_format_bytes_per_pixel (GdkMemoryFormat format)
 {
  switch (format)
    {
+    case GDK_MEMORY_B8G8R8A8_PREMULTIPLIED:
+    case GDK_MEMORY_A8R8G8B8_PREMULTIPLIED:
+    case GDK_MEMORY_R8G8B8A8_PREMULTIPLIED:
+    case GDK_MEMORY_B8G8R8A8:
+    case GDK_MEMORY_A8R8G8B8:
+    case GDK_MEMORY_R8G8B8A8:
+    case GDK_MEMORY_A8B8G8R8:
+      return 4;
+
    case GDK_MEMORY_R8G8B8:
    case GDK_MEMORY_B8G8R8:
      return 3;

-    case GDK_MEMORY_B8G8R8A8_PREMULTIPLIED:
-    case GDK_MEMORY_A8R8G8B8_PREMULTIPLIED:
-    case GDK_MEMORY_R8G8B8A8_PREMULTIPLIED:
-    case GDK_MEMORY_B8G8R8A8:
-    case GDK_MEMORY_A8R8G8B8:
-    case GDK_MEMORY_R8G8B8A8:
-    case GDK_MEMORY_A8B8G8R8:
-      return 4;
-
-    case GDK_MEMORY_R16G16B16:
-    case GDK_MEMORY_R16G16B16_FLOAT:
-      return 6;
-
-    case GDK_MEMORY_R16G16B16A16_PREMULTIPLIED:
-    case GDK_MEMORY_R16G16B16A16_FLOAT_PREMULTIPLIED:
-      return 8;
-
-    case GDK_MEMORY_R32G32B32_FLOAT:
-      return 12;
-
-    case GDK_MEMORY_R32G32B32A32_FLOAT_PREMULTIPLIED:
-      return 16;
-
    case GDK_MEMORY_N_FORMATS:
    default:
      g_assert_not_reached ();
@@ -84,41 +69,6 @@ gdk_memory_format_bytes_per_pixel (GdkMemoryFormat format)
    }
 }

-static gsize
-gdk_memory_format_alignment (GdkMemoryFormat format)
-{
-  switch (format)
-    {
-    case GDK_MEMORY_R8G8B8:
-    case GDK_MEMORY_B8G8R8:
-    case GDK_MEMORY_B8G8R8A8_PREMULTIPLIED:
-    case GDK_MEMORY_A8R8G8B8_PREMULTIPLIED:
-    case GDK_MEMORY_R8G8B8A8_PREMULTIPLIED:
-    case GDK_MEMORY_B8G8R8A8:
-    case GDK_MEMORY_A8R8G8B8:
-    case GDK_MEMORY_R8G8B8A8:
-    case GDK_MEMORY_A8B8G8R8:
-      return G_ALIGNOF (guchar);
-
-    case GDK_MEMORY_R16G16B16:
-    case GDK_MEMORY_R16G16B16_FLOAT:
-      return G_ALIGNOF (guint16);
-
-    case GDK_MEMORY_R16G16B16A16_PREMULTIPLIED:
-    case GDK_MEMORY_R16G16B16A16_FLOAT_PREMULTIPLIED:
-      return G_ALIGNOF (guint16);
-
-    case GDK_MEMORY_R32G32B32_FLOAT:
-    case GDK_MEMORY_R32G32B32A32_FLOAT_PREMULTIPLIED:
-      return G_ALIGNOF (float);
-
-    case GDK_MEMORY_N_FORMATS:
-    default:
-      g_assert_not_reached ();
-      return G_ALIGNOF (double);
-    }
-}
-
 static void
 gdk_memory_texture_dispose (GObject *object)
 {
@@ -129,41 +79,22 @@ gdk_memory_texture_dispose (GObject *object)
  G_OBJECT_CLASS (gdk_memory_texture_parent_class)->dispose (object);
 }

-static GdkTexture *
-gdk_memory_texture_download_texture (GdkTexture *texture)
-{
-  return g_object_ref (texture);
-}
-
 static void
-gdk_memory_texture_download (GdkTexture *texture,
-                             guchar     *data,
-                             gsize       stride)
+gdk_memory_texture_download (GdkTexture         *texture,
+                             const GdkRectangle *area,
+                             guchar             *data,
+                             gsize               stride)
 {
  GdkMemoryTexture *self = GDK_MEMORY_TEXTURE (texture);

  gdk_memory_convert (data, stride,
-                      GDK_MEMORY_CONVERT_DOWNLOAD,
-                      (guchar *) g_bytes_get_data (self->bytes, NULL),
+                      GDK_MEMORY_CAIRO_FORMAT_ARGB32,
+                      (guchar *) g_bytes_get_data (self->bytes, NULL)
+                        + area->x * gdk_memory_format_bytes_per_pixel (self->format)
+                        + area->y * self->stride,
                      self->stride,
                      self->format,
-                      gdk_texture_get_width (texture),
-                      gdk_texture_get_height (texture));
-}
-
-static void
-gdk_memory_texture_download_float (GdkTexture *texture,
-                                   float      *data,
-                                   gsize       stride)
-{
-  GdkMemoryTexture *self = GDK_MEMORY_TEXTURE (texture);
-
-  gdk_memory_convert_to_float (data, stride,
-                               (guchar *) g_bytes_get_data (self->bytes, NULL),
-                               self->stride,
-                               self->format,
-                               gdk_texture_get_width (texture),
-                               gdk_texture_get_height (texture));
+                      area->width, area->height);
 }

 static void
@@ -172,9 +103,7 @@ gdk_memory_texture_class_init (GdkMemoryTextureClass *klass)
  GdkTextureClass *texture_class = GDK_TEXTURE_CLASS (klass);
  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);

-  texture_class->download_texture = gdk_memory_texture_download_texture;
  texture_class->download = gdk_memory_texture_download;
-  texture_class->download_float = gdk_memory_texture_download_float;
  gobject_class->dispose = gdk_memory_texture_dispose;
 }

@@ -183,41 +112,6 @@ gdk_memory_texture_init (GdkMemoryTexture *self)
 {
 }

-static GBytes *
-gdk_memory_sanitize (GBytes          *bytes,
-                     int              width,
-                     int              height,
-                     GdkMemoryFormat  format,
-                     gsize            stride,
-                     gsize           *out_stride)
-{
-  gsize align, size, copy_stride, bpp;
-  const guchar *data;
-  guchar *copy;
-  int y;
-
-  data = g_bytes_get_data (bytes, &size);
-  align = gdk_memory_format_alignment (format);
-
-  if (GPOINTER_TO_SIZE (data) % align == 0 &&
-      stride % align == 0)
-    {
-      *out_stride = stride;
-      return g_bytes_ref (bytes);
-    }
-
-  bpp = gdk_memory_format_bytes_per_pixel (format);
-  copy_stride = bpp * width;
-  /* align to multiples of 4, just to be sure */
-  copy_stride = (copy_stride + 3) & ~3;
-  copy = g_malloc (copy_stride * height);
-  for (y = 0; y < height; y++)
-    memcpy (copy + y * copy_stride, data + y * stride, bpp * width);
-
-  *out_stride = copy_stride;
-  return g_bytes_new_take (copy, copy_stride * height);
-}
-
 /**
 * gdk_memory_texture_new:
 * @width: the width of the texture
@@ -242,20 +136,13 @@ gdk_memory_texture_new (int              width,
 {
  GdkMemoryTexture *self;

-  g_return_val_if_fail (width > 0, NULL);
-  g_return_val_if_fail (height > 0, NULL);
-  g_return_val_if_fail (bytes != NULL, NULL);
-  g_return_val_if_fail (stride >= width * gdk_memory_format_bytes_per_pixel (format), NULL);
-
-  bytes = gdk_memory_sanitize (bytes, width, height, format, stride, &stride);
-
  self = g_object_new (GDK_TYPE_MEMORY_TEXTURE,
                       "width", width,
                       "height", height,
                       NULL);

  self->format = format;
-  self->bytes = bytes;
+  self->bytes = g_bytes_ref (bytes);
  self->stride = stride;

  return GDK_TEXTURE (self);
@@ -396,109 +283,6 @@ SWIZZLE_PREMULTIPLY (3,0,1,2, 0,1,2,3)
 SWIZZLE_PREMULTIPLY (3,0,1,2, 3,0,1,2)
 SWIZZLE_PREMULTIPLY (3,0,1,2, 0,3,2,1)

-#define CONVERT_FUNC(name,suffix,R,G,B,A,step) \
-static void \
-convert_ ## name ## _to_ ## suffix (guchar       *dest_data, \
-                                    gsize         dest_stride, \
-                                    const guchar *src_data, \
-                                    gsize         src_stride, \
-                                    gsize         width, \
-                                    gsize         height) \
-{ \
-  gsize x, y; \
-\
-  for (y = 0; y < height; y++) \
-    { \
-      for (x = 0; x < width; x++) \
-        { \
-          guchar conv[4]; \
-          convert_pixel_ ## name (conv, src_data + step * x); \
-          dest_data[4 * x + R] = conv[0]; \
-          dest_data[4 * x + G] = conv[1]; \
-          dest_data[4 * x + B] = conv[2]; \
-          dest_data[4 * x + A] = conv[3]; \
-        } \
-\
-      dest_data += dest_stride; \
-      src_data += src_stride; \
-    } \
-}
-
-#define CONVERT_FUNCS(name,step) \
-CONVERT_FUNC(name, download_le, 2, 1, 0, 3, step) \
-CONVERT_FUNC(name, download_be, 1, 2, 3, 0, step) \
-CONVERT_FUNC(name, gles_rgba, 0, 1, 2, 3, step) \
-
-static inline void
-convert_pixel_rgb16 (guchar *dest_data, const guchar *src_data)
-{
-  const guint16 *src = (const guint16 *) src_data;
-  dest_data[0] = (guchar)(src[0] >> 8);
-  dest_data[1] = (guchar)(src[1] >> 8);
-  dest_data[2] = (guchar)(src[2] >> 8);
-  dest_data[3] = 0xFF;
-}
-CONVERT_FUNCS(rgb16, 3 * sizeof (guint16))
-
-static inline void
-convert_pixel_rgba16 (guchar *dest_data, const guchar *src_data)
-{
-  const guint16 *src = (const guint16 *) src_data;
-  dest_data[0] = (guchar)(src[0] >> 8);
-  dest_data[1] = (guchar)(src[1] >> 8);
-  dest_data[2] = (guchar)(src[2] >> 8);
-  dest_data[3] = (guchar)(src[3] >> 8);
-}
-CONVERT_FUNCS(rgba16, 4 * sizeof (guint16))
-
-static inline void
-convert_pixel_rgb16f (guchar *dest_data, const guchar *src_data)
-{
-  float src[4];
-  guint16 tmp[4];
-  memcpy(tmp, src_data, sizeof(guint16) * 3);
-  half_to_float4(tmp, src);
-  dest_data[0] = CLAMP (src[0] * 256.f, 0.f, 255.f);
-  dest_data[1] = CLAMP (src[1] * 256.f, 0.f, 255.f);
-  dest_data[2] = CLAMP (src[2] * 256.f, 0.f, 255.f);
-  dest_data[3] = 0xFF;
-}
-CONVERT_FUNCS(rgb16f, 3 * sizeof (guint16))
-
-static inline void
-convert_pixel_rgba16f (guchar *dest_data, const guchar *src_data)
-{
-  float src[4];
-  half_to_float4((const guint16 *) src_data, src);
-  dest_data[0] = CLAMP (src[0] * 256.f, 0.f, 255.f);
-  dest_data[1] = CLAMP (src[1] * 256.f, 0.f, 255.f);
-  dest_data[2] = CLAMP (src[2] * 256.f, 0.f, 255.f);
-  dest_data[3] = CLAMP (src[3] * 256.f, 0.f, 255.f);
-}
-CONVERT_FUNCS(rgba16f, 4 * sizeof (guint16))
-
-static inline void
-convert_pixel_rgb32f (guchar *dest_data, const guchar *src_data)
-{
-  float *src = (float *) src_data;
-  dest_data[0] = CLAMP (src[0] * 256.f, 0.f, 255.f);
-  dest_data[1] = CLAMP (src[1] * 256.f, 0.f, 255.f);
-  dest_data[2] = CLAMP (src[2] * 256.f, 0.f, 255.f);
-  dest_data[3] = 0xFF;
-}
-CONVERT_FUNCS(rgb32f, 3 * sizeof (float))
-
-static inline void
-convert_pixel_rgba32f (guchar *dest_data, const guchar *src_data)
-{
-  float *src = (float *) src_data;
-  dest_data[0] = CLAMP (src[0] * 256.f, 0.f, 255.f);
-  dest_data[1] = CLAMP (src[1] * 256.f, 0.f, 255.f);
-  dest_data[2] = CLAMP (src[2] * 256.f, 0.f, 255.f);
-  dest_data[3] = CLAMP (src[3] * 256.f, 0.f, 255.f);
-}
-CONVERT_FUNCS(rgba32f, 4 * sizeof (float))
-
 typedef void (* ConversionFunc) (guchar       *dest_data,
                                 gsize         dest_stride,
                                 const guchar *src_data,
@@ -506,7 +290,7 @@ typedef void (* ConversionFunc) (guchar       *dest_data,
                                 gsize         width,
                                 gsize         height);

-static ConversionFunc converters[GDK_MEMORY_N_FORMATS][GDK_MEMORY_N_CONVERSIONS] =
+static ConversionFunc converters[GDK_MEMORY_N_FORMATS][3] =
 {
  { convert_memcpy, convert_swizzle3210, convert_swizzle2103 },
  { convert_swizzle3210, convert_memcpy, convert_swizzle3012 },
@@ -516,192 +300,21 @@ static ConversionFunc converters[GDK_MEMORY_N_FORMATS][GDK_MEMORY_N_CONVERSIONS]
  { convert_swizzle_premultiply_3210_3012, convert_swizzle_premultiply_0123_3012, convert_swizzle_premultiply_3012_3012 },
  { convert_swizzle_premultiply_3210_0321, convert_swizzle_premultiply_0123_0321, convert_swizzle_premultiply_3012_0321 },
  { convert_swizzle_opaque_3210, convert_swizzle_opaque_0123, convert_swizzle_opaque_3012 },
-  { convert_swizzle_opaque_3012, convert_swizzle_opaque_0321, convert_swizzle_opaque_3210 },
-  { convert_rgb16_to_download_le, convert_rgb16_to_download_be, convert_rgb16_to_gles_rgba },
-  { convert_rgba16_to_download_le, convert_rgba16_to_download_be, convert_rgba16_to_gles_rgba },
-  { convert_rgb16f_to_download_le, convert_rgb16f_to_download_be, convert_rgb16f_to_gles_rgba },
-  { convert_rgba16f_to_download_le, convert_rgba16f_to_download_be, convert_rgba16f_to_gles_rgba },
-  { convert_rgb32f_to_download_le, convert_rgb32f_to_download_be, convert_rgb32f_to_gles_rgba },
-  { convert_rgba32f_to_download_le, convert_rgba32f_to_download_be, convert_rgba32f_to_gles_rgba }
+  { convert_swizzle_opaque_3012, convert_swizzle_opaque_0321, convert_swizzle_opaque_3210 }
 };

 void
-gdk_memory_convert (guchar              *dest_data,
-                    gsize                dest_stride,
-                    GdkMemoryConversion  dest_format,
-                    const guchar        *src_data,
-                    gsize                src_stride,
-                    GdkMemoryFormat      src_format,
-                    gsize                width,
-                    gsize                height)
+gdk_memory_convert (guchar          *dest_data,
+                    gsize            dest_stride,
+                    GdkMemoryFormat  dest_format,
+                    const guchar    *src_data,
+                    gsize            src_stride,
+                    GdkMemoryFormat  src_format,
+                    gsize            width,
+                    gsize            height)
 {
  g_assert (dest_format < 3);
  g_assert (src_format < GDK_MEMORY_N_FORMATS);

  converters[src_format][dest_format] (dest_data, dest_stride, src_data, src_stride, width, height);
 }
-
-#define CONVERT_FLOAT(R,G,B,A,premultiply) G_STMT_START {\
-  for (y = 0; y < height; y++) \
-    { \
-      for (x = 0; x < width; x++) \
-        { \
-          if (A >= 0) \
-            { \
-              dest_data[4 * x + 0] = src_data[4 * x + R] / 255.0f; \
-              dest_data[4 * x + 1] = src_data[4 * x + G] / 255.0f; \
-              dest_data[4 * x + 2] = src_data[4 * x + B] / 255.0f; \
-              dest_data[4 * x + 3] = src_data[4 * x + A] / 255.0f; \
-              if (premultiply) \
-                { \
-                  dest_data[4 * x + 0] *= dest_data[4 * x + 3]; \
-                  dest_data[4 * x + 1] *= dest_data[4 * x + 3]; \
-                  dest_data[4 * x + 2] *= dest_data[4 * x + 3]; \
-                } \
-            } \
-          else \
-            { \
-              dest_data[4 * x + 0] = src_data[3 * x + R] / 255.0f; \
-              dest_data[4 * x + 1] = src_data[3 * x + G] / 255.0f; \
-              dest_data[4 * x + 2] = src_data[3 * x + B] / 255.0f; \
-              dest_data[4 * x + 3] = 1.0; \
-            } \
-        } \
-\
-      dest_data += dest_stride; \
-      src_data += src_stride; \
-    } \
-}G_STMT_END
-
-#define CONVERT_FLOAT_PIXEL(func,step) G_STMT_START{\
-  for (y = 0; y < height; y++) \
-    { \
-      for (x = 0; x < width; x++) \
-        { \
-          func (dest_data + 4 * x, src_data + step * x); \
-        } \
-\
-      dest_data += dest_stride; \
-      src_data += src_stride; \
-    } \
-}G_STMT_END
-
-static inline void
-convert_rgb16_to_float (float *dest, const guchar *src_data)
-{
-  const guint16 *src = (const guint16 *) src_data;
-  dest[0] = src[0] / 65535.f;
-  dest[1] = src[1] / 65535.f;
-  dest[2] = src[2] / 65535.f;
-  dest[3] = 1.0;
-}
-
-static inline void
-convert_rgba16_to_float (float *dest, const guchar *src_data)
-{
-  const guint16 *src = (const guint16 *) src_data;
-  dest[0] = src[0] / 65535.f;
-  dest[1] = src[1] / 65535.f;
-  dest[2] = src[2] / 65535.f;
-  dest[3] = 1.0;
-}
-
-static inline void
-convert_rgb16f_to_float (float *dest, const guchar *src_data)
-{
-  guint16 tmp[4];
-  memcpy(tmp, src_data, sizeof(guint16) * 3);
-  tmp[3] = FP16_ONE;
-  half_to_float4 (tmp, dest);
-}
-
-static inline void
-convert_rgba16f_to_float (float *dest, const guchar *src_data)
-{
-  half_to_float4 ((const guint16 *) src_data, dest);
-}
-
-static inline void
-convert_rgb32f_to_float (float *dest, const guchar *src_data)
-{
-  const float *src = (const float *) src_data;
-  dest[0] = src[0];
-  dest[1] = src[1];
-  dest[2] = src[2];
-  dest[3] = 1.0;
-}
-
-static inline void
-convert_rgba32f_to_float (float *dest, const guchar *src_data)
-{
-  const float *src = (const float *) src_data;
-  dest[0] = src[0];
-  dest[1] = src[1];
-  dest[2] = src[2];
-  dest[3] = src[3];
-}
-
-void
-gdk_memory_convert_to_float (float           *dest_data,
-                             gsize            dest_stride,
-                             const guchar    *src_data,
-                             gsize            src_stride,
-                             GdkMemoryFormat  src_format,
-                             gsize            width,
-                             gsize            height)
-{
-  gsize x, y;
-
-  switch (src_format)
-  {
-    case GDK_MEMORY_B8G8R8A8_PREMULTIPLIED:
-      CONVERT_FLOAT (2, 1, 0, 3, FALSE);
-      break;
-    case GDK_MEMORY_A8R8G8B8_PREMULTIPLIED:
-      CONVERT_FLOAT (1, 2, 3, 0, FALSE);
-      break;
-    case GDK_MEMORY_R8G8B8A8_PREMULTIPLIED:
-      CONVERT_FLOAT (0, 1, 2, 3, FALSE);
-      break;
-    case GDK_MEMORY_B8G8R8A8:
-      CONVERT_FLOAT (2, 1, 0, 3, TRUE);
-      break;
-    case GDK_MEMORY_A8R8G8B8:
-      CONVERT_FLOAT (1, 2, 3, 0, TRUE);
-      break;
-    case GDK_MEMORY_R8G8B8A8:
-      CONVERT_FLOAT (0, 1, 2, 3, TRUE);
-      break;
-    case GDK_MEMORY_A8B8G8R8:
-      CONVERT_FLOAT (3, 2, 1, 0, TRUE);
-      break;
-    case GDK_MEMORY_R8G8B8:
-      CONVERT_FLOAT (0, 1, 2, -1, FALSE);
-      break;
-    case GDK_MEMORY_B8G8R8:
-      CONVERT_FLOAT (2, 1, 0, -1, FALSE);
-      break;
-    case GDK_MEMORY_R16G16B16:
-      CONVERT_FLOAT_PIXEL (convert_rgb16_to_float, 3 * sizeof (guint16));
-      break;
-    case GDK_MEMORY_R16G16B16A16_PREMULTIPLIED:
-      CONVERT_FLOAT_PIXEL (convert_rgba16_to_float, 4 * sizeof (guint16));
-      break;
-    case GDK_MEMORY_R16G16B16_FLOAT:
-      CONVERT_FLOAT_PIXEL (convert_rgb16f_to_float, 3 * sizeof (guint16));
-      break;
-    case GDK_MEMORY_R16G16B16A16_FLOAT_PREMULTIPLIED:
-      CONVERT_FLOAT_PIXEL (convert_rgba16f_to_float, 4 * sizeof (guint16));
-      break;
-    case GDK_MEMORY_R32G32B32_FLOAT:
-      CONVERT_FLOAT_PIXEL (convert_rgb32f_to_float, 3 * sizeof (float));
-      break;
-    case GDK_MEMORY_R32G32B32A32_FLOAT_PREMULTIPLIED:
-      CONVERT_FLOAT_PIXEL (convert_rgba32f_to_float, 4 * sizeof (float));
-      break;
-
-    case GDK_MEMORY_N_FORMATS:
-    default:
-      g_assert_not_reached();
-  }
-}
@@ -42,20 +42,6 @@ G_BEGIN_DECLS
 * @GDK_MEMORY_A8B8G8R8: 4 bytes; for alpha, blue, green, red.
 * @GDK_MEMORY_R8G8B8: 3 bytes; for red, green, blue. The data is opaque.
 * @GDK_MEMORY_B8G8R8: 3 bytes; for blue, green, red. The data is opaque.
- * @GDK_MEMORY_R16G16B16: 3 guint16 values; for red, green, blue. Since 4.6
- * @GDK_MEMORY_R16G16B16A16_PREMULTIPLIED: 4 guint16 values; for red, green,
- *   blue, alpha. The color values are premultiplied with the alpha value.
- *   Since 4.6
- * @GDK_MEMORY_R16G16B16_FLOAT: 3 half-float values; for red, green, blue.
- *   The data is opaque. Since 4.6
- * @GDK_MEMORY_R16G16B16A16_FLOAT_PREMULTIPLIED: 4 half-float values; for
- *   red, green, blue and alpha. The color values are premultiplied with
- *   the alpha value. Since 4.6
- * @GDK_MEMORY_B32G32R32_FLOAT: 3 float values; for blue, green, red.
- *   The data is opaque. Since 4.6
- * @GDK_MEMORY_R32G32B32A32_FLOAT_PREMULTIPLIED: 4 float values; for
- *   red, green, blue and alpha. The color values are premultiplied with
- *   the alpha value. Since 4.6
 * @GDK_MEMORY_N_FORMATS: The number of formats. This value will change as
 *   more formats get added, so do not rely on its concrete integer.
 *
@@ -81,12 +67,6 @@ typedef enum {
  GDK_MEMORY_A8B8G8R8,
  GDK_MEMORY_R8G8B8,
  GDK_MEMORY_B8G8R8,
-  GDK_MEMORY_R16G16B16,
-  GDK_MEMORY_R16G16B16A16_PREMULTIPLIED,
-  GDK_MEMORY_R16G16B16_FLOAT,
-  GDK_MEMORY_R16G16B16A16_FLOAT_PREMULTIPLIED,
-  GDK_MEMORY_R32G32B32_FLOAT,
-  GDK_MEMORY_R32G32B32A32_FLOAT_PREMULTIPLIED,

  GDK_MEMORY_N_FORMATS
 } GdkMemoryFormat;
@@ -29,21 +29,7 @@ G_BEGIN_DECLS
 #define GDK_MEMORY_GDK_PIXBUF_OPAQUE GDK_MEMORY_R8G8B8
 #define GDK_MEMORY_GDK_PIXBUF_ALPHA GDK_MEMORY_R8G8B8A8

-typedef enum {
-  GDK_MEMORY_CONVERT_DOWNLOAD_LITTLE_ENDIAN,
-  GDK_MEMORY_CONVERT_DOWNLOAD_BIT_ENDIAN,
-  GDK_MEMORY_CONVERT_GLES_RGBA,
-
-  GDK_MEMORY_N_CONVERSIONS
-} GdkMemoryConversion;
-
-#if G_BYTE_ORDER == G_LITTLE_ENDIAN
-#define GDK_MEMORY_CONVERT_DOWNLOAD GDK_MEMORY_CONVERT_DOWNLOAD_LITTLE_ENDIAN
-#elif G_BYTE_ORDER == G_BIG_ENDIAN
-#define GDK_MEMORY_CONVERT_DOWNLOAD GDK_MEMORY_CONVERT_DOWNLOAD_BIG_ENDIAN
-#else
-#error "Unknown byte order for GDK_MEMORY_CONVERT_DOWNLOAD"
-#endif
+#define GDK_MEMORY_CAIRO_FORMAT_ARGB32 GDK_MEMORY_DEFAULT

 gsize                   gdk_memory_format_bytes_per_pixel   (GdkMemoryFormat    format);

@@ -51,22 +37,14 @@ GdkMemoryFormat         gdk_memory_texture_get_format       (GdkMemoryTexture  *
 const guchar *          gdk_memory_texture_get_data         (GdkMemoryTexture  *self);
 gsize                   gdk_memory_texture_get_stride       (GdkMemoryTexture  *self);

-void                    gdk_memory_convert                  (guchar                     *dest_data,
-                                                             gsize                       dest_stride,
-                                                             GdkMemoryConversion         dest_format,
-                                                             const guchar               *src_data,
-                                                             gsize                       src_stride,
-                                                             GdkMemoryFormat             src_format,
-                                                             gsize                       width,
-                                                             gsize                       height);
-
-void                    gdk_memory_convert_to_float         (float                      *dest_data,
-                                                             gsize                       dest_stride,
-                                                             const guchar               *src_data,
-                                                             gsize                       src_stride,
-                                                             GdkMemoryFormat             src_format,
-                                                             gsize                       width,
-                                                             gsize                       height);
+void                    gdk_memory_convert                  (guchar            *dest_data,
+                                                             gsize              dest_stride,
+                                                             GdkMemoryFormat    dest_format,
+                                                             const guchar      *src_data,
+                                                             gsize              src_stride,
+                                                             GdkMemoryFormat    src_format,
+                                                             gsize              width,
+                                                             gsize              height);


 G_END_DECLS
@@ -30,7 +30,6 @@
 #include <errno.h>
 #include <math.h>

-#include "gdkhslaprivate.h"

 G_DEFINE_BOXED_TYPE (GdkRGBA, gdk_rgba,
                     gdk_rgba_copy, gdk_rgba_free)
@@ -187,7 +186,6 @@ gdk_rgba_parse (GdkRGBA    *rgba,
                const char *spec)
 {
  gboolean has_alpha;
-  gboolean is_hsl;
  double r, g, b, a;
  char *str = (char *) spec;
  char *p;
@@ -198,26 +196,11 @@ gdk_rgba_parse (GdkRGBA    *rgba,
  if (strncmp (str, "rgba", 4) == 0)
    {
      has_alpha = TRUE;
-      is_hsl = FALSE;
      str += 4;
    }
  else if (strncmp (str, "rgb", 3) == 0)
    {
      has_alpha = FALSE;
-      is_hsl = FALSE;
-      a = 1;
-      str += 3;
-    }
-  else if (strncmp (str, "hsla", 4) == 0)
-    {
-      has_alpha = TRUE;
-      is_hsl = TRUE;
-      str += 4;
-    }
-  else if (strncmp (str, "hsl", 3) == 0)
-    {
-      has_alpha = FALSE;
-      is_hsl = TRUE;
      a = 1;
      str += 3;
    }
@@ -308,22 +291,10 @@ gdk_rgba_parse (GdkRGBA    *rgba,

  if (rgba)
    {
-      if (is_hsl)
-        {
-          GdkHSLA hsla;
-          hsla.hue = r * 255;
-          hsla.saturation = CLAMP (g, 0, 1);
-          hsla.lightness = CLAMP (b, 0, 1);
-          hsla.alpha = CLAMP (a, 0, 1);
-          _gdk_rgba_init_from_hsla (rgba, &hsla);
-        }
-      else
-        {
-          rgba->red = CLAMP (r, 0, 1);
-          rgba->green = CLAMP (g, 0, 1);
-          rgba->blue = CLAMP (b, 0, 1);
-          rgba->alpha = CLAMP (a, 0, 1);
-        }
+      rgba->red = CLAMP (r, 0, 1);
+      rgba->green = CLAMP (g, 0, 1);
+      rgba->blue = CLAMP (b, 0, 1);
+      rgba->alpha = CLAMP (a, 0, 1);
    }

  return TRUE;
@@ -491,47 +462,6 @@ parse_color_channel (GtkCssParser *parser,
  }
 }

-static guint
-parse_hsla_color_channel (GtkCssParser *parser,
-                          guint         arg,
-                          gpointer      data)
-{
-  GdkHSLA *hsla = data;
-  double dvalue;
-
-  switch (arg)
-  {
-    case 0:
-      if (!gtk_css_parser_consume_number (parser, &dvalue))
-        return 0;
-      hsla->hue = dvalue;
-      return 1;
-
-    case 1:
-      if (!gtk_css_parser_consume_percentage (parser, &dvalue))
-        return 0;
-      hsla->saturation = CLAMP (dvalue, 0.0, 100.0) / 100.0;
-      return 1;
-
-    case 2:
-      if (!gtk_css_parser_consume_percentage (parser, &dvalue))
-        return 0;
-      hsla->lightness = CLAMP (dvalue, 0.0, 100.0) / 100.0;
-      return 1;
-
-    case 3:
-      if (!gtk_css_parser_consume_number (parser, &dvalue))
-        return 0;
-
-      hsla->alpha = CLAMP (dvalue, 0.0, 1.0) / 1.0;
-      return 1;
-
-    default:
-      g_assert_not_reached ();
-      return 0;
-  }
-}
-
 static gboolean
 rgba_init_chars (GdkRGBA    *rgba,
                 const char  s[8])
@@ -571,18 +501,6 @@ gdk_rgba_parser_parse (GtkCssParser *parser,
    {
      return gtk_css_parser_consume_function (parser, 4, 4, parse_color_channel, rgba);
    }
-  else if (gtk_css_token_is_function (token, "hsl") || gtk_css_token_is_function (token, "hsla"))
-    {
-      GdkHSLA hsla;
-
-      hsla.alpha = 1.0;
-
-      if (!gtk_css_parser_consume_function (parser, 3, 4, parse_hsla_color_channel, &hsla))
-        return FALSE;
-
-      _gdk_rgba_init_from_hsla (rgba, &hsla);
-      return TRUE;
-    }
  else if (gtk_css_token_is (token, GTK_CSS_TOKEN_HASH_ID) ||
           gtk_css_token_is (token, GTK_CSS_TOKEN_HASH_UNRESTRICTED))
    {
@@ -46,11 +46,6 @@
 #include "gdksnapshot.h"

 #include <graphene.h>
-#include "loaders/gdkpngprivate.h"
-#include "loaders/gdktiffprivate.h"
-#include "loaders/gdkjpegprivate.h"
-
-G_DEFINE_QUARK (gdk-texture-error-quark, gdk_texture_error)

 /* HACK: So we don't need to include any (not-yet-created) GSK or GTK headers */
 void
@@ -120,35 +115,13 @@ G_DEFINE_ABSTRACT_TYPE_WITH_CODE (GdkTexture, gdk_texture, G_TYPE_OBJECT,
 #define GDK_TEXTURE_WARN_NOT_IMPLEMENTED_METHOD(obj,method) \
  g_critical ("Texture of type '%s' does not implement GdkTexture::" # method, G_OBJECT_TYPE_NAME (obj))

-static GdkTexture *
-gdk_texture_real_download_texture (GdkTexture *self)
-{
-  GDK_TEXTURE_WARN_NOT_IMPLEMENTED_METHOD (self, download_texture);
-  return NULL;
-}
-
 static void
-gdk_texture_real_download (GdkTexture *texture,
-                           guchar     *data,
-                           gsize      stride)
+gdk_texture_real_download (GdkTexture         *self,
+                           const GdkRectangle *area,
+                           guchar             *data,
+                           gsize               stride)
 {
-  GdkTexture *memory_texture;
-
-  memory_texture = gdk_texture_download_texture (texture);
-  gdk_texture_download (memory_texture, data, stride);
-  g_object_unref (memory_texture);
-}
-
-static void
-gdk_texture_real_download_float (GdkTexture *self,
-                                 float      *data,
-                                 gsize       stride)
-{
-  GdkTexture *memory_texture;
-
-  memory_texture = gdk_texture_download_texture (self);
-  gdk_texture_download_float (memory_texture, data, stride);
-  g_object_unref (memory_texture);
+  GDK_TEXTURE_WARN_NOT_IMPLEMENTED_METHOD (self, download);
 }

 static void
@@ -214,9 +187,7 @@ gdk_texture_class_init (GdkTextureClass *klass)
 {
  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);

-  klass->download_texture = gdk_texture_real_download_texture;
  klass->download = gdk_texture_real_download;
-  klass->download_float = gdk_texture_real_download_float;

  gobject_class->set_property = gdk_texture_set_property;
  gobject_class->get_property = gdk_texture_get_property;
@@ -292,7 +263,7 @@ gdk_texture_new_for_surface (cairo_surface_t *surface)
  
  texture = gdk_memory_texture_new (cairo_image_surface_get_width (surface),
                                    cairo_image_surface_get_height (surface),
-                                    GDK_MEMORY_DEFAULT,
+                                    GDK_MEMORY_CAIRO_FORMAT_ARGB32,
                                    bytes,
                                    cairo_image_surface_get_stride (surface));

@@ -388,92 +359,28 @@ GdkTexture *
 gdk_texture_new_from_file (GFile   *file,
                           GError **error)
 {
-  GBytes *bytes;
  GdkTexture *texture;
+  GdkPixbuf *pixbuf;
+  GInputStream *stream;

  g_return_val_if_fail (G_IS_FILE (file), NULL);
  g_return_val_if_fail (error == NULL || *error == NULL, NULL);

-  bytes = g_file_load_bytes (file, NULL, NULL, error);
-  if (bytes == NULL)
+  stream = G_INPUT_STREAM (g_file_read (file, NULL, error));
+  if (stream == NULL)
    return NULL;

-  texture = gdk_texture_new_from_bytes (bytes, error);
+  pixbuf = gdk_pixbuf_new_from_stream (stream, NULL, error);
+  g_object_unref (stream);
+  if (pixbuf == NULL)
+    return NULL;

-  g_bytes_unref (bytes);
+  texture = gdk_texture_new_for_pixbuf (pixbuf);
+  g_object_unref (pixbuf);

  return texture;
 }

-
-/**
- * gdk_texture_new_from_bytes:
- * @bytes: a `GBytes` containing the data to load
- * @error: Return location for an error
- *
- * Creates a new texture by loading an image from memory,
- *
- * The file format is detected automatically. The supported formats
- * are PNG and JPEG, though more formats might be available.
- *
- * If %NULL is returned, then @error will be set.
- *
- * Return value: A newly-created `GdkTexture`
- *
- * Since: 4.6
- */
-GdkTexture *
-gdk_texture_new_from_bytes (GBytes  *bytes,
-                            GError **error)
-{
-  const char *data;
-  gsize size;
-
-  g_return_val_if_fail (bytes != NULL, NULL);
-  g_return_val_if_fail (error == NULL || *error == NULL, NULL);
-
-  data = g_bytes_get_data (bytes, &size);
-
-  if (size > strlen (PNG_SIGNATURE) &&
-      memcmp (data, PNG_SIGNATURE, strlen (PNG_SIGNATURE)) == 0)
-    {
-      return gdk_load_png (bytes, error);
-    }
-  else if ((size > strlen (TIFF_SIGNATURE1) &&
-            memcmp (data, TIFF_SIGNATURE1, strlen (TIFF_SIGNATURE1)) == 0) ||
-           (size > strlen (TIFF_SIGNATURE2) &&
-            memcmp (data, TIFF_SIGNATURE2, strlen (TIFF_SIGNATURE2)) == 0))
-    {
-      return gdk_load_tiff (bytes, error);
-    }
-  else if (size > strlen (JPEG_SIGNATURE) &&
-           memcmp (data, JPEG_SIGNATURE, strlen (JPEG_SIGNATURE)) == 0)
-    {
-      return gdk_load_jpeg (bytes, error);
-    }
-  else
-    {
-      GInputStream *stream;
-      GdkPixbuf *pixbuf;
-
-      stream = g_memory_input_stream_new_from_bytes (bytes);
-      pixbuf = gdk_pixbuf_new_from_stream (stream, NULL, error);
-      g_object_unref (stream);
-
-      if (pixbuf)
-        {
-          GdkTexture *texture;
-
-          texture = gdk_texture_new_for_pixbuf (pixbuf);
-          g_object_unref (pixbuf);
-
-          return texture;
-        }
-    }
-
-  return NULL;
-}
-
 /**
 * gdk_texture_get_width: (attributes org.gtk.Method.get_property=width)
 * @texture: a `GdkTexture`
@@ -528,6 +435,20 @@ gdk_texture_download_surface (GdkTexture *texture)
  return surface;
 }

+void
+gdk_texture_download_area (GdkTexture         *texture,
+                           const GdkRectangle *area,
+                           guchar             *data,
+                           gsize               stride)
+{
+  g_assert (area->x >= 0);
+  g_assert (area->y >= 0);
+  g_assert (area->x + area->width <= texture->width);
+  g_assert (area->y + area->height <= texture->height);
+
+  GDK_TEXTURE_GET_CLASS (texture)->download (texture, area, data, stride);
+}
+
 /**
 * gdk_texture_download:
 * @texture: a `GdkTexture`
@@ -564,62 +485,10 @@ gdk_texture_download (GdkTexture *texture,
  g_return_if_fail (data != NULL);
  g_return_if_fail (stride >= gdk_texture_get_width (texture) * 4);

-  GDK_TEXTURE_GET_CLASS (texture)->download (texture, data, stride);
-}
-
-/**
- * gdk_texture_download_float:
- * @texture: a `GdkTexture`
- * @data: (array): pointer to enough memory to be filled with the
- *   downloaded data of @texture
- * @stride: rowstride in elements, will usually be equal to
- *   gdk_texture_get_width() * 4
- *
- * Downloads the @texture into local memory in a high dynamic range format.
- *
- * This may be an expensive operation, as the actual texture data
- * may reside on a GPU or on a remote display server and because the data
- * may need to be upsampled if it was not already available in this
- * format.
- *
- * You may want to use [method@Gdk.Texture.download] instead if you don't
- * need high dynamic range support.
- *
- * The data format of the downloaded data is equivalent to
- * GDK_MEMORY_R32G32B32A32_FLOAT_PREMULTIPLIED, so every downloaded
- * pixel requires 16 bytes of memory.
- *
- * Note that the caller is responsible to provide sufficiently
- * aligned memory to access the resulting data directly as floats.
- *
- * Since: 4.6
- */
-void
-gdk_texture_download_float (GdkTexture *texture,
-                            float      *data,
-                            gsize       stride)
-{
-  g_return_if_fail (GDK_IS_TEXTURE (texture));
-  g_return_if_fail (data != NULL);
-  g_return_if_fail (stride >= gdk_texture_get_width (texture) * 4);
-
-  GDK_TEXTURE_GET_CLASS (texture)->download_float (texture, data, stride);
-}
-
-GdkTexture *
-gdk_texture_download_texture (GdkTexture *texture)
-{
-  g_return_val_if_fail (GDK_IS_TEXTURE (texture), NULL);
-
-  g_object_ref (texture);
-  while (!GDK_IS_MEMORY_TEXTURE (texture))
-    {
-      GdkTexture *downloaded = GDK_TEXTURE_GET_CLASS (texture)->download_texture (texture);
-      g_object_unref (texture);
-      texture = downloaded;
-    }
-
-  return texture;
+  gdk_texture_download_area (texture,
+                             &(GdkRectangle) { 0, 0, texture->width, texture->height },
+                             data,
+                             stride);
 }

 gboolean
@@ -671,8 +540,7 @@ gdk_texture_get_render_data (GdkTexture  *self,
 * This is a utility function intended for debugging and testing.
 * If you want more control over formats, proper error handling or
 * want to store to a `GFile` or other location, you might want to
- * use gdk_texture_save_to_png_bytes() or look into the
- * gdk-pixbuf library.
+ * look into using the gdk-pixbuf library.
 *
 * Returns: %TRUE if saving succeeded, %FALSE on failure.
 */
@@ -680,109 +548,30 @@ gboolean
 gdk_texture_save_to_png (GdkTexture *texture,
                         const char *filename)
 {
-  GBytes *bytes;
+  cairo_surface_t *surface;
+  cairo_status_t status;
  gboolean result;

  g_return_val_if_fail (GDK_IS_TEXTURE (texture), FALSE);
  g_return_val_if_fail (filename != NULL, FALSE);

-  bytes = gdk_save_png (texture);
-  result = g_file_set_contents (filename,
-                                g_bytes_get_data (bytes, NULL),
-                                g_bytes_get_size (bytes),
-                                NULL);
-  g_bytes_unref (bytes);
+  surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
+                                        gdk_texture_get_width (texture),
+                                        gdk_texture_get_height (texture));
+  gdk_texture_download (texture,
+                        cairo_image_surface_get_data (surface),
+                        cairo_image_surface_get_stride (surface));
+  cairo_surface_mark_dirty (surface);
+
+  status = cairo_surface_write_to_png (surface, filename);
+
+  if (status != CAIRO_STATUS_SUCCESS ||
+      cairo_surface_status (surface) != CAIRO_STATUS_SUCCESS)
+    result = FALSE;
+  else
+    result = TRUE;
+
+  cairo_surface_destroy (surface);

  return result;
 }
-
-/**
- * gdk_texture_save_to_png_bytes:
- * @texture: a `GdkTexture`
- *
- * Store the given @texture in memory as a PNG file.
- * Use gdk_texture_new_from_bytes() to read it back.
- *
- * If you want to serialize a texture, this is a convenient and
- * portable way to do that.
- *
- * If you need more control over the generated image, such as
- * attaching metadata, you should look into an image handling
- * library such as the gdk-pixbuf library.
- *
- * If you are dealing with high dynamic range float data, you
- * might also want to consider gdk_texture_save_to_tiff_bytes()
- * instead.
- *
- * Returns: a newly allocated `GBytes` containing PNG data
- *
- * Since: 4.6
- */
-GBytes *
-gdk_texture_save_to_png_bytes (GdkTexture *texture)
-{
-  g_return_val_if_fail (GDK_IS_TEXTURE (texture), NULL);
-
-  return gdk_save_png (texture);
-}
-
-/**
- * gdk_texture_save_to_tiff:
- * @texture: a `GdkTexture`
- * @filename: (type filename): the filename to store to
- *
- * Store the given @texture to the @filename as a TIFF file.
- *
- * GTK will attempt to store data without loss.
- * Returns: %TRUE if saving succeeded, %FALSE on failure.
- *
- * Since: 4.6
- */
-gboolean
-gdk_texture_save_to_tiff (GdkTexture  *texture,
-                          const char  *filename)
-{
-  GBytes *bytes;
-  gboolean result;
-
-  g_return_val_if_fail (GDK_IS_TEXTURE (texture), FALSE);
-  g_return_val_if_fail (filename != NULL, FALSE);
-
-  bytes = gdk_save_tiff (texture);
-  result = g_file_set_contents (filename,
-                                g_bytes_get_data (bytes, NULL),
-                                g_bytes_get_size (bytes),
-                                NULL);
-  g_bytes_unref (bytes);
-
-  return result;
-}
-
-/**
- * gdk_texture_save_to_tiff_bytes:
- * @texture: a `GdkTexture`
- *
- * Store the given @texture in memory as a TIFF file.
- * Use gdk_texture_new_from_bytes() to read it back.
- *
- * This function is intended to store a representation of the
- * texture's data that is as accurate as possible. This is
- * particularly relevant when working with high dynamic range
- * images and floating-point texture data.
- *
- * If that is not your concern and you are interested in a
- * smaller size and a more portable format, you might want to
- * use gdk_texture_save_to_png_bytes().
- *
- * Returns: a newly allocated `GBytes` containing TIFF data
- *
- * Since: 4.6
- */
-GBytes *
-gdk_texture_save_to_tiff_bytes (GdkTexture *texture)
-{
-  g_return_val_if_fail (GDK_IS_TEXTURE (texture), NULL);
-
-  return gdk_save_tiff (texture);
-}
-
@@ -38,25 +38,6 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkTexture, g_object_unref)

 typedef struct _GdkTextureClass        GdkTextureClass;

-#define GDK_TEXTURE_ERROR       (gdk_texture_error_quark ())
-
-GDK_AVAILABLE_IN_4_6
-GQuark gdk_texture_error_quark (void);
-
-/**
- * GdkTextureError:
- * @GDK_TEXTURE_ERROR_INSUFFICIENT_MEMORY: Not enough memory to handle this image
- * @GDK_TEXTURE_ERROR_CORRUPT_IMAGE: The image data appears corrupted
- * @GDK_TEXTURE_ERROR_UNSUPPORTED: The image format is not supported
- *
- * Possible errors that can be returned by `GdkTexture` constructors.
- */
-typedef enum
-{
-  GDK_TEXTURE_ERROR_INSUFFICIENT_MEMORY,
-  GDK_TEXTURE_ERROR_CORRUPT_IMAGE,
-  GDK_TEXTURE_ERROR_UNSUPPORTED,
-} GdkTextureError;

 GDK_AVAILABLE_IN_ALL
 GType                   gdk_texture_get_type                   (void) G_GNUC_CONST;
@@ -68,9 +49,6 @@ GdkTexture *            gdk_texture_new_from_resource          (const char
 GDK_AVAILABLE_IN_ALL
 GdkTexture *            gdk_texture_new_from_file              (GFile           *file,
                                                                GError         **error);
-GDK_AVAILABLE_IN_4_6
-GdkTexture *            gdk_texture_new_from_bytes             (GBytes          *bytes,
-                                                                GError         **error);

 GDK_AVAILABLE_IN_ALL
 int                     gdk_texture_get_width                  (GdkTexture      *texture) G_GNUC_PURE;
@@ -81,20 +59,9 @@ GDK_AVAILABLE_IN_ALL
 void                    gdk_texture_download                   (GdkTexture      *texture,
                                                                guchar          *data,
                                                                gsize            stride);
-GDK_AVAILABLE_IN_4_6
-void                    gdk_texture_download_float             (GdkTexture      *texture,
-                                                                float           *data,
-                                                                gsize            stride);
 GDK_AVAILABLE_IN_ALL
 gboolean                gdk_texture_save_to_png                (GdkTexture      *texture,
                                                                const char      *filename);
-GDK_AVAILABLE_IN_4_6
-GBytes *                gdk_texture_save_to_png_bytes          (GdkTexture      *texture);
-GDK_AVAILABLE_IN_4_6
-gboolean                gdk_texture_save_to_tiff               (GdkTexture      *texture,
-                                                                const char      *filename);
-GDK_AVAILABLE_IN_4_6
-GBytes *                gdk_texture_save_to_tiff_bytes         (GdkTexture      *texture);

 G_END_DECLS

@@ -24,15 +24,10 @@ struct _GdkTexture
 struct _GdkTextureClass {
  GObjectClass parent_class;

-  /* mandatory: Download into a GdkMemoryTexture */
-  GdkTexture *          (* download_texture)            (GdkTexture             *texture);
-  /* optional */
  void                  (* download)                    (GdkTexture             *texture,
+                                                         const GdkRectangle     *area,
                                                         guchar                 *data,
                                                         gsize                   stride);
-  void                  (* download_float)              (GdkTexture             *texture,
-                                                         float                  *data,
-                                                         gsize                   stride);
 };

 gpointer                gdk_texture_new                 (const GdkTextureClass  *klass,
@@ -40,8 +35,10 @@ gpointer                gdk_texture_new                 (const GdkTextureClass
                                                         int                     height);
 GdkTexture *            gdk_texture_new_for_surface     (cairo_surface_t        *surface);
 cairo_surface_t *       gdk_texture_download_surface    (GdkTexture             *texture);
-/* NB: GdkMemoryTexture */
-GdkTexture *            gdk_texture_download_texture    (GdkTexture             *texture);
+void                    gdk_texture_download_area       (GdkTexture             *texture,
+                                                         const GdkRectangle     *area,
+                                                         guchar                 *data,
+                                                         gsize                   stride);

 gboolean                gdk_texture_set_render_data     (GdkTexture             *self,
                                                         gpointer                key,
@@ -1,146 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * Copyright (C) 2021 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "config.h"
-
-#include "gdkjpegprivate.h"
-
-#include "gdktexture.h"
-#include "gdkmemorytextureprivate.h"
-#include <jpeglib.h>
-#include <jerror.h>
-#include <setjmp.h>
-
-/* {{{ Error handling */
-
-/* No sigsetjmp on Windows */
-#ifndef HAVE_SIGSETJMP
-#define sigjmp_buf jmp_buf
-#define sigsetjmp(jb, x) setjmp(jb)
-#define siglongjmp longjmp
-#endif
-
-struct error_handler_data {
-        struct jpeg_error_mgr pub;
-        sigjmp_buf setjmp_buffer;
-        GError **error;
-};
-
-static void
-fatal_error_handler (j_common_ptr cinfo)
-{
-  struct error_handler_data *errmgr;
-  char buffer[JMSG_LENGTH_MAX];
-
-  errmgr = (struct error_handler_data *) cinfo->err;
-
-  cinfo->err->format_message (cinfo, buffer);
-
-  if (errmgr->error && *errmgr->error == NULL)
-    g_set_error (errmgr->error,
-                 GDK_TEXTURE_ERROR,
-                 cinfo->err->msg_code == JERR_OUT_OF_MEMORY
-                   ? GDK_TEXTURE_ERROR_INSUFFICIENT_MEMORY
-                   : GDK_TEXTURE_ERROR_CORRUPT_IMAGE,
-                 "Error interpreting JPEG image file (%s)", buffer);
-
-  siglongjmp (errmgr->setjmp_buffer, 1);
-
-  g_assert_not_reached ();
-}
-
-static void
-output_message_handler (j_common_ptr cinfo)
-{
-  /* do nothing */
-}
-
-/* }}} */
- /* {{{ Public API */
-
-GdkTexture *
-gdk_load_jpeg (GBytes  *input_bytes,
-               GError **error)
-{
-  struct jpeg_decompress_struct info;
-  struct error_handler_data jerr;
-  struct jpeg_error_mgr err;
-  int width, height;
-  int size;
-  unsigned char *data;
-  unsigned char *row[1];
-  GBytes *bytes;
-  GdkTexture *texture;
-
-  info.err = jpeg_std_error (&jerr.pub);
-  jerr.pub.error_exit = fatal_error_handler;
-  jerr.pub.output_message = output_message_handler;
-  jerr.error = error;
-
-  if (sigsetjmp (jerr.setjmp_buffer, 1))
-    {
-      jpeg_destroy_decompress (&info);
-      return NULL;
-    }
-
-  info.err = jpeg_std_error (&err);
-  jpeg_create_decompress (&info);
-
-  jpeg_mem_src (&info,
-                g_bytes_get_data (input_bytes, NULL),
-                g_bytes_get_size (input_bytes));
-
-  jpeg_read_header (&info, TRUE);
-  jpeg_start_decompress (&info);
-
-  width = info.output_width;
-  height = info.output_height;
-
-  size = width * height * 3;
-  data = g_try_malloc_n (width * 3, height);
-  if (!data)
-    {
-      g_set_error_literal (error,
-                           GDK_TEXTURE_ERROR, GDK_TEXTURE_ERROR_INSUFFICIENT_MEMORY,
-                           "Not enough memory to load jpeg");
-      jpeg_destroy_decompress (&info);
-      return NULL;
-    }
-
-  while (info.output_scanline < info.output_height)
-    {
-       row[0] = (unsigned char *)(&data[3 *info.output_width * info.output_scanline]);
-       jpeg_read_scanlines (&info, row, 1);
-    }
-
-  jpeg_finish_decompress (&info);
-  jpeg_destroy_decompress (&info);
-
-  bytes = g_bytes_new_take (data, size);
-
-  texture = gdk_memory_texture_new (width, height,
-                                    GDK_MEMORY_R8G8B8,
-                                    bytes, width * 3);
-
-  g_bytes_unref (bytes);
-
-  return texture;
-}
-
-/* }}} */
-
-/* vim:set foldmethod=marker expandtab: */
@@ -1,29 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * Copyright (C) 2021 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __GDK_JPEG_PRIVATE_H__
-#define __GDK_JPEG_PRIVATE_H__
-
-#include "gdkmemorytexture.h"
-#include <gio/gio.h>
-
-#define JPEG_SIGNATURE "\xff\xd8"
-
-GdkTexture *gdk_load_jpeg         (GBytes           *bytes,
-                                   GError          **error);
-
-#endif
@@ -1,242 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * Copyright (C) 2021 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "config.h"
-
-#include "gdkpngprivate.h"
-
-#include "gdktexture.h"
-#include "gdktextureprivate.h"
-#include "gdkmemorytextureprivate.h"
-#include "gsk/ngl/fp16private.h"
-#include <png.h>
-#include <stdio.h>
-
-/* The main difference between the png load/save code here and
- * gdk-pixbuf is that we can support loading 16-bit data in the
- * future, and we can extract gamma and colorspace information
- * to produce linear, color-corrected data.
- */
-
-/* {{{ Format conversion */
-
-static void
-flip_02 (guchar *data,
-         int     width,
-         int     height,
-         int     stride)
-{
-  gsize x, y;
-
-  for (y = 0; y < height; y++)
-    {
-      for (x = 0; x < width; x++)
-        {
-          guchar tmp;
-          tmp = data[x * 4];
-          data[x * 4] = data[x * 4 + 2];
-          data[x * 4 + 2] = tmp;
-        }
-      data += stride;
-    }
-}
-
-static void
-convert_float_to_16bit_inplace (float   *src,
-                                int      width,
-                                int      height)
-{
-  gsize x, y;
-  guint16 *dest = (guint16 *)src;
-
-  for (y = 0; y < height; y++)
-    {
-      for (x = 0; x < width; x++)
-        {
-          dest[4 * x    ] = (guint16) CLAMP(65536.f * src[x * 4    ], 0.f, 65535.f);
-          dest[4 * x + 1] = (guint16) CLAMP(65536.f * src[x * 4 + 1], 0.f, 65535.f);
-          dest[4 * x + 2] = (guint16) CLAMP(65536.f * src[x * 4 + 2], 0.f, 65535.f);
-          dest[4 * x + 3] = (guint16) CLAMP(65536.f * src[x * 4 + 3], 0.f, 65535.f);
-        }
-      dest += width * 4;
-      src += width * 4;
-    }
-} 
-
-/* }}} */
-/* {{{ Public API */
-
-GdkTexture *
-gdk_load_png (GBytes  *bytes,
-              GError **error)
-{
-  png_image image = { NULL, PNG_IMAGE_VERSION, 0, };
-  gsize size;
-  gsize stride;
-  guchar *buffer;
-  GdkTexture *texture;
-  GBytes *out_bytes;
-
-  png_image_begin_read_from_memory (&image,
-                                    g_bytes_get_data (bytes, NULL),
-                                    g_bytes_get_size (bytes));
-
-  if (PNG_IMAGE_FAILED (image))
-    {
-      g_set_error (error,
-                   GDK_TEXTURE_ERROR, GDK_TEXTURE_ERROR_UNSUPPORTED,
-                   "Failed to parse png image (%s)", image.message);
-      png_image_free (&image);
-      return NULL;
-    }
-
-  image.format = PNG_FORMAT_RGBA;
-
-  stride = PNG_IMAGE_ROW_STRIDE (image);
-  size = PNG_IMAGE_BUFFER_SIZE (image, stride);
-  buffer = g_try_malloc (size);
-  if (!buffer)
-    {
-      g_set_error_literal (error,
-                           GDK_TEXTURE_ERROR, GDK_TEXTURE_ERROR_INSUFFICIENT_MEMORY,
-                           "Not enough memory to load png");
-      png_image_free (&image);
-      return NULL;
-    }
-
-  png_image_finish_read (&image, NULL, buffer, stride, NULL);
-
-  if (PNG_IMAGE_FAILED (image))
-    {
-      g_set_error (error,
-                   GDK_TEXTURE_ERROR, GDK_TEXTURE_ERROR_UNSUPPORTED,
-                   "Failed to parse png image (%s)", image.message);
-      png_image_free (&image);
-      return NULL;
-    }
-
-  if (image.format & PNG_FORMAT_FLAG_LINEAR)
-    stride *= 2;
-
-  out_bytes = g_bytes_new_take (buffer, size);
-
-  texture = gdk_memory_texture_new (image.width, image.height,
-                                    GDK_MEMORY_R8G8B8A8_PREMULTIPLIED,
-                                    out_bytes, stride);
-
-  g_bytes_unref (out_bytes);
-
-  png_image_free (&image);
-
-  return texture;
-}
-
-GBytes *
-gdk_save_png (GdkTexture *texture)
-{
-  png_image image = { NULL, PNG_IMAGE_VERSION, 0, };
-  int stride;
-  const guchar *data;
-  guchar *new_data = NULL;
-  png_alloc_size_t size;
-  gpointer buffer;
-  GdkTexture *memory_texture;
-  GdkMemoryFormat format;
-  gboolean result G_GNUC_UNUSED;
-
-  image.width = gdk_texture_get_width (texture);
-  image.height = gdk_texture_get_height (texture);
-
-  memory_texture = gdk_texture_download_texture (texture);
-  format = gdk_memory_texture_get_format (GDK_MEMORY_TEXTURE (memory_texture));
-
-  switch (format)
-    {
-    case GDK_MEMORY_R8G8B8A8_PREMULTIPLIED:
-      data = gdk_memory_texture_get_data (GDK_MEMORY_TEXTURE (memory_texture));
-      stride = gdk_memory_texture_get_stride (GDK_MEMORY_TEXTURE (memory_texture));
-      image.format = PNG_FORMAT_RGBA;
-      break;
-
-    case GDK_MEMORY_B8G8R8A8_PREMULTIPLIED:
-    case GDK_MEMORY_A8R8G8B8_PREMULTIPLIED:
-    case GDK_MEMORY_B8G8R8A8:
-    case GDK_MEMORY_A8R8G8B8:
-    case GDK_MEMORY_R8G8B8A8:
-    case GDK_MEMORY_A8B8G8R8:
-    case GDK_MEMORY_R8G8B8:
-    case GDK_MEMORY_B8G8R8:
-      stride = image.width * 4;
-      new_data = g_malloc (stride * image.height);
-      gdk_texture_download (memory_texture, new_data, stride);
-#if G_BYTE_ORDER == G_LITTLE_ENDIAN
-      flip_02 (new_data, image.width, image.height, stride);
-#endif
-      data = new_data;
-      image.format = PNG_FORMAT_RGBA;
-      break;
-
-    case GDK_MEMORY_R16G16B16:
-      data = gdk_memory_texture_get_data (GDK_MEMORY_TEXTURE (memory_texture));
-      stride = gdk_memory_texture_get_stride (GDK_MEMORY_TEXTURE (memory_texture));
-      image.format = PNG_FORMAT_LINEAR_RGB;
-      break;
-
-    case GDK_MEMORY_R16G16B16A16_PREMULTIPLIED:
-      data = gdk_memory_texture_get_data (GDK_MEMORY_TEXTURE (memory_texture));
-      stride = gdk_memory_texture_get_stride (GDK_MEMORY_TEXTURE (memory_texture));
-      image.format = PNG_FORMAT_LINEAR_RGB_ALPHA;
-      break;
-
-    case GDK_MEMORY_R16G16B16_FLOAT:
-    case GDK_MEMORY_R32G32B32_FLOAT:
-    case GDK_MEMORY_R16G16B16A16_FLOAT_PREMULTIPLIED:
-    case GDK_MEMORY_R32G32B32A32_FLOAT_PREMULTIPLIED:
-      /* This isn't very efficient */
-      new_data = g_malloc (image.width * image.height * 16);
-      gdk_texture_download_float (memory_texture, (float *)new_data, image.width * 16);
-      convert_float_to_16bit_inplace ((float *)new_data, image.width, image.height);
-      data = new_data;
-      stride = image.width * 8;
-      image.format = PNG_FORMAT_LINEAR_RGB_ALPHA;
-      break;
-
-    case GDK_MEMORY_N_FORMATS:
-    default:
-      g_assert_not_reached ();
-    }
-
-  if (image.format & PNG_FORMAT_FLAG_LINEAR)
-    stride /= 2;
-
-  png_image_write_get_memory_size (image, size, FALSE, data, stride, NULL);
-
-  buffer = g_malloc (size);
-  result = png_image_write_to_memory (&image, buffer, &size, FALSE, data, stride, NULL);
-
-  g_assert (result);
-
-  g_object_unref (memory_texture);
-  png_image_free (&image);
-  g_free (new_data);
-
-  return g_bytes_new_take (buffer, size);
-}
-
-/* }}} */
-
-/* vim:set foldmethod=marker expandtab: */
@@ -1,31 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * Copyright (C) 2021 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __GDK_PNG_PRIVATE_H__
-#define __GDK_PNG_PRIVATE_H__
-
-#include "gdktexture.h"
-#include <gio/gio.h>
-
-#define PNG_SIGNATURE "\x89PNG"
-
-GdkTexture *gdk_load_png        (GBytes         *bytes,
-                                 GError        **error);
-
-GBytes     *gdk_save_png        (GdkTexture     *texture);
-
-#endif
@@ -1,502 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * Copyright (C) 2021 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "config.h"
-
-#include "gdktiffprivate.h"
-
-#include "gdktexture.h"
-#include "gdktextureprivate.h"
-#include "gdkmemorytextureprivate.h"
-#include <tiffio.h>
-
-/* Our main interest in tiff as an image format is that it is
- * flexible enough to save all our texture formats without
- * lossy conversions.
- *
- * The loader isn't meant to be a very versatile. It just aims
- * to load the subset that we're saving ourselves. For anything
- * else, we fall back to TIFFRGBAImage, which is the same api
- * that gdk-pixbuf uses.
- */
-
-/* {{{ IO handling */
-
-typedef struct
-{
-  GBytes **out_bytes;
-  gchar *data;
-  gsize size;
-  gsize position;
-} TiffIO;
-
-static void
-tiff_io_warning (const char *module,
-                 const char *fmt,
-                 va_list     ap) G_GNUC_PRINTF(2, 0);
-static void
-tiff_io_warning (const char *module,
-                 const char *fmt,
-                 va_list     ap)
-{
-  g_logv (G_LOG_DOMAIN, G_LOG_LEVEL_MESSAGE, fmt, ap);
-}
-
-static void
-tiff_io_error (const char *module,
-               const char *fmt,
-               va_list     ap) G_GNUC_PRINTF(2, 0);
-static void
-tiff_io_error (const char *module,
-               const char *fmt,
-               va_list     ap)
-{
-  g_logv (G_LOG_DOMAIN, G_LOG_LEVEL_MESSAGE, fmt, ap);
-}
-
-static tsize_t
-tiff_io_read (thandle_t handle,
-              tdata_t   buffer,
-              tsize_t   size)
-{
-  TiffIO *io = (TiffIO *) handle;
-  gsize read;
-
-  read = MIN (size, io->size - io->position);
-
-  memcpy (buffer, io->data + io->position, read);
-  io->position += read;
-
-  return (tsize_t) read;
-}
-
-static tsize_t
-tiff_io_no_write (thandle_t handle,
-                  tdata_t   buffer,
-                  tsize_t   size)
-{
-  errno = EINVAL;
-  return (tsize_t) -1;
-}
-
-static tsize_t
-tiff_io_write (thandle_t handle,
-               tdata_t   buffer,
-               tsize_t   size)
-{
-  TiffIO *io = (TiffIO *) handle;
-
-  if (io->size - io->position < size)
-    {
-      io->size = io->position + size;
-      io->data = g_realloc (io->data, io->size);
-    }
-
-  memcpy (io->data + io->position, buffer, size);
-  io->position += size;
-
-  return (tsize_t) size;
-}
-
-static toff_t
-tiff_io_seek (thandle_t handle,
-              toff_t    offset,
-              int       whence)
-{
-  TiffIO *io = (TiffIO *) handle;
-
-  switch (whence)
-    {
-    default:
-      errno = EINVAL;
-      return -1;
-    case SEEK_SET:
-      break;
-    case SEEK_CUR:
-      offset += io->position;
-      break;
-    case SEEK_END:
-      offset += io->size;
-      break;
-    }
-  if (offset < 0)
-    {
-      errno = EINVAL;
-      return -1;
-    }
-  if (offset > io->size)
-    {
-      /* Linux apparently can do that */
-      errno = EINVAL;
-      return -1;
-    }
-
-  io->position = offset;
-
-  return offset;
-}
-
-static int
-tiff_io_close (thandle_t handle)
-{
-  TiffIO *io = (TiffIO *) handle;
-
-  if (io->out_bytes)
-    *io->out_bytes = g_bytes_new_take (io->data, io->size);
-
-  g_free (io);
-
-  return 0;
-}
-
-static toff_t
-tiff_io_get_file_size (thandle_t handle)
-{
-  TiffIO *io = (TiffIO *) handle;
-
-  return io->size;
-}
-
-static TIFF *
-tiff_open_read (GBytes *bytes)
-{
-  TiffIO *io;
-
-  TIFFSetWarningHandler ((TIFFErrorHandler) tiff_io_warning);
-  TIFFSetErrorHandler ((TIFFErrorHandler) tiff_io_error);
-
-  io = g_new0 (TiffIO, 1);
-
-  io->data = (char *) g_bytes_get_data (bytes, &io->size);
-
-  return TIFFClientOpen ("GTK-read", "r",
-                         (thandle_t) io,
-                         tiff_io_read,
-                         tiff_io_no_write,
-                         tiff_io_seek,
-                         tiff_io_close,
-                         tiff_io_get_file_size,
-                         NULL, NULL);
-}
-
-static TIFF *
-tiff_open_write (GBytes **result)
-{
-  TiffIO *io;
-
-  TIFFSetWarningHandler ((TIFFErrorHandler) tiff_io_warning);
-  TIFFSetErrorHandler ((TIFFErrorHandler) tiff_io_error);
-
-  io = g_new0 (TiffIO, 1);
-
-  io->out_bytes = result;
-
-  return TIFFClientOpen ("GTK-write", "w",
-                         (thandle_t) io,
-                         tiff_io_read,
-                         tiff_io_write,
-                         tiff_io_seek,
-                         tiff_io_close,
-                         tiff_io_get_file_size,
-                         NULL, NULL);
-}
-
-/* }}} */
-/* {{{ Format conversion */
-
-static void
-flip_02 (guchar *data,
-         int     width,
-         int     height,
-         int     stride)
-{ 
-  gsize x, y;
-  
-  for (y = 0; y < height; y++)
-    {
-      for (x = 0; x < width; x++)
-        {
-          guchar tmp;
-          tmp = data[x * 4];
-          data[x * 4] = data[x * 4 + 2];
-          data[x * 4 + 2] = tmp;
-        }
-      data += stride;
-    }
-}
-
-/* }}} */
-/* {{{ Public API */
-
-static struct {
-  GdkMemoryFormat format;
-  guint16 bits_per_sample;
-  guint16 samples_per_pixel;
-  guint16 sample_format;
-} format_data[] = {
-  { GDK_MEMORY_R8G8B8A8_PREMULTIPLIED,            8, 4, SAMPLEFORMAT_UINT   },
-  { GDK_MEMORY_R8G8B8,                            8, 3, SAMPLEFORMAT_UINT   },
-  { GDK_MEMORY_R16G16B16,                        16, 3, SAMPLEFORMAT_UINT   },
-  { GDK_MEMORY_R16G16B16A16_PREMULTIPLIED,       16, 4, SAMPLEFORMAT_UINT   },
-  { GDK_MEMORY_R16G16B16_FLOAT,                  16, 3, SAMPLEFORMAT_IEEEFP },
-  { GDK_MEMORY_R16G16B16A16_FLOAT_PREMULTIPLIED, 16, 4, SAMPLEFORMAT_IEEEFP },
-  { GDK_MEMORY_R32G32B32_FLOAT,                  32, 3, SAMPLEFORMAT_IEEEFP },
-  { GDK_MEMORY_R32G32B32A32_FLOAT_PREMULTIPLIED, 32, 4, SAMPLEFORMAT_IEEEFP },
-};
-
-GBytes *
-gdk_save_tiff (GdkTexture *texture)
-{
-  TIFF *tif;
-  int width, height, stride;
-  guint16 bits_per_sample = 0;
-  guint16 samples_per_pixel = 0;
-  guint16 sample_format = 0;
-  const guchar *line;
-  const guchar *data;
-  guchar *new_data = NULL;
-  GBytes *result = NULL;
-  GdkTexture *memory_texture;
-  GdkMemoryFormat format;
-
-  tif = tiff_open_write (&result);
-
-  width = gdk_texture_get_width (texture);
-  height = gdk_texture_get_height (texture);
-
-  memory_texture = gdk_texture_download_texture (texture);
-  format = gdk_memory_texture_get_format (GDK_MEMORY_TEXTURE (memory_texture));
-
-  for (int i = 0; i < G_N_ELEMENTS (format_data); i++)
-    {
-      if (format == format_data[i].format)
-        {
-          data = gdk_memory_texture_get_data (GDK_MEMORY_TEXTURE (memory_texture));
-          stride = gdk_memory_texture_get_stride (GDK_MEMORY_TEXTURE (memory_texture));
-          bits_per_sample = format_data[i].bits_per_sample;
-          samples_per_pixel = format_data[i].samples_per_pixel;
-          sample_format = format_data[i].sample_format;
-          break;
-        }
-    }
-
-  if (bits_per_sample == 0)
-    {
-      /* An 8-bit format we don't have in the table, handle
-       * it by converting to R8G8B8A8_PREMULTIPLIED
-       */
-      stride = width * 4;
-      new_data = g_malloc (stride * height);
-      gdk_texture_download (memory_texture, new_data, stride);
-#if G_BYTE_ORDER == G_LITTLE_ENDIAN
-      flip_02 (new_data, width, height, stride);
-#endif
-      data = new_data;
-      bits_per_sample = 8;
-      samples_per_pixel = 4;
-      sample_format = SAMPLEFORMAT_UINT;
-    }
-
-  TIFFSetField (tif, TIFFTAG_SOFTWARE, "GTK");
-  TIFFSetField (tif, TIFFTAG_IMAGEWIDTH, width);
-  TIFFSetField (tif, TIFFTAG_IMAGELENGTH, height);
-  TIFFSetField (tif, TIFFTAG_BITSPERSAMPLE, bits_per_sample);
-  TIFFSetField (tif, TIFFTAG_SAMPLESPERPIXEL, samples_per_pixel);
-  TIFFSetField (tif, TIFFTAG_SAMPLEFORMAT, sample_format);
-  TIFFSetField (tif, TIFFTAG_ORIENTATION, ORIENTATION_TOPLEFT);
-  TIFFSetField (tif, TIFFTAG_COMPRESSION, COMPRESSION_NONE);
-  // TODO: save gamma / colorspace
-
-  if (samples_per_pixel > 3)
-    {
-      guint16 extra_samples[] = { EXTRASAMPLE_ASSOCALPHA };
-      TIFFSetField (tif, TIFFTAG_EXTRASAMPLES, 1, extra_samples);
-    }
-
-  TIFFSetField (tif, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_RGB);
-  TIFFSetField (tif, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG);
-
-  line = (const guchar *)data;
-  for (int y = 0; y < height; y++)
-    {
-      if (TIFFWriteScanline (tif, (void *)line, y, 0) == -1)
-        {
-          TIFFClose (tif);
-          g_free (new_data);
-          g_object_unref (memory_texture);
-          return NULL;
-        }
-
-      line += stride;
-    }
-
-  TIFFFlushData (tif);
-  TIFFClose (tif);
-
-  g_assert (result);
-
-  g_free (new_data);
-  g_object_unref (memory_texture);
-
-  return result;
-}
-
-static GdkTexture *
-load_fallback (TIFF    *tif,
-               GError **error)
-{
-  int width, height;
-  guchar *data;
-  GBytes *bytes;
-  GdkTexture *texture;
-
-  TIFFGetField (tif, TIFFTAG_IMAGEWIDTH, &width);
-  TIFFGetField (tif, TIFFTAG_IMAGELENGTH, &height);
-
-  data = g_malloc (width * height * 4);
-
-  if (!TIFFReadRGBAImageOriented (tif, width, height, (uint32 *)data, ORIENTATION_TOPLEFT, 1))
-    {
-      g_set_error_literal (error,
-                           G_IO_ERROR, G_IO_ERROR_FAILED,
-                           "Failed to load RGB data from TIFF file");
-      g_free (data);
-      return NULL;
-    }
-
-  bytes = g_bytes_new_take (data, width * height * 4);
-
-  texture = gdk_memory_texture_new (width, height,
-                                    GDK_MEMORY_R8G8B8A8_PREMULTIPLIED,
-                                    bytes,
-                                    width * 4);
-
-  g_bytes_unref (bytes);
-
-  return texture;
-}
-
-GdkTexture *
-gdk_load_tiff (GBytes  *input_bytes,
-               GError **error)
-{
-  TIFF *tif;
-  guint16 samples_per_pixel;
-  guint16 bits_per_sample;
-  guint16 photometric;
-  guint16 planarconfig;
-  guint16 sample_format;
-  guint16 orientation;
-  guint32 width, height;
-  GdkMemoryFormat format;
-  guchar *data, *line;
-  gsize stride;
-  int bpp;
-  GBytes *bytes;
-  GdkTexture *texture;
-
-  tif = tiff_open_read (input_bytes);
-
-  TIFFSetDirectory (tif, 0);
-
-  TIFFGetFieldDefaulted (tif, TIFFTAG_SAMPLESPERPIXEL, &samples_per_pixel);
-  TIFFGetFieldDefaulted (tif, TIFFTAG_BITSPERSAMPLE, &bits_per_sample);
-  TIFFGetFieldDefaulted (tif, TIFFTAG_SAMPLEFORMAT, &sample_format);
-  TIFFGetFieldDefaulted (tif, TIFFTAG_PHOTOMETRIC, &photometric);
-  TIFFGetFieldDefaulted (tif, TIFFTAG_PLANARCONFIG, &planarconfig);
-  TIFFGetFieldDefaulted (tif, TIFFTAG_ORIENTATION, &orientation);
-  TIFFGetFieldDefaulted (tif, TIFFTAG_IMAGEWIDTH, &width);
-  TIFFGetFieldDefaulted (tif, TIFFTAG_IMAGELENGTH, &height);
-
-  if (samples_per_pixel == 4)
-    {
-      guint16 extra;
-      guint16 *extra_types;
-
-      if (!TIFFGetField (tif, TIFFTAG_EXTRASAMPLES, &extra, &extra_types))
-        extra = 0;
-
-      if (extra == 0 || extra_types[0] != EXTRASAMPLE_ASSOCALPHA)
-        {
-          texture = load_fallback (tif, error);
-          TIFFClose (tif);
-          return texture;
-        }
-    }
-
-  format = 0;
-
-  for (int i = 0; i < G_N_ELEMENTS (format_data); i++)
-    {
-      if (format_data[i].sample_format == sample_format &&
-          format_data[i].bits_per_sample == bits_per_sample &&
-          format_data[i].samples_per_pixel == samples_per_pixel)
-        {
-          format = format_data[i].format;
-          break;
-        }
-    }
-
-  if (format == 0 ||
-      photometric != PHOTOMETRIC_RGB ||
-      planarconfig != PLANARCONFIG_CONTIG ||
-      TIFFIsTiled (tif) ||
-      orientation != ORIENTATION_TOPLEFT)
-    {
-      texture = load_fallback (tif, error);
-      TIFFClose (tif);
-      return texture;
-    }
-
-  stride = width * gdk_memory_format_bytes_per_pixel (format);
-
-  g_assert (TIFFScanlineSize (tif) == stride);
-
-  data = g_new (guchar, height * stride);
-
-  line = data;
-  for (int y = 0; y < height; y++)
-    {
-      if (TIFFReadScanline (tif, line, y, 0) == -1)
-        {
-          g_set_error (error,
-                       G_IO_ERROR, G_IO_ERROR_FAILED,
-                       "Reading data failed at row %d", y);
-          TIFFClose (tif);
-          g_free (data);
-          return NULL;
-        }
-
-      line += stride;
-    }
-
-  bpp = gdk_memory_format_bytes_per_pixel (format);
-  bytes = g_bytes_new_take (data, width * height * bpp);
-
-  texture = gdk_memory_texture_new (width, height,
-                                    format,
-                                    bytes, width * bpp);
-  g_bytes_unref (bytes);
-
-  TIFFClose (tif);
-
-  return texture;
-}
-
-/* }}} */
-
-/* vim:set foldmethod=marker expandtab: */
@@ -1,32 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * Copyright (C) 2021 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __GDK_TIFF_PRIVATE_H__
-#define __GDK_TIFF_PRIVATE_H__
-
-#include "gdktexture.h"
-#include <gio/gio.h>
-
-#define TIFF_SIGNATURE1 "MM\x00\x2a"
-#define TIFF_SIGNATURE2 "II\x2a\x00"
-
-GdkTexture *gdk_load_tiff         (GBytes           *bytes,
-                                   GError          **error);
-
-GBytes *    gdk_save_tiff         (GdkTexture       *texture);
-
-#endif
@@ -27,7 +27,6 @@ gdk_public_sources = files([
  'gdkglcontext.c',
  'gdkglobals.c',
  'gdkgltexture.c',
-  'gdkhsla.c',
  'gdkkeys.c',
  'gdkkeyuni.c',
  'gdkmemorytexture.c',
@@ -51,9 +50,6 @@ gdk_public_sources = files([
  'gdktoplevelsize.c',
  'gdktoplevel.c',
  'gdkdragsurface.c',
-  'loaders/gdkpng.c',
-  'loaders/gdktiff.c',
-  'loaders/gdkjpeg.c',
 ])

 gdk_public_headers = files([
@@ -111,7 +107,6 @@ gdk_sources = gdk_public_sources
 gdk_private_h_sources = files([
  'gdkeventsprivate.h',
  'gdkdevicetoolprivate.h',
-  'gdkhslaprivate.h',
  'gdkmonitorprivate.h',
  'gdkseatdefaultprivate.h',
  'gdktoplevelsizeprivate.h',
@@ -259,8 +254,8 @@ endif

 libgdk = static_library('gdk',
  sources: [gdk_sources, gdk_backends_gen_headers, gdkconfig],
-  dependencies: gdk_deps + [libgtk_css_dep, png_dep, tiff_dep, jpeg_dep],
-  link_with: [libgtk_css],
+  dependencies: gdk_deps + [libgtk_css_dep],
+  link_with: [libgtk_css, ],
  include_directories: [confinc, gdkx11_inc, wlinc],
  c_args: libgdk_c_args + common_cflags,
  link_whole: gdk_backends,
@@ -251,5 +251,31 @@ typedef enum
  GSK_GL_UNIFORM_TYPE_VEC4,
 } GskGLUniformType;

+/**
+ * GskTextRenderFlags:
+ * @GSK_TEXT_RENDER_NONE: No antialiasing or hinting
+ * @GSK_TEXT_RENDER_ANTIALIAS: Perform single-color antialiasing
+ * @GSK_TEXT_RENDER_HINT_METRICS: Hint font metrics
+ * @GSK_TEXT_RENDER_HINT_OUTLINES_SLIGHT: Hint outlines slightly to improve
+ *   contrast while retaining good fidelity to original shapes
+ * @GSK_TEXT_RENDER_HINT_OUTLINES_MEDIUM: Hint outlines with medium strength
+ *   giving a compromise between fidelity to the original shapes and contrast
+ * @GSK_TEXT_RENDER_HINT_OUTLINES_FULL: Hint outlines to maximize contrast
+ *
+ * The values of this enumerations describe how font outlines should
+ * be rendered.
+ *
+ * The value passed to [func@Gsk.text_node_new_with_render_flags] can be a
+ * combination of one of the outline values with the antialias and hint
+ * metrics flags.
+ */
+typedef enum {
+  GSK_TEXT_RENDER_NONE                 = 0,
+  GSK_TEXT_RENDER_ANTIALIAS            = 1 << 0,
+  GSK_TEXT_RENDER_HINT_METRICS         = 1 << 1,
+  GSK_TEXT_RENDER_HINT_OUTLINES_SLIGHT = 1 << 2,
+  GSK_TEXT_RENDER_HINT_OUTLINES_MEDIUM = 2 << 2,
+  GSK_TEXT_RENDER_HINT_OUTLINES_FULL   = 3 << 2,
+} GskTextRenderFlags;

 #endif /* __GSK_TYPES_H__ */
@@ -35,3 +35,63 @@ pango_glyph_string_num_glyphs (PangoGlyphString *glyphs)
  return count;
 }

+GskTextRenderFlags
+gsk_text_render_flags_from_cairo (const cairo_font_options_t *options)
+{
+  GskTextRenderFlags flags = GSK_TEXT_RENDER_NONE;
+
+  if (cairo_font_options_get_antialias (options) != CAIRO_ANTIALIAS_NONE)
+    flags |= GSK_TEXT_RENDER_ANTIALIAS;
+
+  if (cairo_font_options_get_hint_metrics (options) == CAIRO_HINT_METRICS_ON)
+    flags |= GSK_TEXT_RENDER_HINT_METRICS;
+
+  switch (cairo_font_options_get_hint_style (options))
+    {
+    case CAIRO_HINT_STYLE_DEFAULT:
+    case CAIRO_HINT_STYLE_NONE:
+      break;
+    case CAIRO_HINT_STYLE_SLIGHT:
+      flags |= GSK_TEXT_RENDER_HINT_OUTLINES_SLIGHT;
+      break;
+    case CAIRO_HINT_STYLE_MEDIUM:
+      flags |= GSK_TEXT_RENDER_HINT_OUTLINES_MEDIUM;
+      break;
+    case CAIRO_HINT_STYLE_FULL:
+      flags |= GSK_TEXT_RENDER_HINT_OUTLINES_FULL;
+      break;
+    default:
+      g_assert_not_reached ();
+    }
+
+  return flags;
+}
+
+void
+gsk_text_render_flags_to_cairo (GskTextRenderFlags    flags,
+                                cairo_font_options_t *options)
+{
+  cairo_font_options_set_hint_metrics (options, flags & GSK_TEXT_RENDER_HINT_METRICS
+                                                ? CAIRO_HINT_METRICS_ON
+                                                : CAIRO_HINT_METRICS_OFF);
+  cairo_font_options_set_antialias (options, flags & GSK_TEXT_RENDER_ANTIALIAS
+                                             ? CAIRO_ANTIALIAS_GRAY
+                                             : CAIRO_ANTIALIAS_NONE);
+  switch (flags & ~(GSK_TEXT_RENDER_ANTIALIAS | GSK_TEXT_RENDER_HINT_METRICS))
+    {
+    case GSK_TEXT_RENDER_NONE:
+      cairo_font_options_set_hint_style (options, CAIRO_HINT_STYLE_NONE);
+      break;
+    case GSK_TEXT_RENDER_HINT_OUTLINES_SLIGHT:
+      cairo_font_options_set_hint_style (options, CAIRO_HINT_STYLE_SLIGHT);
+      break;
+    case GSK_TEXT_RENDER_HINT_OUTLINES_MEDIUM:
+      cairo_font_options_set_hint_style (options, CAIRO_HINT_STYLE_MEDIUM);
+      break;
+    case GSK_TEXT_RENDER_HINT_OUTLINES_FULL:
+      cairo_font_options_set_hint_style (options, CAIRO_HINT_STYLE_FULL);
+      break;
+    default:
+      g_assert_not_reached ();
+    }
+}
@@ -1,8 +1,11 @@
 #ifndef __GSK_PRIVATE_H__
 #define __GSK_PRIVATE_H__

+#include "gskenums.h"
+
 #include <glib.h>
 #include <pango/pango.h>
+#include <cairo.h>

 G_BEGIN_DECLS

@@ -10,6 +13,10 @@ void gsk_ensure_resources (void);

 int pango_glyph_string_num_glyphs (PangoGlyphString *glyphs);

+GskTextRenderFlags gsk_text_render_flags_from_cairo (const cairo_font_options_t *options);
+void               gsk_text_render_flags_to_cairo   (GskTextRenderFlags          flags,
+                                                     cairo_font_options_t       *options);
+
 typedef struct _GskVulkanRender GskVulkanRender;
 typedef struct _GskVulkanRenderPass GskVulkanRenderPass;

@@ -492,6 +492,15 @@ GskRenderNode *         gsk_text_node_new                       (PangoFont
                                                                 PangoGlyphString         *glyphs,
                                                                 const GdkRGBA            *color,
                                                                 const graphene_point_t   *offset);
+GDK_AVAILABLE_IN_4_6
+GskRenderNode *         gsk_text_node_new_with_flags            (PangoFont                  *font,
+                                                                 PangoGlyphString           *glyphs,
+                                                                 const GdkRGBA              *color,
+                                                                 const graphene_point_t     *offset,
+                                                                 GskTextRenderFlags          flags);
+
+GDK_AVAILABLE_IN_4_6
+GskTextRenderFlags      gsk_text_node_get_render_flags          (const GskRenderNode      *node) G_GNUC_PURE;
 GDK_AVAILABLE_IN_ALL
 PangoFont *             gsk_text_node_get_font                  (const GskRenderNode      *node) G_GNUC_PURE;
 GDK_AVAILABLE_IN_ALL
@@ -4336,7 +4336,8 @@ struct _GskTextNode
  GskRenderNode render_node;

  PangoFont *font;
-  gboolean has_color_glyphs;
+  guint has_color_glyphs : 1;
+  guint render_flags     : 4;

  GdkRGBA color;
  graphene_point_t offset;
@@ -4363,6 +4364,7 @@ gsk_text_node_draw (GskRenderNode *node,
 {
  GskTextNode *self = (GskTextNode *) node;
  PangoGlyphString glyphs;
+  cairo_font_options_t *options;

  glyphs.num_glyphs = self->num_glyphs;
  glyphs.glyphs = self->glyphs;
@@ -4370,6 +4372,11 @@ gsk_text_node_draw (GskRenderNode *node,

  cairo_save (cr);

+  options = cairo_font_options_create ();
+  gsk_text_render_flags_to_cairo (self->render_flags, options);
+  cairo_set_font_options (cr, options);
+  cairo_font_options_destroy (options);
+
  gdk_cairo_set_source_rgba (cr, &self->color);
  cairo_translate (cr, self->offset.x, self->offset.y);
  pango_cairo_show_glyph_string (cr, self->font, &glyphs);
@@ -4388,7 +4395,8 @@ gsk_text_node_diff (GskRenderNode  *node1,
  if (self1->font == self2->font &&
      gdk_rgba_equal (&self1->color, &self2->color) &&
      graphene_point_equal (&self1->offset, &self2->offset) &&
-      self1->num_glyphs == self2->num_glyphs)
+      self1->num_glyphs == self2->num_glyphs &&
+      self1->render_flags == self2->render_flags)
    {
      guint i;

@@ -4402,7 +4410,7 @@ gsk_text_node_diff (GskRenderNode  *node1,
              info1->geometry.x_offset == info2->geometry.x_offset &&
              info1->geometry.y_offset == info2->geometry.y_offset &&
              info1->attr.is_cluster_start == info2->attr.is_cluster_start &&
-              info1->attr.is_color == info2->attr.is_color)
+              info1->attr.is_color == info2->is_color)
            continue;

          gsk_render_node_diff_impossible (node1, node2, region);
@@ -4416,24 +4424,31 @@ gsk_text_node_diff (GskRenderNode  *node1,
 }

 /**
- * gsk_text_node_new:
+ * gsk_text_node_new_with_flags:
 * @font: the `PangoFont` containing the glyphs
 * @glyphs: the `PangoGlyphString` to render
 * @color: the foreground color to render with
 * @offset: offset of the baseline
+ * @flags: `GskTextRenderFlags`
 *
 * Creates a render node that renders the given glyphs.
 *
 * Note that @color may not be used if the font contains
 * color glyphs.
 *
+ * For best results, the @flags should match the cairo font
+ * options the were used to generated the @glyhs.
+ *
 * Returns: (nullable) (transfer full) (type GskTextNode): a new `GskRenderNode`
+ *
+ * Since: 4.6
 */
 GskRenderNode *
-gsk_text_node_new (PangoFont              *font,
-                   PangoGlyphString       *glyphs,
-                   const GdkRGBA          *color,
-                   const graphene_point_t *offset)
+gsk_text_node_new_with_flags (PangoFont                  *font,
+                              PangoGlyphString           *glyphs,
+                              const GdkRGBA              *color,
+                              const graphene_point_t     *offset,
+                              GskTextRenderFlags          flags)
 {
  GskTextNode *self;
  GskRenderNode *node;
@@ -4455,6 +4470,7 @@ gsk_text_node_new (PangoFont              *font,
  self->color = *color;
  self->offset = *offset;
  self->has_color_glyphs = FALSE;
+  self->render_flags = flags;

  glyph_infos = g_malloc_n (glyphs->num_glyphs, sizeof (PangoGlyphInfo));

@@ -4485,6 +4501,49 @@ gsk_text_node_new (PangoFont              *font,
  return node;
 }

+
+/**
+ * gsk_text_node_new:
+ * @font: the `PangoFont` containing the glyphs
+ * @glyphs: the `PangoGlyphString` to render
+ * @color: the foreground color to render with
+ * @offset: offset of the baseline
+ *
+ * Creates a render node that renders the given glyphs.
+ *
+ * Note that @color may not be used if the font contains
+ * color glyphs.
+ *
+ * Returns: (nullable) (transfer full) (type GskTextNode): a new `GskRenderNode`
+ */
+GskRenderNode *
+gsk_text_node_new (PangoFont              *font,
+                   PangoGlyphString       *glyphs,
+                   const GdkRGBA          *color,
+                   const graphene_point_t *offset)
+{
+  return gsk_text_node_new_with_flags (font, glyphs, color, offset,
+                                       GSK_TEXT_RENDER_ANTIALIAS);
+}
+
+/**
+ * gsk_text_node_get_render_flags:
+ * @node: (type GskTextNode): a text `GskRenderNode`
+ *
+ * Retrieves render flags for @node.
+ *
+ * Returns: the render flags
+ *
+ * Since: 4.6
+ */
+GskTextRenderFlags
+gsk_text_node_get_render_flags (const GskRenderNode *node)
+{
+  const GskTextNode *self = (const GskTextNode *) node;
+
+  return self->render_flags;
+}
+
 /**
 * gsk_text_node_get_color:
 * @node: (type GskTextNode): a text `GskRenderNode`
@@ -5674,7 +5733,7 @@ gsk_render_node_content_serializer_finish (GObject      *source,
  GOutputStream *stream = G_OUTPUT_STREAM (source);
  GError *error = NULL;

-  if (g_output_stream_splice_finish (stream, result, &error) < 0)
+  if (!g_output_stream_write_bytes_finish (stream, result, &error))
    gdk_content_serializer_return_error (serializer, error);
  else
    gdk_content_serializer_return_success (serializer);
@@ -5683,7 +5742,6 @@ gsk_render_node_content_serializer_finish (GObject      *source,
 static void
 gsk_render_node_content_serializer (GdkContentSerializer *serializer)
 {
-  GInputStream *input;
  const GValue *value;
  GskRenderNode *node;
  GBytes *bytes;
@@ -5691,16 +5749,13 @@ gsk_render_node_content_serializer (GdkContentSerializer *serializer)
  value = gdk_content_serializer_get_value (serializer);
  node = gsk_value_get_render_node (value);
  bytes = gsk_render_node_serialize (node);
-  input = g_memory_input_stream_new_from_bytes (bytes);

-  g_output_stream_splice_async (gdk_content_serializer_get_output_stream (serializer),
-                                input,
-                                G_OUTPUT_STREAM_SPLICE_CLOSE_SOURCE,
-                                gdk_content_serializer_get_priority (serializer),
-                                gdk_content_serializer_get_cancellable (serializer),
-                                gsk_render_node_content_serializer_finish,
-                                serializer);
-  g_object_unref (input);
+  g_output_stream_write_bytes_async (gdk_content_serializer_get_output_stream (serializer),
+                                     bytes,
+                                     gdk_content_serializer_get_priority (serializer),
+                                     gdk_content_serializer_get_cancellable (serializer),
+                                     gsk_render_node_content_serializer_finish,
+                                     serializer);
  g_bytes_unref (bytes);
 }

@@ -94,8 +94,15 @@ parse_texture (GtkCssParser *parser,
      bytes = gtk_css_data_url_parse (url, NULL, &error);
      if (bytes)
        {
-          texture = gdk_texture_new_from_bytes (bytes, &error);
+          stream = g_memory_input_stream_new_from_bytes (bytes);
          g_bytes_unref (bytes);
+          pixbuf = gdk_pixbuf_new_from_stream (stream, NULL, &error);
+          g_object_unref (stream);
+          if (pixbuf != NULL)
+            {
+              texture = gdk_texture_new_for_pixbuf (pixbuf);
+              g_object_unref (pixbuf);
+            }
        }
    }
  else
@@ -2683,23 +2690,26 @@ render_node_print (Printer       *p,
    case GSK_TEXTURE_NODE:
      {
        GdkTexture *texture = gsk_texture_node_get_texture (node);
-        GBytes *bytes;
+        cairo_surface_t *surface;
+        GByteArray *array;

        start_node (p, "texture");
        append_rect_param (p, "bounds", &node->bounds);

-        bytes = gdk_texture_save_to_png_bytes (texture);
+        surface = gdk_texture_download_surface (texture);
+        array = g_byte_array_new ();
+        cairo_surface_write_to_png_stream (surface, cairo_write_array, array);

        _indent (p);
        g_string_append (p->str, "texture: url(\"data:image/png;base64,");
-        b64 = base64_encode_with_linebreaks (g_bytes_get_data (bytes, NULL),
-                                             g_bytes_get_size (bytes));
+        b64 = base64_encode_with_linebreaks (array->data, array->len);
        append_escaping_newlines (p->str, b64);
        g_free (b64);
        g_string_append (p->str, "\");\n");
        end_node (p);

-        g_bytes_unref (bytes);
+        g_byte_array_free (array, TRUE);
+        cairo_surface_destroy (surface);
      }
      break;

@@ -37,7 +37,7 @@ as_float (const guint x)
 // IEEE-754 16-bit floating-point format (without infinity): 1-5-10

 static inline float
-half_to_float_one (const guint16 x)
+half_to_float (const guint16 x)
 {
  const guint e = (x&0x7C00)>>10; // exponent
  const guint m = (x&0x03FF)<<13; // mantissa
@@ -46,7 +46,7 @@ half_to_float_one (const guint16 x)
 }

 static inline guint16
-float_to_half_one (const float x)
+float_to_half (const float x)
 {
  const guint b = as_uint(x)+0x00001000; // round-to-nearest-even
  const guint e = (b&0x7F800000)>>23; // exponent
@@ -58,38 +58,20 @@ void
 float_to_half4_c (const float f[4],
                  guint16     h[4])
 {
-  h[0] = float_to_half_one (f[0]);
-  h[1] = float_to_half_one (f[1]);
-  h[2] = float_to_half_one (f[2]);
-  h[3] = float_to_half_one (f[3]);
+  h[0] = float_to_half (f[0]);
+  h[1] = float_to_half (f[1]);
+  h[2] = float_to_half (f[2]);
+  h[3] = float_to_half (f[3]);
 }

 void
 half_to_float4_c (const guint16 h[4],
                  float         f[4])
 {
-  f[0] = half_to_float_one (h[0]);
-  f[1] = half_to_float_one (h[1]);
-  f[2] = half_to_float_one (h[2]);
-  f[3] = half_to_float_one (h[3]);
-}
-
-void
-float_to_half_c (const float *f,
-                 guint16     *h,
-                 int          n)
-{
-  for (int i = 0; i < n; i++)
-    h[i] = float_to_half_one (f[i]);
-}
-
-void
-half_to_float_c (const guint16 *h,
-                 float         *f,
-                 int            n)
-{
-  for (int i = 0; i < n; i++)
-    f[i] = half_to_float_one (h[i]);
+  f[0] = half_to_float (h[0]);
+  f[1] = half_to_float (h[1]);
+  f[2] = half_to_float (h[2]);
+  f[3] = half_to_float (h[3]);
 }

 #ifdef HAVE_F16C
@@ -140,30 +122,10 @@ half_to_float4 (const guint16 h[4], float f[4])
    half_to_float4_c (h, f);
 }

-void
-float_to_half (const float *f, guint16 *h, int n)
-{
-  if (have_f16c_msvc ())
-    float_to_half_f16c (f, h, n);
-  else
-    float_to_half4_c (f, h, n);
-}
-
-void
-half_to_float (const guint16 *h, float *f, int n)
-{
-  if (have_f16c_msvc ())
-    half_to_float_f16c (h, f, n);
-  else
-    half_to_float_c (h, f, n);
-}
-
 #else

 void float_to_half4 (const float f[4], guint16 h[4]) __attribute__((ifunc ("resolve_float_to_half4")));
 void half_to_float4 (const guint16 h[4], float f[4]) __attribute__((ifunc ("resolve_half_to_float4")));
-void float_to_half (const float *f, guint16 *h, int n) __attribute__((ifunc ("resolve_float_to_half")));
-void half_to_float (const guint16 *h, float *f, int n) __attribute__((ifunc ("resolve_half_to_float")));

 static void *
 resolve_float_to_half4 (void)
@@ -185,26 +147,6 @@ resolve_half_to_float4 (void)
    return half_to_float4_c;
 }

-static void *
-resolve_float_to_half (void)
-{
-  __builtin_cpu_init ();
-  if (__builtin_cpu_supports ("f16c"))
-    return float_to_half_f16c;
-  else
-    return float_to_half_c;
-}
-
-static void *
-resolve_half_to_float (void)
-{
-  __builtin_cpu_init ();
-  if (__builtin_cpu_supports ("f16c"))
-    return half_to_float_f16c;
-  else
-    return half_to_float_c;
-}
-
 #endif

 #else /* ! HAVE_F16C */
@@ -226,28 +168,10 @@ half_to_float4 (const guint16 h[4],
  half_to_float4_c (h, f);
 }

-void
-float_to_half (const float *f,
-               guint16     *h,
-               int          n)
-{
-  float_to_half_c (f, h, n);
-}
-
-void
-half_to_float (const guint16 *h,
-               float         *f,
-               int            n)
-{
-  half_to_float_c (h, f, n);
-}
-
 #else

 void float_to_half4 (const float f[4], guint16 h[4]) __attribute__((alias ("float_to_half4_c")));
 void half_to_float4 (const guint16 h[4], float f[4]) __attribute__((alias ("half_to_float4_c")));
-void float_to_half (const float *f, guint16 *h, int n) __attribute__((alias ("float_to_half_c")));
-void half_to_float (const guint16 *h, float *f, int n) __attribute__((alias ("half_to_float_c")));

 #endif

@@ -30,6 +30,7 @@
 #else
 #define CAST_M128I_P(a) (__m128i_u const *) a
 #endif
+
 void
 float_to_half4_f16c (const float f[4],
                     guint16     h[4])
@@ -49,74 +50,4 @@ half_to_float4_f16c (const guint16 h[4],
  _mm_store_ps (f, s);
 }

-#define ALIGNED(p, n) (GPOINTER_TO_UINT(p) % n == 0)
-void
-float_to_half_f16c (const float *f,
-                    guint16     *h,
-                    int          n)
-{
-  __m128 s;
-  __m128i i;
-  int j;
-  const float *ff = f;
-  guint16 *hh = h;
-
-  for (j = 0; j < n; j++)
-    {
-      if (ALIGNED (ff, 16) && ALIGNED (hh, 16))
-        break;
-      ff++;
-      hh++;
-    }
-
-  float_to_half_c (f, h, j);
-
-  for (; j + 4 < n; j += 4)
-    {
-      s = _mm_loadu_ps (ff);
-      i = _mm_cvtps_ph (s, 0);
-      _mm_storel_epi64 ((__m128i*)hh, i);
-      ff += 4;
-      hh += 4;
-    }
-
-  if (j < n)
-    float_to_half_c (ff, hh, n - j);
-}
-
-void
-half_to_float_f16c (const guint16 *h,
-                    float         *f,
-                    int            n)
-{
-  __m128i i;
-  __m128 s;
-  int j;
-  const guint16 *hh = h;
-  float *ff = f;
-
-  for (j = 0; j < n; j++)
-    {
-      if (ALIGNED (ff, 16) && ALIGNED (hh, 16))
-        break;
-      ff++;
-      hh++;
-    }
-
-  half_to_float_c (h, f, j);
-
-  for (; j + 4 < n; j += 4)
-    {
-      i = _mm_loadl_epi64 (CAST_M128I_P (hh));
-      s = _mm_cvtph_ps (i);
-      _mm_store_ps (ff, s);
-      hh += 4;
-      ff += 4;
-    }
-
-  if (j < n)
-    half_to_float_c (hh, ff, n - j);
-}
-
 #endif  /* HAVE_F16C */
-
@@ -35,42 +35,18 @@ void float_to_half4 (const float f[4],
 void half_to_float4 (const guint16 h[4],
                     float         f[4]);

-void float_to_half (const float *f,
-                    guint16     *h,
-                    int          n);
-
-void half_to_float (const guint16 *h,
-                    float         *f,
-                    int            n);
-
 void float_to_half4_f16c (const float f[4],
                          guint16     h[4]);

 void half_to_float4_f16c (const guint16 h[4],
                          float         f[4]);

-void float_to_half_f16c (const float *f,
-                         guint16     *h,
-                         int          n);
-
-void half_to_float_f16c (const guint16 *h,
-                         float         *f,
-                         int            n);
-
 void float_to_half4_c (const float f[4],
                       guint16     h[4]);

 void half_to_float4_c (const guint16 h[4],
                       float         f[4]);

-void float_to_half_c (const float *f,
-                      guint16     *h,
-                      int          n);
-
-void half_to_float_c (const guint16 *h,
-                      float         *f,
-                      int            n);
-
 G_END_DECLS

 #endif
@@ -735,7 +735,8 @@ gsk_ngl_driver_load_texture (GskNglDriver *self,
                             int           mag_filter)
 {
  GdkGLContext *context;
-  GdkTexture *downloaded_texture;
+  GdkTexture *downloaded_texture = NULL;
+  GdkTexture *source_texture;
  GskNglTexture *t;
  guint texture_id;
  int height;
@@ -759,7 +760,21 @@ gsk_ngl_driver_load_texture (GskNglDriver *self,
        }
      else
        {
-          downloaded_texture = gdk_texture_download_texture (texture);
+          cairo_surface_t *surface;
+
+          /* In this case, we have to temporarily make the texture's
+           * context the current one, download its data into our context
+           * and then create a texture from it. */
+          if (texture_context != NULL)
+            gdk_gl_context_make_current (texture_context);
+
+          surface = gdk_texture_download_surface (texture);
+          downloaded_texture = gdk_texture_new_for_surface (surface);
+          cairo_surface_destroy (surface);
+
+          gdk_gl_context_make_current (context);
+
+          source_texture = downloaded_texture;
        }
    }
  else
@@ -770,17 +785,13 @@ gsk_ngl_driver_load_texture (GskNglDriver *self,
            return t->texture_id;
        }

-      downloaded_texture = gdk_texture_download_texture (texture);
+      source_texture = texture;
    }

-  /* The download_texture() call may have switched the GL context. Make sure
-   * the right context is at work again. */
-  gdk_gl_context_make_current (context);
-
  width = gdk_texture_get_width (texture);
  height = gdk_texture_get_height (texture);
  texture_id = gsk_ngl_command_queue_upload_texture (self->command_queue,
-                                                     downloaded_texture,
+                                                     source_texture,
                                                     0,
                                                     0,
                                                     width,
@@ -166,11 +166,18 @@ render_glyph (cairo_surface_t           *surface,
 {
  cairo_t *cr;
  cairo_glyph_t glyph;
+  cairo_font_options_t *options;

  g_assert (surface != NULL);
  g_assert (scaled_font != NULL);

  cr = cairo_create (surface);
+
+  options = cairo_font_options_create ();
+  gsk_text_render_flags_to_cairo (key->render_flags, options);
+  cairo_set_font_options (cr, options);
+  cairo_font_options_destroy (options);
+
  cairo_set_scaled_font (cr, scaled_font);
  cairo_set_source_rgba (cr, 1, 1, 1, 1);

@@ -235,7 +242,7 @@ gsk_ngl_glyph_library_upload_glyph (GskNglGlyphLibrary     *self,
      pixel_data = free_data = g_malloc (width * height * 4);
      gdk_memory_convert (pixel_data,
                          width * 4,
-                          GDK_MEMORY_CONVERT_GLES_RGBA,
+                          GDK_MEMORY_R8G8B8A8_PREMULTIPLIED,
                          cairo_image_surface_get_data (surface),
                          width * 4,
                          GDK_MEMORY_DEFAULT,
@@ -35,7 +35,8 @@ typedef struct _GskNglGlyphKey
  PangoGlyph glyph;
  guint xshift : 2;
  guint yshift : 2;
-  guint scale  : 28; /* times 1024 */
+  guint render_flags : 4;
+  guint scale  : 24; /* times 1024 */
 } GskNglGlyphKey;

 typedef struct _GskNglGlyphValue
@@ -115,7 +115,7 @@ gsk_ngl_icon_library_add (GskNglIconLibrary     *self,
    {
      pixel_data = free_data = g_malloc (width * height * 4);
      gdk_memory_convert (pixel_data, width * 4,
-                          GDK_MEMORY_CONVERT_GLES_RGBA,
+                          GDK_MEMORY_R8G8B8A8_PREMULTIPLIED,
                          surface_data, cairo_image_surface_get_stride (surface),
                          GDK_MEMORY_DEFAULT, width, height);
      gl_format = GL_RGBA;
@@ -2875,8 +2875,12 @@ gsk_ngl_render_job_visit_text_node (GskNglRenderJob     *job,

  rgba_to_half (color, cc);

+  /* We have 24 bits in the key for the scale */
+  g_assert (text_scale * 1024 < (1 << 25));
+
  lookup.font = (PangoFont *)font;
  lookup.scale = (guint) (text_scale * 1024);
+  lookup.render_flags = gsk_text_node_get_render_flags (node);

  yshift = compute_phase_and_pos (y, &ypos);

@@ -104,7 +104,8 @@ gsk_pango_renderer_draw_glyph_item (PangoRenderer  *renderer,
                            glyph_item->glyphs,
                            &color,
                            (float) x / PANGO_SCALE,
-                            (float) y / PANGO_SCALE);
+                            (float) y / PANGO_SCALE,
+                            crenderer->render_flags);
 }

 static void
@@ -467,14 +468,18 @@ gtk_snapshot_append_layout (GtkSnapshot   *snapshot,
                            const GdkRGBA *color)
 {
  GskPangoRenderer *crenderer;
+  PangoContext *context;

  g_return_if_fail (snapshot != NULL);
  g_return_if_fail (PANGO_IS_LAYOUT (layout));

  crenderer = gsk_pango_renderer_acquire ();

+  context = pango_layout_get_context (layout);
+
  crenderer->snapshot = snapshot;
  crenderer->fg_color = color;
+  crenderer->render_flags = gsk_text_render_flags_from_cairo (pango_cairo_context_get_font_options (context));

  pango_renderer_draw_layout (PANGO_RENDERER (crenderer), layout, 0, 0);

@@ -63,6 +63,8 @@ struct _GskPangoRenderer
  /* Error underline color for this widget */
  GdkRGBA               *error_color;

+  GskTextRenderFlags     render_flags;
+
  GskPangoRendererState  state;

  guint                  is_cached_renderer : 1;
@@ -484,26 +484,15 @@ out:
 *
 * Parses a string representing an accelerator.
 *
- * The format looks like “`<Control>a`” or “`<Shift><Alt>F1`”.
+ * The format looks like “<Control>a” or “<Shift><Alt>F1”.
 *
 * The parser is fairly liberal and allows lower or upper case, and also
- * abbreviations such as “`<Ctl>`” and “`<Ctrl>`”.
+ * abbreviations such as “<Ctl>” and “<Ctrl>”. Key names are parsed using
+ * [func@Gdk.keyval_from_name]. For character keys the name is not the symbol,
+ * but the lowercase name, e.g. one would use “<Ctrl>minus” instead of
+ * “<Ctrl>-”.
 *
- * Key names are parsed using [func@Gdk.keyval_from_name]. For character keys
- * the name is not the symbol, but the lowercase name, e.g. one would use
- * “`<Ctrl>minus`” instead of “`<Ctrl>-`”.
- *
- * Modifiers are enclosed in angular brackets `<>`, and match the
- * [enum@Gdk.ModifierType] mask:
- *
- * - `<Shift>` for `GDK_SHIFT_MASK`
- * - `<Ctrl>` for `GDK_CONTROL_MASK`
- * - `<Alt>` for `GDK_ALT_MASK`
- * - `<Meta>` for `GDK_META_MASK`
- * - `<Super>` for `GDK_SUPER_MASK`
- * - `<Hyper>` for `GDK_HYPER_MASK`
- *
- * If the parse operation fails, @accelerator_key and @accelerator_mods will
+ * If the parse fails, @accelerator_key and @accelerator_mods will
 * be set to 0 (zero).
 */
 gboolean
@@ -20,10 +20,10 @@
 #include "gtkcsscolorvalueprivate.h"

 #include "gtkcssstylepropertyprivate.h"
+#include "gtkhslaprivate.h"
 #include "gtkprivate.h"
 #include "gtkstylepropertyprivate.h"

-#include "gdk/gdkhslaprivate.h"
 #include "gdk/gdkrgbaprivate.h"

 typedef enum {
@@ -309,10 +309,10 @@ apply_shade (const GdkRGBA *in,
             GdkRGBA       *out,
             double         factor)
 {
-  GdkHSLA hsla;
+  GtkHSLA hsla;

-  _gdk_hsla_init_from_rgba (&hsla, in);
-  _gdk_hsla_shade (&hsla, &hsla, factor);
+  _gtk_hsla_init_from_rgba (&hsla, in);
+  _gtk_hsla_shade (&hsla, &hsla, factor);

  _gdk_rgba_init_from_hsla (out, &hsla);
 }
@@ -699,8 +699,6 @@ gtk_css_color_value_can_parse (GtkCssParser *parser)
      || gtk_css_parser_has_function (parser, "shade")
      || gtk_css_parser_has_function (parser, "alpha")
      || gtk_css_parser_has_function (parser, "mix")
-      || gtk_css_parser_has_function (parser, "hsl")
-      || gtk_css_parser_has_function (parser, "hsla")
      || gtk_css_parser_has_function (parser, "rgb")
      || gtk_css_parser_has_function (parser, "rgba");
 }
@@ -17,12 +17,12 @@

 #include "config.h"

-#include "gdkhslaprivate.h"
+#include "gtkhslaprivate.h"

 #include <math.h>

 void
-_gdk_hsla_init_from_rgba (GdkHSLA       *hsla,
+_gtk_hsla_init_from_rgba (GtkHSLA       *hsla,
                          const GdkRGBA *rgba)
 {
  float min;
@@ -31,21 +31,21 @@ _gdk_hsla_init_from_rgba (GdkHSLA       *hsla,
  float green;
  float blue;
  float delta;
-
+  
  g_return_if_fail (hsla != NULL);
  g_return_if_fail (rgba != NULL);

  red = rgba->red;
  green = rgba->green;
  blue = rgba->blue;
-
+  
  if (red > green)
    {
      if (red > blue)
        max = red;
      else
        max = blue;
-
+      
      if (green < blue)
        min = green;
      else
@@ -57,25 +57,25 @@ _gdk_hsla_init_from_rgba (GdkHSLA       *hsla,
        max = green;
      else
        max = blue;
-
+      
      if (red < blue)
        min = red;
      else
        min = blue;
    }
-
+  
  hsla->lightness = (max + min) / 2;
  hsla->saturation = 0;
  hsla->hue = 0;
  hsla->alpha = rgba->alpha;
-
+  
  if (max != min)
    {
      if (hsla->lightness <= 0.5)
        hsla->saturation = (max - min) / (max + min);
      else
        hsla->saturation = (max - min) / (2 - max - min);
-
+      
      delta = max -min;
      if (red == max)
        hsla->hue = (green - blue) / delta;
@@ -83,7 +83,7 @@ _gdk_hsla_init_from_rgba (GdkHSLA       *hsla,
        hsla->hue = 2 + (blue - red) / delta;
      else if (blue == max)
        hsla->hue = 4 + (red - green) / delta;
-
+      
      hsla->hue *= 60;
      if (hsla->hue < 0.0)
        hsla->hue += 360;
@@ -92,22 +92,22 @@ _gdk_hsla_init_from_rgba (GdkHSLA       *hsla,

 void
 _gdk_rgba_init_from_hsla (GdkRGBA       *rgba,
-                          const GdkHSLA *hsla)
+                          const GtkHSLA *hsla)
 {
  float hue;
  float lightness;
  float saturation;
  float m1, m2;
-
+  
  lightness = hsla->lightness;
  saturation = hsla->saturation;
-
+  
  if (lightness <= 0.5)
    m2 = lightness * (1 + saturation);
  else
    m2 = lightness + saturation - lightness * saturation;
  m1 = 2 * lightness - m2;
-
+  
  rgba->alpha = hsla->alpha;

  if (saturation == 0)
@@ -123,7 +123,7 @@ _gdk_rgba_init_from_hsla (GdkRGBA       *rgba,
        hue -= 360;
      while (hue < 0)
        hue += 360;
-
+      
      if (hue < 60)
        rgba->red = m1 + (m2 - m1) * hue / 60;
      else if (hue < 180)
@@ -132,13 +132,13 @@ _gdk_rgba_init_from_hsla (GdkRGBA       *rgba,
        rgba->red = m1 + (m2 - m1) * (240 - hue) / 60;
      else
        rgba->red = m1;
-
+      
      hue = hsla->hue;
      while (hue > 360)
        hue -= 360;
      while (hue < 0)
        hue += 360;
-
+      
      if (hue < 60)
        rgba->green = m1 + (m2 - m1) * hue / 60;
      else if (hue < 180)
@@ -147,13 +147,13 @@ _gdk_rgba_init_from_hsla (GdkRGBA       *rgba,
        rgba->green = m1 + (m2 - m1) * (240 - hue) / 60;
      else
        rgba->green = m1;
-
+      
      hue = hsla->hue - 120;
      while (hue > 360)
        hue -= 360;
      while (hue < 0)
        hue += 360;
-
+      
      if (hue < 60)
        rgba->blue = m1 + (m2 - m1) * hue / 60;
      else if (hue < 180)
@@ -166,8 +166,8 @@ _gdk_rgba_init_from_hsla (GdkRGBA       *rgba,
 }

 void
-_gdk_hsla_shade (GdkHSLA       *dest,
-                 const GdkHSLA *src,
+_gtk_hsla_shade (GtkHSLA       *dest,
+                 const GtkHSLA *src,
                 float          factor)
 {
  g_return_if_fail (dest != NULL);
@@ -22,23 +22,23 @@

 G_BEGIN_DECLS

-typedef struct _GdkHSLA GdkHSLA;
+typedef struct _GtkHSLA GtkHSLA;

-struct _GdkHSLA {
+struct _GtkHSLA {
  float hue;
  float saturation;
  float lightness;
  float alpha;
 };

-void            _gdk_hsla_init_from_rgba    (GdkHSLA          *hsla,
+void            _gtk_hsla_init_from_rgba    (GtkHSLA          *hsla,
                                             const GdkRGBA    *rgba);
 /* Yes, I can name that function like this! */
 void            _gdk_rgba_init_from_hsla    (GdkRGBA          *rgba,
-                                             const GdkHSLA    *hsla);
+                                             const GtkHSLA    *hsla);

-void            _gdk_hsla_shade             (GdkHSLA          *dest,
-                                             const GdkHSLA    *src,
+void            _gtk_hsla_shade             (GtkHSLA          *dest,
+                                             const GtkHSLA    *src,
                                             float             factor);

 G_END_DECLS
@@ -33,10 +33,10 @@
 #include "gtkcssrepeatvalueprivate.h"
 #include "gtkcsscolorvalueprivate.h"
 #include "gtkcssstyleprivate.h"
+#include "gtkhslaprivate.h"
 #include "gtkroundedboxprivate.h"
 #include "gtksnapshotprivate.h"

-#include "gdk/gdkhslaprivate.h"
 #include "gsk/gskroundedrectprivate.h"

 typedef struct _GtkBorderImage GtkBorderImage;
@@ -513,10 +513,10 @@ color_shade (const GdkRGBA *color,
             double         factor,
             GdkRGBA       *color_return)
 {
-  GdkHSLA hsla;
+  GtkHSLA hsla;

-  _gdk_hsla_init_from_rgba (&hsla, color);
-  _gdk_hsla_shade (&hsla, &hsla, factor);
+  _gtk_hsla_init_from_rgba (&hsla, color);
+  _gtk_hsla_shade (&hsla, &hsla, factor);
  _gdk_rgba_init_from_hsla (color_return, &hsla);
 }

@@ -2121,22 +2121,24 @@ gtk_snapshot_render_layout (GtkSnapshot     *snapshot,
 }

 void
-gtk_snapshot_append_text (GtkSnapshot           *snapshot,
-                          PangoFont             *font,
-                          PangoGlyphString      *glyphs,
-                          const GdkRGBA         *color,
-                          float                  x,
-                          float                  y)
+gtk_snapshot_append_text (GtkSnapshot                *snapshot,
+                          PangoFont                  *font,
+                          PangoGlyphString           *glyphs,
+                          const GdkRGBA              *color,
+                          float                       x,
+                          float                       y,
+                          GskTextRenderFlags          flags)
 {
  GskRenderNode *node;
  float dx, dy;

  gtk_snapshot_ensure_translate (snapshot, &dx, &dy);

-  node = gsk_text_node_new (font,
-                            glyphs,
-                            color,
-                            &GRAPHENE_POINT_INIT (x + dx, y + dy));
+  node = gsk_text_node_new_with_flags (font,
+                                       glyphs,
+                                       color,
+                                       &GRAPHENE_POINT_INIT (x + dx, y + dy),
+                                       flags);
  if (node == NULL)
    return;

@@ -29,7 +29,8 @@ void                    gtk_snapshot_append_text                (GtkSnapshot
                                                                 PangoGlyphString       *glyphs,
                                                                 const GdkRGBA          *color,
                                                                 float                   x,
-                                                                 float                   y);
+                                                                 float                   y,
+                                                                 GskTextRenderFlags      flags);

 void                    gtk_snapshot_push_collect               (GtkSnapshot            *snapshot);
 GskRenderNode *         gtk_snapshot_pop_collect                (GtkSnapshot            *snapshot);
@@ -690,14 +690,13 @@ gtk_stack_dispose (GObject *obj)
  GtkStack *stack = GTK_STACK (obj);
  GtkStackPrivate *priv = gtk_stack_get_instance_private (stack);
  GtkWidget *child;
-  guint n_pages = g_list_length (priv->children);
+
+  if (priv->pages)
+    g_list_model_items_changed (G_LIST_MODEL (priv->pages), 0, g_list_length (priv->children), 0);

  while ((child = gtk_widget_get_first_child (GTK_WIDGET (stack))))
    stack_remove (stack, child, TRUE);

-  if (priv->pages)
-    g_list_model_items_changed (G_LIST_MODEL (priv->pages), 0, n_pages, 0);
-
  G_OBJECT_CLASS (gtk_stack_parent_class)->dispose (obj);
 }

@@ -397,8 +397,6 @@ static void gtk_text_view_css_changed          (GtkWidget           *widget,
                                                GtkCssStyleChange   *change);
 static void gtk_text_view_direction_changed    (GtkWidget        *widget,
                                                GtkTextDirection  previous_direction);
-static void gtk_text_view_system_setting_changed (GtkWidget           *widget,
-                                                  GtkSystemSetting     setting);
 static void gtk_text_view_state_flags_changed  (GtkWidget        *widget,
 					        GtkStateFlags     previous_state);

@@ -575,7 +573,6 @@ static void gtk_text_view_update_im_spot_location (GtkTextView *text_view);
 static void gtk_text_view_insert_emoji (GtkTextView *text_view);

 static void update_node_ordering (GtkWidget    *widget);
-static void gtk_text_view_update_pango_contexts (GtkTextView *text_view);

 /* GtkTextHandle handlers */
 static void gtk_text_view_handle_drag_started  (GtkTextHandle         *handle,
@@ -822,7 +819,6 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
  widget_class->map = gtk_text_view_map;
  widget_class->css_changed = gtk_text_view_css_changed;
  widget_class->direction_changed = gtk_text_view_direction_changed;
-  widget_class->system_setting_changed = gtk_text_view_system_setting_changed;
  widget_class->state_flags_changed = gtk_text_view_state_flags_changed;
  widget_class->measure = gtk_text_view_measure;
  widget_class->size_allocate = gtk_text_view_size_allocate;
@@ -4988,6 +4984,7 @@ gtk_text_view_css_changed (GtkWidget         *widget,
 {
  GtkTextView *text_view;
  GtkTextViewPrivate *priv;
+  PangoContext *ltr_context, *rtl_context;

  text_view = GTK_TEXT_VIEW (widget);
  priv = text_view->priv;
@@ -5004,13 +5001,16 @@ gtk_text_view_css_changed (GtkWidget         *widget,
      gtk_text_view_set_attributes_from_style (text_view,
                                               priv->layout->default_style);
      gtk_text_layout_default_style_changed (priv->layout);
-    }

-  if ((change == NULL ||
-       gtk_css_style_change_affects (change, GTK_CSS_AFFECTS_TEXT)) &&
-      priv->layout)
-    {
-      gtk_text_view_update_pango_contexts (text_view);
+      ltr_context = gtk_widget_create_pango_context (widget);
+      pango_context_set_base_dir (ltr_context, PANGO_DIRECTION_LTR);
+      rtl_context = gtk_widget_create_pango_context (widget);
+      pango_context_set_base_dir (rtl_context, PANGO_DIRECTION_RTL);
+
+      gtk_text_layout_set_contexts (priv->layout, ltr_context, rtl_context);
+
+      g_object_unref (ltr_context);
+      g_object_unref (rtl_context);
    }
 }

@@ -5028,42 +5028,6 @@ gtk_text_view_direction_changed (GtkWidget        *widget,
    }
 }

-static void
-gtk_text_view_update_pango_contexts (GtkTextView *text_view)
-{
-  GtkWidget *widget = GTK_WIDGET (text_view);
-  GtkTextViewPrivate *priv = text_view->priv;
-  gboolean update_ltr, update_rtl;
-
-  if (!priv->layout)
-    return;
-
- update_ltr = gtk_widget_update_pango_context (widget, priv->layout->ltr_context, GTK_TEXT_DIR_LTR);
-
- update_rtl = gtk_widget_update_pango_context (widget, priv->layout->rtl_context, GTK_TEXT_DIR_RTL);
-
-  if (update_ltr || update_rtl)
-    {
-      GtkTextIter start, end;
-
-      gtk_text_buffer_get_bounds (get_buffer (text_view), &start, &end);
-      gtk_text_layout_invalidate (priv->layout, &start, &end);
-      gtk_widget_queue_draw (widget);
-    }
-}
-
-static void
-gtk_text_view_system_setting_changed (GtkWidget        *widget,
-                                      GtkSystemSetting  setting)
-{
-  if (setting == GTK_SYSTEM_SETTING_DPI ||
-      setting == GTK_SYSTEM_SETTING_FONT_NAME ||
-      setting == GTK_SYSTEM_SETTING_FONT_CONFIG)
-    {
-      gtk_text_view_update_pango_contexts (GTK_TEXT_VIEW (widget));
-    }
-}
-
 static void
 gtk_text_view_state_flags_changed (GtkWidget     *widget,
                                   GtkStateFlags  previous_state)
@@ -7845,8 +7809,8 @@ gtk_text_view_ensure_layout (GtkTextView *text_view)
  if (priv->layout == NULL)
    {
      GtkTextAttributes *style;
-      const GList *iter;
      PangoContext *ltr_context, *rtl_context;
+      const GList *iter;

      DV(g_print(G_STRLOC"\n"));
      
@@ -7879,15 +7843,15 @@ gtk_text_view_ensure_layout (GtkTextView *text_view)
 					  priv->overwrite_mode && priv->editable);

      ltr_context = gtk_widget_create_pango_context (GTK_WIDGET (text_view));
-      rtl_context = gtk_widget_create_pango_context (GTK_WIDGET (text_view));
      pango_context_set_base_dir (ltr_context, PANGO_DIRECTION_LTR);
+      rtl_context = gtk_widget_create_pango_context (GTK_WIDGET (text_view));
      pango_context_set_base_dir (rtl_context, PANGO_DIRECTION_RTL);
+
      gtk_text_layout_set_contexts (priv->layout, ltr_context, rtl_context);
+
      g_object_unref (ltr_context);
      g_object_unref (rtl_context);

-      gtk_text_view_update_pango_contexts (text_view);
-
      gtk_text_view_check_keymap_direction (text_view);

      style = gtk_text_attributes_new ();
@@ -572,7 +572,7 @@ static void             gtk_widget_pop_verify_invariants        (GtkWidget
 #define                 gtk_widget_pop_verify_invariants(widget)
 #endif
 static PangoContext*    gtk_widget_peek_pango_context           (GtkWidget          *widget);
-static void             gtk_widget_update_default_pango_context (GtkWidget          *widget);
+static void             gtk_widget_update_pango_context         (GtkWidget          *widget);
 static void             gtk_widget_propagate_state              (GtkWidget          *widget,
                                                                 const GtkStateData *data);
 static gboolean         gtk_widget_real_mnemonic_activate       (GtkWidget          *widget,
@@ -4957,7 +4957,7 @@ gtk_widget_real_css_changed (GtkWidget         *widget,
      const gboolean has_text = gtk_widget_peek_pango_context (widget) != NULL;

      if (has_text && gtk_css_style_change_affects (change, GTK_CSS_AFFECTS_TEXT))
-        gtk_widget_update_default_pango_context (widget);
+        gtk_widget_update_pango_context (widget);

      if (priv->root)
        {
@@ -4980,7 +4980,7 @@ gtk_widget_real_css_changed (GtkWidget         *widget,
    }
  else
    {
-      gtk_widget_update_default_pango_context (widget);
+      gtk_widget_update_pango_context (widget);

      if (priv->root)
        gtk_widget_queue_resize (widget);
@@ -4997,7 +4997,7 @@ gtk_widget_real_system_setting_changed (GtkWidget        *widget,
      setting == GTK_SYSTEM_SETTING_FONT_NAME ||
      setting == GTK_SYSTEM_SETTING_FONT_CONFIG)
    {
-      gtk_widget_update_default_pango_context (widget);
+      gtk_widget_update_pango_context (widget);
      if (gtk_widget_peek_pango_context (widget))
        gtk_widget_queue_resize (widget);
    }
@@ -6427,10 +6427,9 @@ gtk_widget_get_effective_font_map (GtkWidget *widget)
    return pango_cairo_font_map_get_default ();
 }

-gboolean
-gtk_widget_update_pango_context (GtkWidget        *widget,
-                                 PangoContext     *context,
-                                 GtkTextDirection  direction)
+static gboolean
+update_pango_context (GtkWidget    *widget,
+                      PangoContext *context)
 {
  GtkWidgetPrivate *priv = gtk_widget_get_instance_private (widget);
  GtkCssStyle *style = gtk_css_node_get_style (priv->cssnode);
@@ -6456,10 +6455,9 @@ gtk_widget_update_pango_context (GtkWidget        *widget,
      pango_context_set_round_glyph_positions (context, hint_font_metrics);
    }

-  if (direction != GTK_TEXT_DIR_NONE)
-    pango_context_set_base_dir (context, direction == GTK_TEXT_DIR_LTR
-                                         ? PANGO_DIRECTION_LTR
-                                         : PANGO_DIRECTION_RTL);
+  pango_context_set_base_dir (context,
+                              _gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR ?
+                              PANGO_DIRECTION_LTR : PANGO_DIRECTION_RTL);

  pango_cairo_context_set_resolution (context, _gtk_css_number_value_get (style->core->dpi, 100));

@@ -6485,14 +6483,14 @@ gtk_widget_update_pango_context (GtkWidget        *widget,
 }

 static void
-gtk_widget_update_default_pango_context (GtkWidget *widget)
+gtk_widget_update_pango_context (GtkWidget *widget)
 {
  PangoContext *context = gtk_widget_peek_pango_context (widget);

  if (!context)
    return;

-  if (gtk_widget_update_pango_context (widget, context, _gtk_widget_get_direction (widget)))
+  if (update_pango_context (widget, context))
    gtk_widget_queue_draw (widget);
 }

@@ -6524,7 +6522,7 @@ gtk_widget_set_font_options (GtkWidget                  *widget,
                               options ? cairo_font_options_copy (options) : NULL,
                               (GDestroyNotify)cairo_font_options_destroy);

-      gtk_widget_update_default_pango_context (widget);
+      gtk_widget_update_pango_context (widget);
    }
 }

@@ -6553,7 +6551,7 @@ gtk_widget_set_font_map_recurse (GtkWidget *widget, gpointer user_data)
  if (g_object_get_qdata (G_OBJECT (widget), quark_font_map))
    return;

-  gtk_widget_update_default_pango_context (widget);
+  gtk_widget_update_pango_context (widget);

  gtk_widget_forall (widget, gtk_widget_set_font_map_recurse, user_data);
 }
@@ -6590,7 +6588,7 @@ gtk_widget_set_font_map (GtkWidget    *widget,
                           g_object_ref (font_map),
                           g_object_unref);

-  gtk_widget_update_default_pango_context (widget);
+  gtk_widget_update_pango_context (widget);

  gtk_widget_forall (widget, gtk_widget_set_font_map_recurse, NULL);
 }
@@ -6633,7 +6631,7 @@ gtk_widget_create_pango_context (GtkWidget *widget)
  g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);

  context = pango_font_map_create_context (pango_cairo_font_map_get_default ());
-  gtk_widget_update_pango_context (widget, context, _gtk_widget_get_direction (widget));
+  update_pango_context (widget, context);
  pango_context_set_language (context, gtk_get_default_language ());

  return context;
@@ -7218,7 +7216,7 @@ gtk_widget_emit_direction_changed (GtkWidget        *widget,
  GtkTextDirection direction;
  GtkStateFlags state;

-  gtk_widget_update_default_pango_context (widget);
+  gtk_widget_update_pango_context (widget);

  direction = _gtk_widget_get_direction (widget);

@@ -370,10 +370,6 @@ void    gtk_widget_update_orientation   (GtkWidget      *widget,
 void    gtk_widget_realize_at_context   (GtkWidget *widget);
 void    gtk_widget_unrealize_at_context (GtkWidget *widget);

-gboolean gtk_widget_update_pango_context (GtkWidget        *widget,
-                                          PangoContext     *context,
-                                          GtkTextDirection  direction);
-
 /* inline getters */

 static inline GtkWidget *
@@ -1,5 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
+  <object class="GtkAdjustment" id="scale_adjustment">
+    <property name="lower">1</property>
+    <property name="upper">3</property>
+    <property name="step-increment">1</property>
+    <property name="page-increment">1</property>
+  </object>
+  <object class="GtkAdjustment" id="font_scale_adjustment">
+    <property name="lower">0.5</property>
+    <property name="upper">2</property>
+    <property name="step-increment">0.01</property>
+    <property name="page-increment">0.01</property>
+  </object>
+  <object class="GtkAdjustment" id="slowdown_adjustment">
+    <property name="lower">-3</property>
+    <property name="upper">3</property>
+    <property name="step-increment">1</property>
+    <property name="page-increment">1</property>
+  </object>
+  <object class="GtkAdjustment" id="cursor_size_adjustment">
+    <property name="lower">16</property>
+    <property name="upper">128</property>
+    <property name="step-increment">8</property>
+    <property name="page-increment">8</property>
+  </object>
  <template class="GtkInspectorVisual" parent="GtkWidget">
    <child>
      <object class="GtkScrolledWindow" id="swin">
@@ -118,14 +142,7 @@
                                    <property name="valign">baseline</property>
                                    <property name="max-width-chars">2</property>
                                    <property name="width-chars">2</property>
-                                    <property name="adjustment">
-                                      <object class="GtkAdjustment" id="cursor_size_adjustment">
-                                        <property name="lower">16</property>
-                                        <property name="upper">128</property>
-                                        <property name="step-increment">8</property>
-                                        <property name="page-increment">8</property>
-                                      </object>
-                                    </property>
+                                    <property name="adjustment">cursor_size_adjustment</property>
                                    <property name="snap-to-ticks">1</property>
                                    <property name="hexpand">1</property>
                                  </object>
@@ -201,14 +218,7 @@
                                <child>
                                  <object class="GtkScale" id="font_scale_scale">
                                    <property name="valign">baseline</property>
-                                    <property name="adjustment">
-                                      <object class="GtkAdjustment" id="font_scale_adjustment">
-                                        <property name="lower">0.5</property>
-                                        <property name="upper">2</property>
-                                        <property name="step-increment">0.01</property>
-                                        <property name="page-increment">0.01</property>
-                                      </object>
-                                    </property>
+                                    <property name="adjustment">font_scale_adjustment</property>
                                    <property name="draw-value">0</property>
                                    <property name="hexpand">1</property>
                                    <marks>
@@ -221,7 +231,6 @@
                                    <property name="halign">end</property>
                                    <property name="valign">baseline</property>
                                    <property name="width-chars">4</property>
-                                    <property name="max-width-chars">4</property>
                                    <property name="input-purpose">number</property>
                                  </object>
                                </child>
@@ -281,14 +290,7 @@
                                  <object class="GtkSpinButton" id="hidpi_spin">
                                    <property name="halign">end</property>
                                    <property name="valign">baseline</property>
-                                    <property name="adjustment">
-                                      <object class="GtkAdjustment" id="scale_adjustment">
-                                        <property name="lower">1</property>
-                                        <property name="upper">3</property>
-                                        <property name="step-increment">1</property>
-                                        <property name="page-increment">1</property>
-                                      </object>
-                                    </property>
+                                    <property name="adjustment">scale_adjustment</property>
                                    <property name="snap-to-ticks">1</property>
                                    <property name="hexpand">1</property>
                                  </object>
@@ -337,14 +339,7 @@
                                </child>
                                <child>
                                  <object class="GtkScale" id="slowdown_scale">
-                                    <property name="adjustment">
-                                      <object class="GtkAdjustment" id="slowdown_adjustment">
-                                        <property name="lower">-3</property>
-                                        <property name="upper">3</property>
-                                        <property name="step-increment">1</property>
-                                        <property name="page-increment">1</property>
-                                      </object>
-                                    </property>
+                                    <property name="adjustment">slowdown_adjustment</property>
                                    <property name="valign">baseline</property>
                                    <property name="draw-value">0</property>
                                    <property name="hexpand">1</property>
@@ -358,7 +353,6 @@
                                    <property name="halign">end</property>
                                    <property name="valign">baseline</property>
                                    <property name="width-chars">4</property>
-                                    <property name="max-width-chars">4</property>
                                    <property name="input-purpose">number</property>
                                  </object>
                                </child>
@@ -724,12 +718,6 @@
      <widget name="software_gl_label"/>
    </widgets>
  </object>
-  <object class="GtkSizeGroup">
-    <widgets>
-      <widget name="font_scale_label"/>
-      <widget name="slowdown_label"/>
-    </widgets>
-  </object>
  <object class="GtkSizeGroup">
    <widgets>
      <widget name="theme_combo"/>
@@ -111,6 +111,7 @@ gtk_private_sources = files([
  'gtkfilechooserutils.c',
  'gtkfilesystemmodel.c',
  'gtkgizmo.c',
+  'gtkhsla.c',
  'gtkiconcache.c',
  'gtkiconcachevalidator.c',
  'gtkiconhelper.c',
@@ -150,6 +150,11 @@ cdata.set_quoted('GTK_DATADIR', gtk_datadir)
 cdata.set_quoted('GTK_LIBDIR', gtk_libdir)
 cdata.set_quoted('GTK_SYSCONFDIR', gtk_sysconfdir)
 cdata.set_quoted('GETTEXT_PACKAGE', 'gtk40')
+cdata.set('GTK_MAJOR_VERSION', gtk_major_version)
+cdata.set('GTK_MINOR_VERSION', gtk_minor_version)
+cdata.set('GTK_MICRO_VERSION', gtk_micro_version)
+cdata.set('GTK_BINARY_AGE', gtk_binary_age)
+cdata.set('GTK_INTERFACE_AGE', gtk_interface_age)

 check_headers = [
  'crt/externs.h',
@@ -207,17 +212,6 @@ foreach func : check_functions
  endif
 endforeach

-# We use links() because sigsetjmp() is often a macro hidden behind other macros
-cdata.set('HAVE_SIGSETJMP',
-  cc.links('''#define _POSIX_SOURCE
-              #include <setjmp.h>
-              int main (void) {
-                sigjmp_buf env;
-                sigsetjmp (env, 0);
-                return 0;
-              }''', name: 'sigsetjmp'),
-)
-
 # Check for __uint128_t (gcc) by checking for 128-bit division
 uint128_t_src = '''int main() {
 static __uint128_t v1 = 100;
@@ -400,16 +394,6 @@ pangocairo_dep = dependency('pangocairo', version: pango_req,
 pixbuf_dep     = dependency('gdk-pixbuf-2.0', version: gdk_pixbuf_req,
                            fallback : ['gdk-pixbuf', 'gdkpixbuf_dep'],
                            default_options: ['png=enabled', 'jpeg=enabled', 'builtin_loaders=png,jpeg', 'man=false'])
-png_dep        = dependency('libpng',
-                            fallback: ['libpng', 'libpng_dep'],
-                            required: true)
-tiff_dep       = dependency('libtiff-4',
-                            fallback: ['libtiff', 'libtiff4_dep'],
-                            required: true)
-jpeg_dep       = dependency('libjpeg',
-                            fallback: ['libjpeg-turbo', 'jpeg_dep'],
-                            required: true)
-
 epoxy_dep      = dependency('epoxy', version: epoxy_req,
                            fallback: ['libepoxy', 'libepoxy_dep'])
 harfbuzz_dep   = dependency('harfbuzz', version: '>= 2.1.0', required: false,
@@ -763,7 +747,8 @@ if get_option('build-examples')
 endif

 # config.h
-configure_file(output: 'config.h',
+configure_file(input: 'config.h.meson',
+               output: 'config.h',
               configuration: cdata)

 # Requires
@@ -1,12 +0,0 @@
-[wrap-file]
-directory = libpng-1.6.37
-source_url = https://github.com/glennrp/libpng/archive/v1.6.37.tar.gz
-source_filename = libpng-1.6.37.tar.gz
-source_hash = ca74a0dace179a8422187671aee97dd3892b53e168627145271cad5b5ac81307
-patch_url = https://wrapdb.mesonbuild.com/v2/libpng_1.6.37-3/get_patch
-patch_filename = libpng-1.6.37-3-wrap.zip
-patch_hash = 6c9f32fd9150b3a96ab89be52af664e32207e10aa9f5fb9aa015989ee2dd7100
-
-[provide]
-libpng = libpng_dep
-
@@ -1,12 +0,0 @@
-[wrap-file]
-directory = tiff-4.1.0
-source_url = http://download.osgeo.org/libtiff/tiff-4.1.0.zip
-source_filename = tiff-4.1.0.zip
-source_hash = 6f3dbed9d2ecfed33c7192b5c01884078970657fa21b4ad28e3cdf3438eb2419
-patch_filename = libtiff_4.1.0-4_patch.zip
-patch_url = https://wrapdb.mesonbuild.com/v2/libtiff_4.1.0-4/get_patch
-patch_hash = c0fe078d06e5a7f2480a96c3897a7b3b9fa9a42c08fb76ae5f1dd59e0519a14e
-
-[provide]
-libtiff-4 = libtiff4_dep
-
@@ -3,7 +3,7 @@
 static const char *format_name[] = {
  "BGRAp", "ARGBp", "RGBAp",
  "BGRA", "ARGB", "RGBA", "ABGR",
-  "RGB", "BGR", NULL
+  "RGB", "BGR",
 };

 static const char *
@@ -1,23 +0,0 @@
-a {
-  color: hsl(0, 0%, 0%);
-}
-
-b {
-  color: hsl(120, 100%, 50%);
-}
-
-c {
-  color: hsl(360, 100%, 50%);
-}
-
-d {
-  color: hsl(-314.159, 50%, 50%);
-}
-
-e {
-  color: hsl(0, 0%, 0%, 0.5);
-}
-
-f {
-  color: hsl(1, 2, 3);
-}
@@ -1 +0,0 @@
-hsl.css:22:17-18: error: GTK_CSS_PARSER_ERROR_SYNTAX
@@ -1,19 +0,0 @@
-a {
-  color: rgb(0,0,0);
-}
-
-b {
-  color: rgb(0,255,0);
-}
-
-c {
-  color: rgb(255,0,0);
-}
-
-d {
-  color: rgb(191,161,64);
-}
-
-e {
-  color: rgba(0,0,0,0.5);
-}
@@ -358,9 +358,6 @@ test_data = [
  'freed-string-in-error-messages.css',
  'freed-string-in-error-messages.errors',
  'freed-string-in-error-messages.ref.css',
-  'hsl.css',
-  'hsl.errors',
-  'hsl.ref.css',
  'import-cyclic-1.css',
  'import-cyclic-1.errors',
  'import-cyclic-1.ref.css',
@@ -30,49 +30,6 @@ compare_rgba_values (GValue *v1, GValue *v2)
                         (GdkRGBA *)g_value_get_boxed (v2));
 }

-static gboolean
-textures_equal (GdkTexture *t1,  GdkTexture *t2)
-{
-  guchar *d1, *d2;
-  int width, height;
-  gboolean ret;
-
-  width = gdk_texture_get_width (t1);
-  height = gdk_texture_get_height (t1);
-
-  if (width != gdk_texture_get_width (t2))
-    return FALSE;
-  if (height != gdk_texture_get_height (t2))
-    return FALSE;
-
-  d1 = g_malloc (width * height * 4);
-  d2 = g_malloc (width * height * 4);
-
-  gdk_texture_download (t1, d1, width * 4);
-  gdk_texture_download (t2, d2, width * 4);
-
-  ret = memcmp (d1, d2, width * height * 4) == 0;
-
-  if (!ret)
-    {
-      gdk_texture_save_to_png (t1, "texture1.png");
-      gdk_texture_save_to_png (t2, "texture2.png");
-    }
-  g_free (d1);
-  g_free (d2);
-
-  return ret;
-}
-
-static gboolean
-compare_texture_values (GValue *v1, GValue *v2)
-{
-  return G_VALUE_TYPE (v1) == GDK_TYPE_TEXTURE &&
-         G_VALUE_TYPE (v2) == GDK_TYPE_TEXTURE &&
-         textures_equal ((GdkTexture *)g_value_get_object (v1),
-                         (GdkTexture *)g_value_get_object (v2));
-}
-
 static gboolean
 compare_file_values (GValue *v1, GValue *v2)
 {
@@ -168,7 +125,7 @@ test_content_roundtrip (const GValue     *value,
  TestData data = { 0, };

  data.ostream = g_memory_output_stream_new_resizable ();
-  data.mime_type = mime_type;
+  data.mime_type = g_strdup (mime_type);
  g_value_init (&data.value, G_VALUE_TYPE (value));
  g_value_copy (value, &data.value);
  data.compare = compare;
@@ -225,30 +182,6 @@ test_content_color (void)
  g_value_unset (&value);
 }

-static void
-test_content_texture (gconstpointer data)
-{
-  const char *mimetype = data;
-  GValue value = G_VALUE_INIT;
-  char *path;
-  GFile *file;
-  GdkTexture *texture;
-  GError *error = NULL;
-
-  path = g_test_build_filename (G_TEST_DIST, "image-data", "image.png", NULL);
-  file = g_file_new_for_path (path);
-  texture = gdk_texture_new_from_file (file, &error);
-  g_assert_no_error (error);
-  g_object_unref (file);
-  g_free (path);
-
-  g_value_init (&value, GDK_TYPE_TEXTURE);
-  g_value_set_object (&value, texture);
-  test_content_roundtrip (&value, mimetype, compare_texture_values);
-  g_value_unset (&value);
-  g_object_unref (texture);
-}
-
 static void
 test_content_file (void)
 {
@@ -473,8 +406,6 @@ main (int argc, char *argv[])
  g_test_add_func ("/content/text_plain_utf8", test_content_text_plain_utf8);
  g_test_add_func ("/content/text_plain", test_content_text_plain);
  g_test_add_func ("/content/color", test_content_color);
-  g_test_add_data_func ("/content/texture/png", "image/png", test_content_texture);
-  g_test_add_data_func ("/content/texture/tiff", "image/tiff", test_content_texture);
  g_test_add_func ("/content/file", test_content_file);
  g_test_add_func ("/content/files", test_content_files);
  g_test_add_func ("/content/custom", test_custom_format);
@@ -1,129 +0,0 @@
-#include <gtk/gtk.h>
-#include "gdk/loaders/gdkpngprivate.h"
-#include "gdk/loaders/gdktiffprivate.h"
-#include "gdk/loaders/gdkjpegprivate.h"
-
-static void
-assert_texture_equal (GdkTexture *t1,
-                      GdkTexture *t2)
-{
-  int width;
-  int height;
-  int stride;
-  guchar *d1;
-  guchar *d2;
-
-  width = gdk_texture_get_width (t1);
-  height = gdk_texture_get_height (t1);
-  stride = 4 * width;
-
-  g_assert_cmpint (width, ==, gdk_texture_get_width (t2));
-  g_assert_cmpint (height, ==, gdk_texture_get_height (t2));
-
-  d1 = g_malloc (stride * height);
-  d2 = g_malloc (stride * height);
-
-  gdk_texture_download (t1, d1, stride);
-  gdk_texture_download (t2, d2, stride);
-
-  g_assert_cmpmem (d1, stride * height, d2, stride * height);
-
-  g_free (d1);
-  g_free (d2);
-}
-
-static void
-test_load_image (gconstpointer data)
-{
-  const char *filename = data;
-  GdkTexture *texture;
-  char *path;
-  GFile *file;
-  GBytes *bytes;
-  GError *error = NULL;
-
-  path = g_test_build_filename (G_TEST_DIST, "image-data", filename, NULL);
-  file = g_file_new_for_path (path);
-  bytes = g_file_load_bytes (file, NULL, NULL, &error);
-  g_assert_no_error (error);
-
-  if (g_str_has_suffix (filename, ".png"))
-    texture = gdk_load_png (bytes, &error);
-  else if (g_str_has_suffix (filename, ".tiff"))
-    texture = gdk_load_tiff (bytes, &error);
-  else if (g_str_has_suffix (filename, ".jpeg"))
-    texture = gdk_load_jpeg (bytes, &error);
-  else
-    g_assert_not_reached ();
-
-  g_assert_no_error (error);
-  g_assert_true (GDK_IS_TEXTURE (texture));
-  g_assert_cmpint (gdk_texture_get_width (texture), ==, 32);
-  g_assert_cmpint (gdk_texture_get_height (texture), ==, 32);
-
-  g_object_unref (texture);
-  g_bytes_unref (bytes);
-  g_object_unref (file);
-  g_free (path);
-}
-
-static void
-test_save_image (gconstpointer test_data)
-{
-  const char *filename = test_data;
-  char *path;
-  GFile *file;
-  GdkTexture *texture;
-  GFile *file2;
-  GdkTexture *texture2;
-  GError *error = NULL;
-  GBytes *bytes = NULL;
-  GIOStream *stream;
-
-  path = g_test_build_filename (G_TEST_DIST, "image-data", filename, NULL);
-  file = g_file_new_for_path (path);
-  texture = gdk_texture_new_from_file (file, &error);
-  g_assert_no_error (error);
-
-  if (g_str_has_suffix (filename, ".png"))
-    bytes = gdk_save_png (texture);
-  else if (g_str_has_suffix (filename, ".tiff"))
-    bytes = gdk_save_tiff (texture);
-  else
-    g_assert_not_reached ();
-
-  file2 = g_file_new_tmp ("imageXXXXXX", (GFileIOStream **)&stream, NULL);
-  g_object_unref (stream);
-  g_file_replace_contents (file2,
-                           g_bytes_get_data (bytes, NULL),
-                           g_bytes_get_size (bytes),
-                           NULL, FALSE, 0,
-                           NULL, NULL, &error);
-  g_assert_no_error (error);
-
-  texture2 = gdk_texture_new_from_file (file2, &error);
-  g_assert_no_error (error);
-
-  assert_texture_equal (texture, texture2);
-
-  g_bytes_unref (bytes);
-  g_object_unref (texture2);
-  g_object_unref (file2);
-  g_object_unref (texture);
-  g_object_unref (file);
-  g_free (path);
-}
-
-int
-main (int argc, char *argv[])
-{
-  (g_test_init) (&argc, &argv, NULL);
-
-  g_test_add_data_func ("/image/load/png", "image.png", test_load_image);
-  g_test_add_data_func ("/image/load/tiff", "image.tiff", test_load_image);
-  g_test_add_data_func ("/image/load/jpeg", "image.jpeg", test_load_image);
-  g_test_add_data_func ("/image/save/png", "image.png", test_save_image);
-  g_test_add_data_func ("/image/save/tiff", "image.tiff", test_save_image);
-
-  return g_test_run ();
-}
@@ -1,653 +1,230 @@
-#include <gtk/gtk.h>
+#include <locale.h>
+#include <gdk/gdk.h>

-#include "gsk/ngl/gsknglrenderer.h"
-
-#define N 20
-
-static GskRenderer *gl_renderer = NULL;
-
-typedef struct _TextureBuilder TextureBuilder;
+/* maximum bytes per pixel */
+#define MAX_BPP 4

 typedef enum {
-  TEXTURE_METHOD_LOCAL,
-  TEXTURE_METHOD_GL,
-  TEXTURE_METHOD_GL_RELEASED,
-  TEXTURE_METHOD_PNG,
-  TEXTURE_METHOD_TIFF,
+  BLUE,
+  GREEN,
+  RED,
+  TRANSPARENT,
+  ALMOST_OPAQUE_REBECCAPURPLE,
+  N_COLORS
+} Color;

-  N_TEXTURE_METHODS
-} TextureMethod;
-
-struct _TextureBuilder
-{
-  GdkMemoryFormat format;
-  int width;
-  int height;
-
-  guchar *pixels;
-  gsize stride;
-  gsize offset;
+const char * color_names[N_COLORS] = {
+  "blue",
+  "green",
+  "red",
+  "transparent",
+  "almost_opaque_rebeccapurple"
 };

-static gsize
-gdk_memory_format_bytes_per_pixel (GdkMemoryFormat format)
-{
-  switch (format)
-    {
-    case GDK_MEMORY_R8G8B8:
-    case GDK_MEMORY_B8G8R8:
-      return 3;
+typedef struct _MemoryData {
+  gsize bytes_per_pixel;
+  guint opaque : 1;
+  guchar data[N_COLORS][MAX_BPP];
+} MemoryData;

-    case GDK_MEMORY_B8G8R8A8_PREMULTIPLIED:
-    case GDK_MEMORY_A8R8G8B8_PREMULTIPLIED:
-    case GDK_MEMORY_R8G8B8A8_PREMULTIPLIED:
-    case GDK_MEMORY_B8G8R8A8:
-    case GDK_MEMORY_A8R8G8B8:
-    case GDK_MEMORY_R8G8B8A8:
-    case GDK_MEMORY_A8B8G8R8:
-      return 4;
+typedef struct _TestData {
+  GdkMemoryFormat format;
+  Color color;
+} TestData;

-    case GDK_MEMORY_R16G16B16:
-    case GDK_MEMORY_R16G16B16_FLOAT:
-      return 6;
+#define RGBA(a, b, c, d) { 0x ## a, 0x ## b, 0x ## c, 0x ## d }

-    case GDK_MEMORY_R16G16B16A16_PREMULTIPLIED:
-    case GDK_MEMORY_R16G16B16A16_FLOAT_PREMULTIPLIED:
-      return 8;
-
-    case GDK_MEMORY_R32G32B32_FLOAT:
-      return 12;
-
-    case GDK_MEMORY_R32G32B32A32_FLOAT_PREMULTIPLIED:
-      return 16;
-
-    case GDK_MEMORY_N_FORMATS:
-    default:
-      g_assert_not_reached ();
-      return 4;
-    }
-}
-
-static gboolean
-gdk_memory_format_has_alpha (GdkMemoryFormat format)
-{
-  switch (format)
-    {
-    case GDK_MEMORY_R8G8B8:
-    case GDK_MEMORY_B8G8R8:
-    case GDK_MEMORY_R16G16B16:
-    case GDK_MEMORY_R16G16B16_FLOAT:
-    case GDK_MEMORY_R32G32B32_FLOAT:
-      return FALSE;
-
-    case GDK_MEMORY_B8G8R8A8_PREMULTIPLIED:
-    case GDK_MEMORY_A8R8G8B8_PREMULTIPLIED:
-    case GDK_MEMORY_R8G8B8A8_PREMULTIPLIED:
-    case GDK_MEMORY_B8G8R8A8:
-    case GDK_MEMORY_A8R8G8B8:
-    case GDK_MEMORY_R8G8B8A8:
-    case GDK_MEMORY_A8B8G8R8:
-    case GDK_MEMORY_R16G16B16A16_PREMULTIPLIED:
-    case GDK_MEMORY_R16G16B16A16_FLOAT_PREMULTIPLIED:
-    case GDK_MEMORY_R32G32B32A32_FLOAT_PREMULTIPLIED:
-      return TRUE;
-
-    case GDK_MEMORY_N_FORMATS:
-    default:
-      g_assert_not_reached ();
-      return TRUE;
-    }
-}
-
-static gpointer
-encode (GdkMemoryFormat format,
-        TextureMethod   method)
-{
-  return GSIZE_TO_POINTER (method * GDK_MEMORY_N_FORMATS + format);
-}
+static MemoryData tests[GDK_MEMORY_N_FORMATS] = {
+  { 4, FALSE, { RGBA(FF,00,00,FF), RGBA(00,FF,00,FF), RGBA(00,00,FF,FF), RGBA(00,00,00,00), RGBA(66,22,44,AA) } },
+  { 4, FALSE, { RGBA(FF,00,00,FF), RGBA(FF,00,FF,00), RGBA(FF,FF,00,00), RGBA(00,00,00,00), RGBA(AA,44,22,66) } },
+  { 4, FALSE, { RGBA(00,00,FF,FF), RGBA(00,FF,00,FF), RGBA(FF,00,00,FF), RGBA(00,00,00,00), RGBA(44,22,66,AA) } },
+  { 4, FALSE, { RGBA(FF,00,00,FF), RGBA(00,FF,00,FF), RGBA(00,00,FF,FF), RGBA(00,00,00,00), RGBA(99,33,66,AA) } },
+  { 4, FALSE, { RGBA(FF,00,00,FF), RGBA(FF,00,FF,00), RGBA(FF,FF,00,00), RGBA(00,00,00,00), RGBA(AA,66,33,99) } },
+  { 4, FALSE, { RGBA(00,00,FF,FF), RGBA(00,FF,00,FF), RGBA(FF,00,00,FF), RGBA(00,00,00,00), RGBA(66,33,99,AA) } },
+  { 4, FALSE, { RGBA(FF,FF,00,00), RGBA(FF,00,FF,00), RGBA(FF,00,00,FF), RGBA(00,00,00,00), RGBA(AA,99,33,66) } },
+  { 3, TRUE,  { RGBA(00,00,FF,00), RGBA(00,FF,00,00), RGBA(FF,00,00,00), RGBA(00,00,00,00), RGBA(44,22,66,00) } },
+  { 3, TRUE,  { RGBA(FF,00,00,00), RGBA(00,FF,00,00), RGBA(00,00,FF,00), RGBA(00,00,00,00), RGBA(66,22,44,00) } },
+};

 static void
-decode (gconstpointer     data,
-        GdkMemoryFormat *format,
-        TextureMethod   *method)
+compare_textures (GdkTexture *expected,
+                  GdkTexture *test,
+                  gboolean    ignore_alpha)
 {
-  gsize value = GPOINTER_TO_SIZE (data);
+  guchar *expected_data, *test_data;
+  int width, height;
+  int x, y;

-  *format = value % GDK_MEMORY_N_FORMATS;
-  value /= GDK_MEMORY_N_FORMATS;
+  g_assert_cmpint (gdk_texture_get_width (expected), ==, gdk_texture_get_width (test));
+  g_assert_cmpint (gdk_texture_get_height (expected), ==, gdk_texture_get_height (test));

-  *method = value;
-}
-        
-static void
-texture_builder_init (TextureBuilder  *builder,
-                      GdkMemoryFormat  format,
-                      int              width,
-                      int              height)
-{
-  gsize extra_stride;
+  width = gdk_texture_get_width (expected);
+  height = gdk_texture_get_height (expected);

-  builder->format = format;
-  builder->width = width;
-  builder->height = height;
+  expected_data = g_malloc (width * height * 4);
+  gdk_texture_download (expected, expected_data, width * 4);

-  extra_stride = g_test_rand_bit() ? g_test_rand_int_range (0, 16) : 0;
-  builder->offset = g_test_rand_bit() ? g_test_rand_int_range (0, 128) : 0;
-  builder->stride = width * gdk_memory_format_bytes_per_pixel (format) + extra_stride;
-  builder->pixels = g_malloc0 (builder->offset + builder->stride * height);
+  test_data = g_malloc (width * height * 4);
+  gdk_texture_download (test, test_data, width * 4);
+
+  for (y = 0; y < height; y++)
+    {
+      for (x = 0; x < width; x++)
+        {
+          if (ignore_alpha)
+            g_assert_cmphex (*(guint32 *) &expected_data[y * width + x * 4] & 0xFFFFFF, ==, *(guint32 *) &test_data[y * width + x * 4] & 0xFFFFFF);
+          else
+            g_assert_cmphex (*(guint32 *) &expected_data[y * width + x * 4], ==, *(guint32 *) &test_data[y * width + x * 4]);
+        }
+    }
+
+  g_free (expected_data);
+  g_free (test_data);
 }

 static GdkTexture *
-texture_builder_finish (TextureBuilder *builder)
+create_texture (GdkMemoryFormat  format,
+                Color            color,
+                int              width,
+                int              height,
+                gsize            stride)
 {
-  GBytes *bytes;
  GdkTexture *texture;
+  GBytes *bytes;
+  guchar *data;
+  int x, y;

-  bytes = g_bytes_new_with_free_func (builder->pixels + builder->offset,
-                                      builder->height * builder->stride,
-                                      g_free,
-                                      builder->pixels);
-  texture = gdk_memory_texture_new (builder->width,
-                                    builder->height,
-                                    builder->format,
+  data = g_malloc (height * MAX (stride, tests[format].bytes_per_pixel));
+  for (y = 0; y < height; y++)
+    for (x = 0; x < width; x++)
+      {
+        memcpy (&data[y * stride + x * tests[format].bytes_per_pixel],
+                &tests[format].data[color],
+                tests[format].bytes_per_pixel);
+      }
+
+  bytes = g_bytes_new_take (data, height * MAX (stride, tests[format].bytes_per_pixel));
+  texture = gdk_memory_texture_new (width, height,
+                                    format,
                                    bytes,
-                                    builder->stride);
+                                    stride);
  g_bytes_unref (bytes);

  return texture;
 }

-static inline void
-set_pixel_u8 (guchar          *data,
-              int              r,
-              int              g,
-              int              b,
-              int              a,
-              gboolean         premultiply,
-              const GdkRGBA   *color)
-{
-  if (a >= 0)
-    data[a] = CLAMP (color->alpha * 256.f, 0.f, 255.f);
-  if (premultiply)
-    {
-      data[r] = CLAMP (color->red * color->alpha * 256.f, 0.f, 255.f);
-      data[g] = CLAMP (color->green * color->alpha * 256.f, 0.f, 255.f);
-      data[b] = CLAMP (color->blue * color->alpha * 256.f, 0.f, 255.f);
-    }
-  else
-    {
-      data[r] = CLAMP (color->red * 256.f, 0.f, 255.f);
-      data[g] = CLAMP (color->green * 256.f, 0.f, 255.f);
-      data[b] = CLAMP (color->blue * 256.f, 0.f, 255.f);
-    }
-}
-
-static inline guint16
-float_to_half (const float x)
-{
-  const guint b = *(guint*)&x+0x00001000; // round-to-nearest-even
-  const guint e = (b&0x7F800000)>>23; // exponent
-  const guint m = b&0x007FFFFF; // mantissa
-  return (b&0x80000000)>>16 | (e>112)*((((e-112)<<10)&0x7C00)|m>>13) | ((e<113)&(e>101))*((((0x007FF000+m)>>(125-e))+1)>>1) | (e>143)*0x7FFF; // sign : normalized : denormalized : saturate
-}
-
-static void
-texture_builder_set_pixel (TextureBuilder  *builder,
-                           int              x,
-                           int              y,
-                           const GdkRGBA   *color)
-{
-  guchar *data;
-
-  g_assert_cmpint (x, >=, 0);
-  g_assert_cmpint (x, <, builder->width);
-  g_assert_cmpint (y, >=, 0);
-  g_assert_cmpint (y, <, builder->height);
-
-  data = builder->pixels
-         + builder->offset
-         + y * builder->stride
-         + x * gdk_memory_format_bytes_per_pixel (builder->format);
-
-  switch (builder->format)
-  {
-    case GDK_MEMORY_B8G8R8A8_PREMULTIPLIED:
-      set_pixel_u8 (data, 2, 1, 0, 3, TRUE, color);
-      break;
-    case GDK_MEMORY_A8R8G8B8_PREMULTIPLIED:
-      set_pixel_u8 (data, 1, 2, 3, 0, TRUE, color);
-      break;
-    case GDK_MEMORY_R8G8B8A8_PREMULTIPLIED:
-      set_pixel_u8 (data, 0, 1, 2, 3, TRUE, color);
-      break;
-    case GDK_MEMORY_B8G8R8A8:
-      set_pixel_u8 (data, 2, 1, 0, 3, FALSE, color);
-      break;
-    case GDK_MEMORY_A8R8G8B8:
-      set_pixel_u8 (data, 1, 2, 3, 0, FALSE, color);
-      break;
-    case GDK_MEMORY_R8G8B8A8:
-      set_pixel_u8 (data, 0, 1, 2, 3, FALSE, color);
-      break;
-    case GDK_MEMORY_A8B8G8R8:
-      set_pixel_u8 (data, 3, 2, 1, 0, FALSE, color);
-      break;
-    case GDK_MEMORY_R8G8B8:
-      set_pixel_u8 (data, 0, 1, 2, -1, TRUE, color);
-      break;
-    case GDK_MEMORY_B8G8R8:
-      set_pixel_u8 (data, 2, 1, 0, -1, TRUE, color);
-      break;
-    case GDK_MEMORY_R16G16B16:
-      {
-        guint16 pixels[3] = {
-          CLAMP (color->red * color->alpha * 65536.f, 0, 65535.f),
-          CLAMP (color->green * color->alpha * 65536.f, 0, 65535.f),
-          CLAMP (color->blue * color->alpha * 65536.f, 0, 65535.f),
-        };
-        memcpy (data, pixels, 3 * sizeof (guint16));
-      }
-      break;
-    case GDK_MEMORY_R16G16B16A16_PREMULTIPLIED:
-      {
-        guint16 pixels[4] = {
-          CLAMP (color->red * color->alpha * 65536.f, 0, 65535.f),
-          CLAMP (color->green * color->alpha * 65536.f, 0, 65535.f),
-          CLAMP (color->blue * color->alpha * 65536.f, 0, 65535.f),
-          CLAMP (color->alpha * 65536.f, 0, 65535.f),
-        };
-        memcpy (data, pixels, 4 * sizeof (guint16));
-      }
-      break;
-    case GDK_MEMORY_R16G16B16_FLOAT:
-      {
-        guint16 pixels[3] = {
-          float_to_half (color->red * color->alpha),
-          float_to_half (color->green * color->alpha),
-          float_to_half (color->blue * color->alpha)
-        };
-        memcpy (data, pixels, 3 * sizeof (guint16));
-      }
-      break;
-    case GDK_MEMORY_R16G16B16A16_FLOAT_PREMULTIPLIED:
-      {
-        guint16 pixels[4] = {
-          float_to_half (color->red * color->alpha),
-          float_to_half (color->green * color->alpha),
-          float_to_half (color->blue * color->alpha),
-          float_to_half (color->alpha)
-        };
-        memcpy (data, pixels, 4 * sizeof (guint16));
-      }
-      break;
-    case GDK_MEMORY_R32G32B32_FLOAT:
-      {
-        float pixels[3] = {
-          color->red * color->alpha,
-          color->green * color->alpha,
-          color->blue * color->alpha
-        };
-        memcpy (data, pixels, 3 * sizeof (float));
-      }
-      break;
-    case GDK_MEMORY_R32G32B32A32_FLOAT_PREMULTIPLIED:
-      {
-        float pixels[4] = {
-          color->red * color->alpha,
-          color->green * color->alpha,
-          color->blue * color->alpha,
-          color->alpha
-        };
-        memcpy (data, pixels, 4 * sizeof (float));
-      }
-      break;
-    case GDK_MEMORY_N_FORMATS:
-    default:
-      g_assert_not_reached ();
-      break;
-  }
-}
-
-static void
-texture_builder_fill (TextureBuilder  *builder,
-                      const GdkRGBA   *color)
-{
-  int x, y;
-
-  for (y = 0; y < builder->height; y++)
-    for (x = 0; x < builder->width; x++)
-      texture_builder_set_pixel (builder, x, y, color);
-}
-
-static void
-compare_textures (GdkTexture *expected,
-                  GdkTexture *test,
-                  gboolean    has_alpha)
-{
-  guint32 *expected_data, *test_data;
-  int width, height;
-  int x, y;
-
-  g_assert_cmpint (gdk_texture_get_width (expected), ==, gdk_texture_get_width (test));
-  g_assert_cmpint (gdk_texture_get_height (expected), ==, gdk_texture_get_height (test));
-
-  width = gdk_texture_get_width (expected);
-  height = gdk_texture_get_height (expected);
-
-  expected_data = g_new (guint32, width * height);
-  gdk_texture_download (expected, (guchar *) expected_data, width * 4);
-
-  test_data = g_new (guint32, width * height);
-  gdk_texture_download (test, (guchar *) test_data, width * 4);
-
-  for (y = 0; y < height; y++)
-    {
-      for (x = 0; x < width; x++)
-        {
-          if (has_alpha)
-            g_assert_cmphex (expected_data[y * width + x], ==, test_data[y * width + x]);
-          else
-            g_assert_cmphex (expected_data[y * width + x] | 0xFF000000, ==, test_data[y * width + x]);
-        }
-    }
-
-  g_free (expected_data);
-  g_free (test_data);
-}
-
-static void
-compare_textures_float (GdkTexture *expected,
-                        GdkTexture *test,
-                        float       eps,
-                        gboolean    has_alpha)
-{
-  static int R = 0;
-  static int G = 1;
-  static int B = 2;
-  static int A = 3;
-  float *expected_data, *test_data;
-  int width, height;
-  int x, y;
-
-  g_assert_cmpint (gdk_texture_get_width (expected), ==, gdk_texture_get_width (test));
-  g_assert_cmpint (gdk_texture_get_height (expected), ==, gdk_texture_get_height (test));
-
-  width = gdk_texture_get_width (expected);
-  height = gdk_texture_get_height (expected);
-
-  expected_data = g_new (float, width * height * 4);
-  gdk_texture_download_float (expected, expected_data, width * 4);
-
-  test_data = g_new (float, width * height * 4);
-  gdk_texture_download_float (test, test_data, width * 4);
-
-  for (y = 0; y < height; y++)
-    {
-      for (x = 0; x < width; x++)
-        {
-          g_assert_cmpfloat_with_epsilon (expected_data[y * width + 4 * x + R], test_data[y * width + 4 * x + R], eps);
-          g_assert_cmpfloat_with_epsilon (expected_data[y * width + 4 * x + G], test_data[y * width + 4 * x + G], eps);
-          g_assert_cmpfloat_with_epsilon (expected_data[y * width + 4 * x + B], test_data[y * width + 4 * x + B], eps);
-          if (has_alpha)
-            g_assert_cmpfloat_with_epsilon (expected_data[y * width + 4 * x + A], test_data[y * width + 4 * x + A], eps);
-          else
-            g_assert_cmpfloat (1.0, ==, test_data[y * width + 4 * x + A]);
-        }
-    }
-
-  g_free (expected_data);
-  g_free (test_data);
-}
-
-static GdkTexture *
-upload_to_gl (GdkTexture *texture)
-{
-  GskRenderNode *node;
-  GdkTexture *result;
-
-  if (gl_renderer == NULL)
-    return texture;
-
-  node = gsk_texture_node_new (texture,
-                               &GRAPHENE_RECT_INIT(
-                                 0, 0, 
-                                 gdk_texture_get_width (texture),
-                                 gdk_texture_get_height (texture)
-                               ));
-  result = gsk_renderer_render_texture (gl_renderer, node, NULL);
-  gsk_render_node_unref (node);
-  g_object_unref (texture);
-
-  return result;
-}
-
-static GdkTexture *
-create_texture (GdkMemoryFormat  format,
-                TextureMethod    method,
-                int              width,
-                int              height,
-                const GdkRGBA   *color)
-{
-  TextureBuilder builder;
-  GdkTexture *texture;
-
-  texture_builder_init (&builder, format, width, height);
-  texture_builder_fill (&builder, color);
-
-  texture = texture_builder_finish (&builder);
-
-  switch (method)
-  {
-    case TEXTURE_METHOD_LOCAL:
-      break;
-
-    case TEXTURE_METHOD_GL:
-      texture = upload_to_gl (texture);
-      break;
-
-    case TEXTURE_METHOD_GL_RELEASED:
-      texture = upload_to_gl (texture);
-      gdk_gl_texture_release (GDK_GL_TEXTURE (texture));
-      break;
-
-    case TEXTURE_METHOD_PNG:
-      {
-        GBytes *bytes = gdk_texture_save_to_png_bytes (texture);
-        g_assert (bytes);
-        g_object_unref (texture);
-        texture = gdk_texture_new_from_bytes (bytes, NULL);
-        g_assert (texture);
-        g_bytes_unref (bytes);
-      }
-      break;
-
-    case TEXTURE_METHOD_TIFF:
-      {
-        GBytes *bytes = gdk_texture_save_to_tiff_bytes (texture);
-        g_assert (bytes);
-        g_object_unref (texture);
-        texture = gdk_texture_new_from_bytes (bytes, NULL);
-        g_assert (texture);
-        g_bytes_unref (bytes);
-      }
-      break;
-
-    case N_TEXTURE_METHODS:
-    default:
-      g_assert_not_reached ();
-      break;
-  }
-
-  return texture;
-}
-
-static void
-create_random_color (GdkRGBA *color)
-{
-  /* Generate colors so that premultiplying will result in values in steps of 1/15th */
-  color->red = g_test_rand_int_range (0, 6) / 5.f;
-  color->green = g_test_rand_int_range (0, 6) / 5.f;
-  color->blue = g_test_rand_int_range (0, 6) / 5.f;
-  color->alpha = g_test_rand_int_range (0, 4) / 3.f;
-}
-
 static void
 test_download_1x1 (gconstpointer data)
 {
-  GdkMemoryFormat format;
-  TextureMethod method;
+  const TestData *test_data = data;
  GdkTexture *expected, *test;
-  gsize i;

-  decode (data, &format, &method);
+  expected = create_texture (GDK_MEMORY_DEFAULT, test_data->color, 1, 1, tests[test_data->format].bytes_per_pixel);
+  test = create_texture (test_data->format, test_data->color, 1, 1, tests[test_data->format].bytes_per_pixel);

-  for (i = 0; i < N; i++)
-    {
-      GdkRGBA color;
+  compare_textures (expected, test, tests[test_data->format].opaque);

-      create_random_color (&color);
-      expected = create_texture (GDK_MEMORY_DEFAULT, TEXTURE_METHOD_LOCAL, 1, 1, &color);
-      test = create_texture (format, method, 1, 1, &color);
-      
-      compare_textures (expected, test, gdk_memory_format_has_alpha (format));
+  g_object_unref (expected);
+  g_object_unref (test);
+}

-      g_object_unref (expected);
-      g_object_unref (test);
-    }
+static void
+test_download_1x1_with_stride (gconstpointer data)
+{
+  const TestData *test_data = data;
+  GdkTexture *expected, *test;
+
+  expected = create_texture (GDK_MEMORY_DEFAULT, test_data->color, 1, 1, 4);
+  test = create_texture (test_data->format, test_data->color, 1, 1, 2 * MAX_BPP);
+
+  compare_textures (expected, test, tests[test_data->format].opaque);
+
+  g_object_unref (expected);
+  g_object_unref (test);
 }

 static void
 test_download_4x4 (gconstpointer data)
 {
-  GdkMemoryFormat format;
-  TextureMethod method;
+  const TestData *test_data = data;
  GdkTexture *expected, *test;
-  gsize i;

-  decode (data, &format, &method);
+  expected = create_texture (GDK_MEMORY_DEFAULT, test_data->color, 4, 4, 16);
+  test = create_texture (test_data->format, test_data->color, 4, 4, 4 * tests[test_data->format].bytes_per_pixel);

-  for (i = 0; i < N; i++)
-    {
-      GdkRGBA color;
+  compare_textures (expected, test, tests[test_data->format].opaque);

-      create_random_color (&color);
-      expected = create_texture (GDK_MEMORY_DEFAULT, TEXTURE_METHOD_LOCAL, 4, 4, &color);
-      test = create_texture (format, method, 4, 4, &color);
-      
-      compare_textures (expected, test, gdk_memory_format_has_alpha (format));
-
-      g_object_unref (expected);
-      g_object_unref (test);
-    }
+  g_object_unref (expected);
+  g_object_unref (test);
 }

 static void
-test_download_float_1x1 (gconstpointer data)
+test_download_4x4_with_stride (gconstpointer data)
 {
-  GdkMemoryFormat format;
-  TextureMethod method;
+  const TestData *test_data = data;
  GdkTexture *expected, *test;
-  gsize i;

-  decode (data, &format, &method);
+  expected = create_texture (GDK_MEMORY_DEFAULT, test_data->color, 4, 4, 16);
+  test = create_texture (test_data->format, test_data->color, 4, 4, 4 * MAX_BPP);

-  for (i = 0; i < N; i++)
-    {
-      GdkRGBA color;
+  compare_textures (expected, test, tests[test_data->format].opaque);

-      create_random_color (&color);
-      expected = create_texture (GDK_MEMORY_R32G32B32A32_FLOAT_PREMULTIPLIED, TEXTURE_METHOD_LOCAL, 1, 1, &color);
-      test = create_texture (format, method, 1, 1, &color);
-      
-      compare_textures_float (expected, test,
-                              G_MINFLOAT,
-                              gdk_memory_format_has_alpha (format));
-
-      g_object_unref (expected);
-      g_object_unref (test);
-    }
-}
-
-static void
-test_download_float_4x4 (gconstpointer data)
-{
-  GdkMemoryFormat format;
-  TextureMethod method;
-  GdkTexture *expected, *test;
-  gsize i;
-
-  decode (data, &format, &method);
-
-  for (i = 0; i < N; i++)
-    {
-      GdkRGBA color;
-
-      create_random_color (&color);
-      expected = create_texture (GDK_MEMORY_R32G32B32A32_FLOAT_PREMULTIPLIED, TEXTURE_METHOD_LOCAL, 4, 4, &color);
-      test = create_texture (format, method, 4, 4, &color);
-      
-      compare_textures_float (expected, test, G_MINFLOAT, gdk_memory_format_has_alpha (format));
-
-      g_object_unref (expected);
-      g_object_unref (test);
-    }
-}
-
-
-static void
-add_test (const char    *name,
-          GTestDataFunc  func)
-{
-  GdkMemoryFormat format;
-  TextureMethod method;
-  GEnumClass *enum_class;
-
-  enum_class = g_type_class_ref (GDK_TYPE_MEMORY_FORMAT);
-
-  for (format = 0; format < GDK_MEMORY_N_FORMATS; format++)
-    {
-      for (method = 0; method < N_TEXTURE_METHODS; method++)
-        {
-          const char *method_names[N_TEXTURE_METHODS] = { "local", "gl", "gl-released", "png", "tiff" };
-          char *test_name = g_strdup_printf ("%s/%s/%s",
-                                             name,
-                                             g_enum_get_value (enum_class, format)->value_nick,
-                                             method_names[method]);
-          g_test_add_data_func_full (test_name, encode (format, method), test_download_1x1, NULL);
-          g_free (test_name);
-        }
-    }
+  g_object_unref (expected);
+  g_object_unref (test);
 }

 int
 main (int argc, char *argv[])
 {
-  GdkSurface *surface;
-  int result;
+  GdkMemoryFormat format;
+  Color color;
+  GEnumClass *enum_class;

-  gtk_test_init (&argc, &argv, NULL);
+  (g_test_init) (&argc, &argv, NULL);

-  add_test ("/memorytexture/download_1x1", test_download_1x1);
-  add_test ("/memorytexture/download_4x4", test_download_4x4);
-  add_test ("/memorytexture/download_float_1x1", test_download_float_1x1);
-  add_test ("/memorytexture/download_float_4x4", test_download_float_4x4);
+  enum_class = g_type_class_ref (GDK_TYPE_MEMORY_FORMAT);

-  surface = gdk_surface_new_toplevel (gdk_display_get_default());
-  gl_renderer = gsk_ngl_renderer_new ();
-  if (!gsk_renderer_realize (gl_renderer, surface, NULL))
+  for (format = 0; format < GDK_MEMORY_N_FORMATS; format++)
    {
-      g_clear_object (&gl_renderer);
-      g_clear_object (&surface);
+      for (color = 0; color < N_COLORS; color++)
+        {
+          TestData *test_data = g_new (TestData, 1);
+          char *test_name = g_strdup_printf ("/memorytexture/download_1x1/%s/%s",
+                                             g_enum_get_value (enum_class, format)->value_nick,
+                                             color_names[color]);
+          test_data->format = format;
+          test_data->color = color;
+          g_test_add_data_func_full (test_name, test_data, test_download_1x1, g_free);
+          g_free (test_name);
+
+          test_data = g_new (TestData, 1);
+          test_name = g_strdup_printf ("/memorytexture/download_1x1_with_stride/%s/%s",
+                                       g_enum_get_value (enum_class, format)->value_nick,
+                                       color_names[color]);
+          test_data->format = format;
+          test_data->color = color;
+          g_test_add_data_func_full (test_name, test_data, test_download_1x1_with_stride, g_free);
+          g_free (test_name);
+
+          test_data = g_new (TestData, 1);
+          test_name = g_strdup_printf ("/memorytexture/download_4x4/%s/%s",
+                                       g_enum_get_value (enum_class, format)->value_nick,
+                                       color_names[color]);
+          test_data->format = format;
+          test_data->color = color;
+          g_test_add_data_func_full (test_name, test_data, test_download_4x4, g_free);
+          g_free (test_name);
+
+          test_data = g_new (TestData, 1);
+          test_name = g_strdup_printf ("/memorytexture/download_4x4_with_stride/%s/%s",
+                                       g_enum_get_value (enum_class, format)->value_nick,
+                                       color_names[color]);
+          test_data->format = format;
+          test_data->color = color;
+          g_test_add_data_func_full (test_name, test_data, test_download_4x4_with_stride, g_free);
+          g_free (test_name);
+        }
    }

-  result = g_test_run ();
-
-  if (gl_renderer)
-    {
-      gsk_renderer_unrealize (gl_renderer);
-      g_clear_object (&gl_renderer);
-    }
-  g_clear_object (&surface);
-
-  return result;
+  return g_test_run ();
 }
@@ -26,7 +26,6 @@ tests = [
  'rgba',
  'seat',
  'texture',
-  'texture-threads',
 ]

 foreach t : tests
@@ -49,31 +48,6 @@ foreach t : tests
  )
 endforeach

-internal_tests = [
-  'image'
-]
-
-foreach t : internal_tests
-  test_exe = executable(t, '@0@.c'.format(t),
-    c_args: common_cflags,
-    dependencies: libgtk_static_dep,
-    install: get_option('install-tests'),
-    install_dir: testexecdir,
-  )
-
-  test(t, test_exe,
-    args: [ '--tap', '-k' ],
-    protocol: 'tap',
-    env: [
-      'G_TEST_SRCDIR=@0@'.format(meson.current_source_dir()),
-      'G_TEST_BUILDDIR=@0@'.format(meson.current_build_dir()),
-      'DBUS_SESSION_BUS_ADDRESS=',
-    ],
-    suite: 'gdk',
-  )
-endforeach
-
-
 if get_option('install-tests')
  foreach t : tests
    test_cdata = configuration_data()
@@ -88,5 +62,4 @@ if get_option('install-tests')
  endforeach

  install_subdir('clipboard-data', install_dir: testexecdir)
-  install_subdir('image-data', install_dir: testexecdir)
 endif
@@ -65,30 +65,6 @@ test_color_parse (void)
  res = gdk_rgba_parse (&color, "#0080ff88");
  g_assert_true (res);
  g_assert_true (gdk_rgba_equal (&color, &expected));
-
-  expected.red = 1.0;
-  expected.green = 0.0;
-  expected.blue = 0.0;
-  expected.alpha = 1.0;
-  res = gdk_rgba_parse (&color, "hsl (0, 100%, 50%)");
-  g_assert_true (res);
-  g_assert_true (gdk_rgba_equal (&color, &expected));
-
-  expected.red = 0.0;
-  expected.green = 1.0;
-  expected.blue = 0.0;
-  expected.alpha = 0.1;
-  res = gdk_rgba_parse (&color, "hsla (120, 255, 50%, 0.1)");
-  g_assert_true (res);
-  g_assert_true (gdk_rgba_equal (&color, &expected));
-
-  expected.red = 0.0;
-  expected.green = 0.5;
-  expected.blue = 0.5;
-  expected.alpha = 1.0;
-  res = gdk_rgba_parse (&color, "hsl(180, 100%, 25%)");
-  g_assert_true (res);
-  g_assert_true (gdk_rgba_equal (&color, &expected));
 }

 static void
@@ -1,103 +0,0 @@
-#include <gtk/gtk.h>
-
-#include "gsk/ngl/gsknglrenderer.h"
-
-/* This function will be called from a thread and/or the main loop.
- * Textures are threadsafe after all. */
-static void
-ensure_texture_access (GdkTexture *texture)
-{
-  /* Make sure to initialize the pixel to anything but red */
-  guint32 pixel = 0;
-  float float_pixel[4] = { INFINITY, INFINITY, INFINITY, INFINITY };
-
-  /* Just to be sure */
-  g_assert_cmpint (gdk_texture_get_width (texture), ==, 1);
-  g_assert_cmpint (gdk_texture_get_height (texture), ==, 1);
-
-  /* download the pixel */
-  gdk_texture_download (texture, (guchar *) &pixel, 4);
-  gdk_texture_download_float (texture, float_pixel, 4);
-
-  /* check the pixel is now red */
-  g_assert_cmphex (pixel, ==, 0xFFFF0000);
-  g_assert_cmpfloat (float_pixel[0], ==, 1.0);
-  g_assert_cmpfloat (float_pixel[1], ==, 0.0);
-  g_assert_cmpfloat (float_pixel[2], ==, 0.0);
-  g_assert_cmpfloat (float_pixel[3], ==, 1.0);
-}
-
-static void
-texture_download_done (GObject      *texture,
-                       GAsyncResult *res,
-                       gpointer      loop)
-{
-  ensure_texture_access (GDK_TEXTURE (texture));
-
-  g_main_loop_quit (loop);
-}
-
-static void
-texture_download_thread (GTask        *task,
-                         gpointer      texture,
-                         gpointer      unused,
-                         GCancellable *cancellable)
-{
-  ensure_texture_access (GDK_TEXTURE (texture));
-
-  g_task_return_boolean (task, TRUE);
-}
-
-static void
-texture_threads (void)
-{
-  GdkSurface *surface;
-  GskRenderer *gl_renderer;
-  GskRenderNode *node;
-  GMainLoop *loop;
-  GdkTexture *texture;
-  GTask *task;
-
-  /* 1. Get a GL renderer */
-  surface = gdk_surface_new_toplevel (gdk_display_get_default());
-  gl_renderer = gsk_ngl_renderer_new ();
-  g_assert_true (gsk_renderer_realize (gl_renderer, surface, NULL));
-
-  /* 2. Get a GL texture */
-  node = gsk_color_node_new (&(GdkRGBA) { 1, 0, 0, 1 }, &GRAPHENE_RECT_INIT(0, 0, 1, 1));
-  texture = gsk_renderer_render_texture (gl_renderer, node, &GRAPHENE_RECT_INIT(0, 0, 1, 1));
-  gsk_render_node_unref (node);
-
-  /* 3. This is a bit fishy, but we want to make sure that
-   * the texture's GL context is current in the main thread.
-   *
-   * If we had access to the context, we'd make_current() here.
-   */
-  ensure_texture_access (texture);
-  g_assert_nonnull (gdk_gl_context_get_current ());
-
-  /* 4. Run a thread trying to download the texture */
-  loop = g_main_loop_new (NULL, TRUE);
-  task = g_task_new (texture, NULL, texture_download_done, loop);
-  g_task_run_in_thread (task, texture_download_thread);
-  g_clear_object (&task);
-
-  /* 5. Run the main loop waiting for the thread to return */
-  g_main_loop_run (loop);
-
-  /* 6. All good */
-  gsk_renderer_unrealize (gl_renderer);
-  g_clear_pointer (&loop, g_main_loop_unref);
-  g_clear_object (&gl_renderer);
-  g_clear_object (&surface);
-}
-
-int
-main (int argc, char *argv[])
-{
-  gtk_test_init (&argc, &argv, NULL);
-
-  g_test_add_func ("/texture-threads", texture_threads);
-
-  return g_test_run ();
-}
@@ -32,23 +32,6 @@ test_constants (void)
    }
 }

-static float
-random_representable_float (void)
-{
-  guint16 h[4];
-  float f[4];
-  do
-    {
-      /* generate a random float thats representable as fp16 */
-      memset (h, 0, sizeof (h));
-      h[0] = g_random_int_range (G_MININT16, G_MAXINT16);
-      half_to_float4 (h, f);
-    }
-  while (!isnormal (f[0])); /* skip nans and infs since they don't compare well */
-
-  return f[0];
-}
-
 static void
 test_roundtrip (void)
 {
@@ -58,7 +41,15 @@ test_roundtrip (void)
      float f2[4];
      guint16 h[4];

-      f2[0] = random_representable_float ();
+      do
+        {
+          /* generate a random float thats representable as fp16 */
+          memset (h, 0, sizeof (h));
+          h[0] = g_random_int_range (G_MININT16, G_MAXINT16);
+          half_to_float4 (h, f2);
+        }
+      while (!isnormal (f2[0])); /* skip nans and infs since they don't compare well */
+
      memset (f, 0, sizeof (f));
      f[0] = f2[0];

@@ -69,32 +60,6 @@ test_roundtrip (void)
    }
 }

-/* Test that the array version work as expected,
- * in particular with unaligned boundaries.
- */
-static void
-test_many (void)
-{
-  for (int i = 0; i < 100; i++)
-    {
-      int size = g_random_int_range (100, 200);
-      int offset = g_random_int_range (0, 20);
-
-      guint16 *h = g_new0 (guint16, size);
-      float *f = g_new0 (float, size);
-      float *f2 = g_new0 (float, size);
-
-      for (int j = offset; j < size; j++)
-        f[j] = random_representable_float ();
-
-      float_to_half (f + offset, h + offset, size - offset);
-      half_to_float (h + offset, f2 + offset, size - offset);
-
-      for (int j = offset; j < size; j++)
-        g_assert_cmpfloat (f[j], ==, f2[j]);
-    }
-}
-
 int
 main (int argc, char *argv[])
 {
@@ -102,7 +67,6 @@ main (int argc, char *argv[])

  g_test_add_func ("/half-float/constants", test_constants);
  g_test_add_func ("/half-float/roundtrip", test_roundtrip);
-  g_test_add_func ("/half-float/many", test_many);

  return g_test_run ();
 }
@@ -1,6 +1,7 @@
 texture {
  bounds: 0 0 50 50;
-  texture: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAAAXNSR0IArs4c6QAAAClJREFUGJVj\
-/M9w5j8DGmBkMGFEF2NCF8AFBlAhhqMZGBgYsHlwKHgGAM+OBd3t1NcVAAAAAElFTkSuQmCC\
+  texture: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAABmJLR0QA/wD/AP+gvaeTAAAAKUlE\
+QVQYlWP8z3DmPwMaYGQwYUQXY0IXwAUGUCGGoxkYGBiweXAoeAYAz44F3e3U1xUAAAAASUVORK5C\
+YII=\
 ");
 }
@@ -39,129 +39,129 @@ transform {
          offset: 0.180392 0.203922 0.211765 0;
          child: texture {
            bounds: 1068.6 0 256 256;
-            texture: url("data:image/png;base64,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\
-YRiGYRiGIfw/xkuszVpN0tYAAAAASUVORK5CYII=\
+            texture: url("data:image/png;base64,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\
 ");
          }
        }
@@ -277,8 +277,8 @@ YRiGYRiGIfw/xkuszVpN0tYAAAAASUVORK5CYII=\
            offset: 0.572549 0.584314 0.584314 0;
            child: texture {
              bounds: 4 4 16 16;
-              texture: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAB9JREFUOI1j\
-YBjygBGN/59UfUzUc8tAgdEwGA0DqgAAwf0DCjxFCiwAAAAASUVORK5CYII=\
+              texture: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAAH0lE\
+QVQ4jWNgGPKAEY3/n1R9TNRzy0CB0TAYDQOqAADB/QMKPEUKLAAAAABJRU5ErkJggg==\
 ");
            }
          }
@@ -294,10 +294,10 @@ YBjygBGN/59UfUzUc8tAgdEwGA0DqgAAwf0DCjxFCiwAAAAASUVORK5CYII=\
          offset: 0.572549 0.584314 0.584314 0;
          child: texture {
            bounds: 0 4 16 16;
-            texture: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAH1JREFUOI3t\
-0TEKAjEQRuEPr6BCCgvx/newsHdRlC0sxFMoNmszskNYMQfYB4HJ5J8XQpiZYsAB69RbYh9nf7lE\
-8BySFbro9S2CDW5Jcor6jm2LoJYMeGA3FVz8ELzxTPtXrCYKrsY396kuLYJjNVCSpGsRfIP5tmL8\
-iZmKD5NiJVtlqH49AAAAAElFTkSuQmCC\
+            texture: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAAfUlE\
+QVQ4je3RMQoCMRBG4Q+voEIKC/H+d7Cwd1GULSzEUyg2azOyQ1gxB9gHgcnknxdCmJliwAHr1Fti\
+H2d/uUTwHJIVuuj1LYINbklyivqObYuglgx4YDcVXPwQvPFM+1esJgquxjf3qS4tgmM1UJKkaxF8\
+g/m2YvyJmYoPk2IlW2Wofj0AAAAASUVORK5CYII=\
 ");
          }
        }
@@ -373,9 +373,9 @@ transform {
                offset: 0.572549 0.584314 0.584314 0;
                child: texture {
                  bounds: 0 4 16 16;
-                  texture: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAADpJREFUOI1j\
-YBgFgw+UMzAw/CeA6ykxhKBmfIYQrRmbITg1M+Mx4CgDAwMjAwPDQQYGhkZSbR8FJAAAh2UZ0KJo\
-1mgAAAAASUVORK5CYII=\
+                  texture: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAAOklE\
+QVQ4jWNgGAWDD5QzMDD8J4DrKTGEoGZ8hhCtGZshODUz4zHgKAMDAyMDA8NBBgaGRlJtHwUkAACH\
+ZRnQomjWaAAAAABJRU5ErkJggg==\
 ");
                }
              }
@@ -430,9 +430,9 @@ YBgFgw+UMzAw/CeA6ykxhKBmfIYQrRmbITg1M+Mx4CgDAwMjAwPDQQYGhkZSbR8FJAAAh2UZ0KJo\
                  offset: 0.831373 0.811765 0.792157 0;
                  child: texture {
                    bounds: 0 4 16 16;
-                    texture: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAADpJREFUOI1j\
-YBgFgw+UMzAw/CeA6ykxhKBmfIYQrRmbITg1M+Mx4CgDAwMjAwPDQQYGhkZSbR8FJAAAh2UZ0KJo\
-1mgAAAAASUVORK5CYII=\
+                    texture: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAAOklE\
+QVQ4jWNgGAWDD5QzMDD8J4DrKTGEoGZ8hhCtGZshODUz4zHgKAMDAyMDA8NBBgaGRlJtHwUkAACH\
+ZRnQomjWaAAAAABJRU5ErkJggg==\
 ");
                  }
                }
@@ -473,11 +473,11 @@ YBgFgw+UMzAw/CeA6ykxhKBmfIYQrRmbITg1M+Mx4CgDAwMjAwPDQQYGhkZSbR8FJAAAh2UZ0KJo\
                offset: 0.654902 0.666667 0.666667 0;
                child: texture {
                  bounds: 0 8 16 16;
-                  texture: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAMpJREFUOI3N\
-0t1KQlEQBeCvMPMqUANRH6ZHCPEphBIfUk2M0EDQhN7BC4kIoi4ctSP7nG5dMAx7fhZr9gznhgoe\
-McYnNniK2FXUjPCTam5jHsmUvaD5551BGa+RWOIet2igg3XknvMIBhF8QzWhro73E0UZ7Jk7ieb9\
-zKeWwUcEGwmCvD8BpfDf4b8SBBeJ2AGX4Rfh74qKi/AQslaoJfI1TOXsH64xi4I1urgJ6zqucVqk\
-ouV4C3mH1PpvlDL6mGBrd8pD9ELlGeIXovZHoNZrT68AAAAASUVORK5CYII=\
+                  texture: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAAyklE\
+QVQ4jc3S3UpCURAF4K8w8ypQA1EfpkcI8SmEEh9STYzQQNCE3sELiQiiLhy1I/ucbl0wDHt+Fmv2\
+DOeGCh4xxic2eIrYVdSM8JNqbmMeyZS9oPnnnUEZr5FY4h63aKCDdeSe8wgGEXxDNaGujvcTRRns\
+mTuJ5v3Mp5bBRwQbCYK8PwGl8N/hvxIEF4nYAZfhF+HvioqL8BCyVqgl8jVM5ewfrjGLgjW6uAnr\
+Oq5xWqSi5XgLeYfU+m+UMvqYYGt3ykP0QuUZ4hei9keg1mtPrwAAAABJRU5ErkJggg==\
 ");
                }
              }
@@ -557,10 +557,10 @@ ouV4C3mH1PpvlDL6mGBrd8pD9ELlGeIXovZHoNZrT68AAAAASUVORK5CYII=\
                  offset: 0.572549 0.584314 0.584314 0;
                  child: texture {
                    bounds: 4 4 16 16;
-                    texture: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAH1JREFUOI3t\
-0TEKAjEQRuEPr6BCCgvx/newsHdRlC0sxFMoNmszskNYMQfYB4HJ5J8XQpiZYsAB69RbYh9nf7lE\
-8BySFbro9S2CDW5Jcor6jm2LoJYMeGA3FVz8ELzxTPtXrCYKrsY396kuLYJjNVCSpGsRfIP5tmL8\
-iZmKD5NiJVtlqH49AAAAAElFTkSuQmCC\
+                    texture: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAAfUlE\
+QVQ4je3RMQoCMRBG4Q+voEIKC/H+d7Cwd1GULSzEUyg2azOyQ1gxB9gHgcnknxdCmJliwAHr1Fti\
+H2d/uUTwHJIVuuj1LYINbklyivqObYuglgx4YDcVXPwQvPFM+1esJgquxjf3qS4tgmM1UJKkaxF8\
+g/m2YvyJmYoPk2IlW2Wofj0AAAAASUVORK5CYII=\
 ");
                  }
                }
@@ -600,9 +600,9 @@ iZmKD5NiJVtlqH49AAAAAElFTkSuQmCC\
                      offset: 0.572549 0.584314 0.584314 0;
                      child: texture {
                        bounds: 0 4 16 16;
-                        texture: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAADpJREFUOI1j\
-YBgFgw+UMzAw/CeA6ykxhKBmfIYQrRmbITg1M+Mx4CgDAwMjAwPDQQYGhkZSbR8FJAAAh2UZ0KJo\
-1mgAAAAASUVORK5CYII=\
+                        texture: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAAOklE\
+QVQ4jWNgGAWDD5QzMDD8J4DrKTGEoGZ8hhCtGZshODUz4zHgKAMDAyMDA8NBBgaGRlJtHwUkAACH\
+ZRnQomjWaAAAAABJRU5ErkJggg==\
 ");
                      }
                    }
@@ -638,9 +638,9 @@ YBgFgw+UMzAw/CeA6ykxhKBmfIYQrRmbITg1M+Mx4CgDAwMjAwPDQQYGhkZSbR8FJAAAh2UZ0KJo\
                        offset: 0.572549 0.584314 0.584314 0;
                        child: texture {
                          bounds: 0 4 16 16;
-                          texture: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAADpJREFUOI1j\
-YBgFgw+UMzAw/CeA6ykxhKBmfIYQrRmbITg1M+Mx4CgDAwMjAwPDQQYGhkZSbR8FJAAAh2UZ0KJo\
-1mgAAAAASUVORK5CYII=\
+                          texture: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAAOklE\
+QVQ4jWNgGAWDD5QzMDD8J4DrKTGEoGZ8hhCtGZshODUz4zHgKAMDAyMDA8NBBgaGRlJtHwUkAACH\
+ZRnQomjWaAAAAABJRU5ErkJggg==\
 ");
                        }
                      }
@@ -679,9 +679,9 @@ YBgFgw+UMzAw/CeA6ykxhKBmfIYQrRmbITg1M+Mx4CgDAwMjAwPDQQYGhkZSbR8FJAAAh2UZ0KJo\
                        offset: 0.572549 0.584314 0.584314 0;
                        child: texture {
                          bounds: 0 4 16 16;
-                          texture: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAADpJREFUOI1j\
-YBgFgw+UMzAw/CeA6ykxhKBmfIYQrRmbITg1M+Mx4CgDAwMjAwPDQQYGhkZSbR8FJAAAh2UZ0KJo\
-1mgAAAAASUVORK5CYII=\
+                          texture: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAAOklE\
+QVQ4jWNgGAWDD5QzMDD8J4DrKTGEoGZ8hhCtGZshODUz4zHgKAMDAyMDA8NBBgaGRlJtHwUkAACH\
+ZRnQomjWaAAAAABJRU5ErkJggg==\
 ");
                        }
                      }
@@ -747,8 +747,8 @@ YBgFgw+UMzAw/CeA6ykxhKBmfIYQrRmbITg1M+Mx4CgDAwMjAwPDQQYGhkZSbR8FJAAAh2UZ0KJo\
                        offset: 0.615686 0.623529 0.623529 0;
                        child: texture {
                          bounds: 4 8 16 16;
-                          texture: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAABxJREFUOI1j\
-YBgFwwAwovH/k6qPiXpuGQVDGAAAQ18BBL4/glcAAAAASUVORK5CYII=\
+                          texture: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAAHElE\
+QVQ4jWNgGAXDADCi8f+Tqo+Jem4ZBUMYAABDXwEEvj+CVwAAAABJRU5ErkJggg==\
 ");
                        }
                      }
@@ -767,8 +767,9 @@ YBgFwwAwovH/k6qPiXpuGQVDGAAAQ18BBL4/glcAAAAASUVORK5CYII=\
                        offset: 0.615686 0.623529 0.623529 0;
                        child: texture {
                          bounds: 4 8 16 16;
-                          texture: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAChJREFUOI1j\
-YBj24D8U4wRMlNow8AYwovHx+hebPopdQAiMhFgYBgAA8qYFDMtT4XcAAAAASUVORK5CYII=\
+                          texture: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAAKElE\
+QVQ4jWNgGPbgPxTjBEyU2jDwBjCi8fH6F5s+il1ACIyEWBgGAADypgUMy1PhdwAAAABJRU5ErkJg\
+gg==\
 ");
                        }
                      }
@@ -818,8 +819,8 @@ YBj24D8U4wRMlNow8AYwovHx+hebPopdQAiMhFgYBgAA8qYFDMtT4XcAAAAASUVORK5CYII=\
                        offset: 0.831373 0.811765 0.792157 0;
                        child: texture {
                          bounds: 4 8 16 16;
-                          texture: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAABxJREFUOI1j\
-YBgFwwAwovH/k6qPiXpuGQVDGAAAQ18BBL4/glcAAAAASUVORK5CYII=\
+                          texture: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAAHElE\
+QVQ4jWNgGAXDADCi8f+Tqo+Jem4ZBUMYAABDXwEEvj+CVwAAAABJRU5ErkJggg==\
 ");
                        }
                      }
@@ -845,8 +846,9 @@ YBgFwwAwovH/k6qPiXpuGQVDGAAAQ18BBL4/glcAAAAASUVORK5CYII=\
                        offset: 0.831373 0.811765 0.792157 0;
                        child: texture {
                          bounds: 4 8 16 16;
-                          texture: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAChJREFUOI1j\
-YBj24D8U4wRMlNow8AYwovHx+hebPopdQAiMhFgYBgAA8qYFDMtT4XcAAAAASUVORK5CYII=\
+                          texture: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAAKElE\
+QVQ4jWNgGPbgPxTjBEyU2jDwBjCi8fH6F5s+il1ACIyEWBgGAADypgUMy1PhdwAAAABJRU5ErkJg\
+gg==\
 ");
                        }
                      }
@@ -879,10 +881,10 @@ YBj24D8U4wRMlNow8AYwovHx+hebPopdQAiMhFgYBgAA8qYFDMtT4XcAAAAASUVORK5CYII=\
                      offset: 0.572549 0.584314 0.584314 0;
                      child: texture {
                        bounds: 0 0 14 14;
-                        texture: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAAAAXNSR0IArs4c6QAAAHhJREFUKJG9\
-0F8KQEAQx/Hvbs7HEVxF8iRRPChaF3MYXlZtY9AqfrUPOzOf9g/8nPINqoAtBhig80iFKWAV1Afo\
-BAtfXAJsgEGgJkSZaDogASZRr+Vp1g+HQ6vYt9rbjmuNYvhYk+9fRsPzE9Kw4/zLt7FAHou+yw6e\
-9iu4wGcfbQAAAABJRU5ErkJggg==\
+                        texture: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAAABmJLR0QA/wD/AP+gvaeTAAAAeElE\
+QVQokb3QXwpAQBDH8e9uzscRXEXyJFE8KFoXcxheVm1j0Cp+tQ87M5/2D/yc8g2qgC0GGKDzSIUp\
+YBXUB+gEC19cAmyAQaAmRJloOiABJlGv5WnWD4dDq9i32tuOa41i+FiT719Gw/MT0rDj/Mu3sUAe\
+i77LDp72K7jAZx9tAAAAAElFTkSuQmCC\
 ");
                      }
                    }
@@ -945,9 +947,9 @@ BAtfXAJsgEGgJkSZaDogASZRr+Vp1g+HQ6vYt9rbjmuNYvhYk+9fRsPzE9Kw4/zLt7FAHou+yw6e\
                      offset: 0.572549 0.584314 0.584314 0;
                      child: texture {
                        bounds: 0 0 14 14;
-                        texture: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAAAAXNSR0IArs4c6QAAADlJREFUKJFj\
-YBgFRAFvBgaGJwwMDP9x4McMDAxe2DQ+xqMJhh/BFDNRw6leBGx9xMDA4EkNi4Y9AAAbuBpo5IRY\
-AgAAAABJRU5ErkJggg==\
+                        texture: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAAABmJLR0QA/wD/AP+gvaeTAAAAOUlE\
+QVQokWNgGAVEAW8GBoYnDAwM/3HgxwwMDF7YND7GowmGH8EUM1HDqV4EbH3EwMDgSQ2Lhj0AABu4\
+GmjkhFgCAAAAAElFTkSuQmCC\
 ");
                      }
                    }
@@ -983,10 +985,10 @@ AgAAAABJRU5ErkJggg==\
                      offset: 0.831373 0.811765 0.792157 0;
                      child: texture {
                        bounds: 0 0 14 14;
-                        texture: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAAAAXNSR0IArs4c6QAAAHhJREFUKJG9\
-0F8KQEAQx/Hvbs7HEVxF8iRRPChaF3MYXlZtY9AqfrUPOzOf9g/8nPINqoAtBhig80iFKWAV1Afo\
-BAtfXAJsgEGgJkSZaDogASZRr+Vp1g+HQ6vYt9rbjmuNYvhYk+9fRsPzE9Kw4/zLt7FAHou+yw6e\
-9iu4wGcfbQAAAABJRU5ErkJggg==\
+                        texture: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAAABmJLR0QA/wD/AP+gvaeTAAAAeElE\
+QVQokb3QXwpAQBDH8e9uzscRXEXyJFE8KFoXcxheVm1j0Cp+tQ87M5/2D/yc8g2qgC0GGKDzSIUp\
+YBXUB+gEC19cAmyAQaAmRJloOiABJlGv5WnWD4dDq9i32tuOa41i+FiT719Gw/MT0rDj/Mu3sUAe\
+i77LDp72K7jAZx9tAAAAAElFTkSuQmCC\
 ");
                      }
                    }
@@ -1049,9 +1051,9 @@ BAtfXAJsgEGgJkSZaDogASZRr+Vp1g+HQ6vYt9rbjmuNYvhYk+9fRsPzE9Kw4/zLt7FAHou+yw6e\
                      offset: 0.831373 0.811765 0.792157 0;
                      child: texture {
                        bounds: 0 0 14 14;
-                        texture: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAAAAXNSR0IArs4c6QAAADlJREFUKJFj\
-YBgFRAFvBgaGJwwMDP9x4McMDAxe2DQ+xqMJhh/BFDNRw6leBGx9xMDA4EkNi4Y9AAAbuBpo5IRY\
-AgAAAABJRU5ErkJggg==\
+                        texture: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAAABmJLR0QA/wD/AP+gvaeTAAAAOUlE\
+QVQokWNgGAVEAW8GBoYnDAwM/3HgxwwMDF7YND7GowmGH8EUM1HDqV4EbH3EwMDgSQ2Lhj0AABu4\
+GmjkhFgCAAAAAElFTkSuQmCC\
 ");
                      }
                    }
@@ -1150,9 +1152,9 @@ AgAAAABJRU5ErkJggg==\
                      offset: 0.572549 0.584314 0.584314 0;
                      child: texture {
                        bounds: 0 0 14 14;
-                        texture: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAAAAXNSR0IArs4c6QAAADlJREFUKJFj\
-YBgFRAFvBgaGJwwMDP9x4McMDAxe2DQ+xqMJhh/BFDNRw6leBGx9xMDA4EkNi4Y9AAAbuBpo5IRY\
-AgAAAABJRU5ErkJggg==\
+                        texture: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAAABmJLR0QA/wD/AP+gvaeTAAAAOUlE\
+QVQokWNgGAVEAW8GBoYnDAwM/3HgxwwMDF7YND7GowmGH8EUM1HDqV4EbH3EwMDgSQ2Lhj0AABu4\
+GmjkhFgCAAAAAElFTkSuQmCC\
 ");
                      }
                    }
@@ -1191,9 +1193,9 @@ AgAAAABJRU5ErkJggg==\
                      offset: 0.831373 0.811765 0.792157 0;
                      child: texture {
                        bounds: 0 0 14 14;
-                        texture: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAAAAXNSR0IArs4c6QAAAEpJREFUKJFj\
-YBiZgI2BgaGVgYHhERS3MDAwsBKjsZWBgeE/Gm4mRuNjLBofoitiwqLxPzFi2DQuIlIMA7AyQPz0\
-EIobGYgMnOEGAEnmE7O2/wC1AAAAAElFTkSuQmCC\
+                        texture: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAAABmJLR0QA/wD/AP+gvaeTAAAASklE\
+QVQokWNgGJmAjYGBoZWBgeERFLcwMDCwEqOxlYGB4T8abiZG42MsGh+iK2LCovE/MWLYNC4iUgwD\
+sDJA/PQQihsZiAyc4QYASeYTs7b/ALUAAAAASUVORK5CYII=\
 ");
                      }
                    }
@@ -1262,9 +1264,9 @@ EIobGYgMnOEGAEnmE7O2/wC1AAAAAElFTkSuQmCC\
                      offset: 0.831373 0.811765 0.792157 0;
                      child: texture {
                        bounds: 0 0 14 14;
-                        texture: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAAAAXNSR0IArs4c6QAAADlJREFUKJFj\
-YBgFRAFvBgaGJwwMDP9x4McMDAxe2DQ+xqMJhh/BFDNRw6leBGx9xMDA4EkNi4Y9AAAbuBpo5IRY\
-AgAAAABJRU5ErkJggg==\
+                        texture: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAAABmJLR0QA/wD/AP+gvaeTAAAAOUlE\
+QVQokWNgGAVEAW8GBoYnDAwM/3HgxwwMDF7YND7GowmGH8EUM1HDqV4EbH3EwMDgSQ2Lhj0AABu4\
+GmjkhFgCAAAAAElFTkSuQmCC\
 ");
                      }
                    }
@@ -1290,13 +1292,13 @@ AgAAAABJRU5ErkJggg==\
                  transform: translate(8, 11.5) rotate(12.2788) translate(-8, -11.5);
                  child: texture {
                    bounds: 0 3.5 16 16;
-                    texture: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAARNJREFUOI21\
-0j8vQ1EYx/FPW0qoRJqIPwOjxSRhkQiJ0Wa0GUzegdV7MrCYDEZJSQ0WBrVQbVpEa+hzmxtprkbi\
-SW5ycp7z/Z7fc3P4hyrhCGd4xBXmh4W38IDuj+9wGHgH7QHwDRZ/g6dRS0H32MfMsNGPU/Ad5jLO\
-jqGIfHrzEp0Q7GXAhZCX9X62kWgsoBXr8wxBNyQTGEUjEdQj2lcGLGJPxbqdbMAtntDARoagHILZ\
-SNIXnMY4DRykbklXESshyYuRC9GsYjcaHaxFohbGsYRNTAbzjgo6udQN6zjBa0jaeEYTL/gIYR0X\
-0esnoPfuK1hNCfLI4S0EzYBrCZROkFQJ21iOuZsxThXX+BzA/L2+AWVURxdJT4pgAAAAAElFTkSu\
-QmCC\
+                    texture: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAABE0lE\
+QVQ4jbXSPy9DURjH8U9bSqhEmog/A6PFJGGRCInRZrQZTN6B1XsysJgMRklJDRYGtVBtWkRr6HOb\
+G2muRuJJbnJynvP9nt9zc/iHKuEIZ3jEFeaHhbfwgO6P73AYeAftAfANFn+Dp1FLQffYx8yw0Y9T\
+8B3mMs6OoYh8evMSnRDsZcCFkJf1fraRaCygFevzDEE3JBMYRSMR1CPaVwYsYk/Fup1swC2e0MBG\
+hqAcgtlI0hecxjgNHKRuSVcRKyHJi5EL0axiNxodrEWiFsaxhE1MBvOOCjq51A3rOMFrSNp4RhMv\
+AhhHRfR6yeg9+4rWE0J8sjhLQTNgGsJlE6QVAnbWI65mzFOFdf4HMD8vb4BZVRHF0lPimAAAAAA\
+SUVORK5CYII=\
 ");
                  }
                }
@@ -1313,13 +1315,13 @@ QmCC\
                    transform: translate(8, 11.5) rotate(12.2788) translate(-8, -11.5);
                    child: texture {
                      bounds: 0 3.5 16 16;
-                      texture: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAARNJREFUOI21\
-0j8vQ1EYx/FPW0qoRJqIPwOjxSRhkQiJ0Wa0GUzegdV7MrCYDEZJSQ0WBrVQbVpEa+hzmxtprkbi\
-SW5ycp7z/Z7fc3P4hyrhCGd4xBXmh4W38IDuj+9wGHgH7QHwDRZ/g6dRS0H32MfMsNGPU/Ad5jLO\
-jqGIfHrzEp0Q7GXAhZCX9X62kWgsoBXr8wxBNyQTGEUjEdQj2lcGLGJPxbqdbMAtntDARoagHILZ\
-SNIXnMY4DRykbklXESshyYuRC9GsYjcaHaxFohbGsYRNTAbzjgo6udQN6zjBa0jaeEYTL/gIYR0X\
-0esnoPfuK1hNCfLI4S0EzYBrCZROkFQJ21iOuZsxThXX+BzA/L2+AWVURxdJT4pgAAAAAElFTkSu\
-QmCC\
+                      texture: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAABE0lE\
+QVQ4jbXSPy9DURjH8U9bSqhEmog/A6PFJGGRCInRZrQZTN6B1XsysJgMRklJDRYGtVBtWkRr6HOb\
+G2muRuJJbnJynvP9nt9zc/iHKuEIZ3jEFeaHhbfwgO6P73AYeAftAfANFn+Dp1FLQffYx8yw0Y9T\
+8B3mMs6OoYh8evMSnRDsZcCFkJf1fraRaCygFevzDEE3JBMYRSMR1CPaVwYsYk/Fup1swC2e0MBG\
+hqAcgtlI0hecxjgNHKRuSVcRKyHJi5EL0axiNxodrEWiFsaxhE1MBvOOCjq51A3rOMFrSNp4RhMv\
+AhhHRfR6yeg9+4rWE0J8sjhLQTNgGsJlE6QVAnbWI65mzFOFdf4HMD8vb4BZVRHF0lPimAAAAAA\
+SUVORK5CYII=\
 ");
                    }
                  }
@@ -1457,9 +1459,9 @@ QmCC\
                      offset: 0.572549 0.584314 0.584314 0;
                      child: texture {
                        bounds: 0 4 16 16;
-                        texture: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAADpJREFUOI1j\
-YBgFgw+UMzAw/CeA6ykxhKBmfIYQrRmbITg1M+Mx4CgDAwMjAwPDQQYGhkZSbR8FJAAAh2UZ0KJo\
-1mgAAAAASUVORK5CYII=\
+                        texture: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAAOklE\
+QVQ4jWNgGAWDD5QzMDD8J4DrKTGEoGZ8hhCtGZshODUz4zHgKAMDAyMDA8NBBgaGRlJtHwUkAACH\
+ZRnQomjWaAAAAABJRU5ErkJggg==\
 ");
                      }
                    }
@@ -1498,9 +1500,9 @@ YBgFgw+UMzAw/CeA6ykxhKBmfIYQrRmbITg1M+Mx4CgDAwMjAwPDQQYGhkZSbR8FJAAAh2UZ0KJo\
                      offset: 0.831373 0.811765 0.792157 0;
                      child: texture {
                        bounds: 0 4 16 16;
-                        texture: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAADpJREFUOI1j\
-YBgFgw+UMzAw/CeA6ykxhKBmfIYQrRmbITg1M+Mx4CgDAwMjAwPDQQYGhkZSbR8FJAAAh2UZ0KJo\
-1mgAAAAASUVORK5CYII=\
+                        texture: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAAOklE\
+QVQ4jWNgGAWDD5QzMDD8J4DrKTGEoGZ8hhCtGZshODUz4zHgKAMDAyMDA8NBBgaGRlJtHwUkAACH\
+ZRnQomjWaAAAAABJRU5ErkJggg==\
 ");
                      }
                    }
@@ -1613,10 +1615,10 @@ YBgFgw+UMzAw/CeA6ykxhKBmfIYQrRmbITg1M+Mx4CgDAwMjAwPDQQYGhkZSbR8FJAAAh2UZ0KJo\
                      offset: 0.572549 0.584314 0.584314 0;
                      child: texture {
                        bounds: 0 4 16 16;
-                        texture: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAHlJREFUOI3F\
-k0EKgCAQRZ/R1eouLjpmi+4RdYVW2UZBdLTJgj58GHXmoR+EXDPgBB+AFfozScPBJzBpAaX9DLIk\
-Q3eAALHSgRYQMsEkzfHaCJAYBmC6SpNKrwFQfrNKvQB7pP8z+ASw+7olyBVg9EXtE0negKH97l4X\
-dck/JrzBokIAAAAASUVORK5CYII=\
+                        texture: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAAeUlE\
+QVQ4jcWTQQqAIBBFn9HV6i4uOmaL7hF1hVbZRkF0tMmCPnwYdeahH4RcM+AEH4AV+jNJw8EnMGkB\
+pf0MsiRDd4AAsdKBFhAywSTN8doIkBgGYLpKk0qvAVB+s0q9AHuk/zP4BLD7uiXIFWD0Re0TSd6A\
+of3uXhd1yT8mvMGiQgAAAABJRU5ErkJggg==\
 ");
                      }
                    }
@@ -2085,21 +2087,19 @@ dck/JrzBokIAAAAASUVORK5CYII=\
                    transform: translate(225, -10);
                    child: texture {
                      bounds: 1 1 20 25;
-                      texture: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAZCAYAAAAxFw7TAAAAAXNSR0IArs4c6QAAAvFJREFUOI2t\
-1c9r02AYB/DnTd60Td7Mdk06Z0FFrJhsdnhwoujamwqi4qZ40OsmsoF4U3ccKlLdEPwT/MHQ7WiR\
-Wl2jh3TbYSJjk2VOelgug1prUl1/vB5GpZ2tutXvKQTeDw8vD98XQY1gjLlQqKvn+PFjFxVFOUgI\
-aQYAsO1v6dnZuWQsFnusae/GC4VCfv1ZtP5HOBw+d+3a1Ydut1vw+7c18TwBjsMAAJDP58G2bTBN\
-M5vJfLFGRh4MJBLaWOV5tvzBMIgZGBgY7uvrHVIUtdnv9ztdLh5YlgWEECCEgGUxuFw8+Hw+pyRJ\
-YjC47+SWLW7f9PR0jFKgVWB/f/9wT093r6qqxOFw1rqJqnAcB7IsO1paWoKiKMqTk1Mvf4HhcKjn\
-8uXeIVVVCcOwf5Yq7wsx4PV6HbLsDS4tfZ5LpVLzCGPMPX8+muro2N8qCMI/Y5WxbQtmZmaWz5+/\
-sJMJhY52u91uslkMAEAQCHg8nqaurqNn2b6+3tudnQc7XC5+0yAAAMacc3X1B2ba29VDjUxXDiEE\
-2traDjGEiB6MuYZBjDGIIvEylAJCv6335oIQAsayrHQ+X2gYKxQKYFnWF2Z+/uNULmc3DNq2DbOz\
-czrz6lXsqWma2UZB01zOxuPxUWZiIvEsk8nkGpnStnOQzX79rmlvx9lSqVRcWVlZbm9vOyHLsgMh\
-ZkNYsViEhYV56969+1cMY/E9CwDw6dPSh9bWrbtkWVYkSeJqtFqdUDCMBfvFi+iTR4+e3AGoaBtd\
-T0YVZe9hnuf9kiQ5/o5SMIyFnK4nE0NDty5RSktVIKW0FI+/Hg0EdncSQnZ4vRJXf0HXJtN1Xbtx\
-Y/BMsVj8tXdVXUUppW/eTDwLBHYfEMV6aBlLvr1+ffD0+mfgt/Iro3v2BDoJIdurUQqGYeTWsJun\
-ar0pNdu0EhXFNRQAYHHRyOm6rtXD6oJlNJHQxlRVOSII/LZ0Ol1MJpN/xP4pGGMuErkbjUTuRvH/\
-qKWN5ichVT1RK2aa7gAAAABJRU5ErkJggg==\
+                      texture: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAZCAYAAAAxFw7TAAAABmJLR0QA/wD/AP+gvaeTAAAChklE\
+QVQ4jbXVTWsTQRgH8P88u2myu4ZEKVJqEj9Ar0V6kIQtPRWs1EpAPfegiFD8Av0C4sVbz1qt2IMe\
+fUmTXhTzKbKbEhRslrCzsyYz46Ev1jRNX4L/47Dz22eGmXkYBqReryc6nfaSaZoPtMYNpdRlADAM\
+7CrFvgHypeNkN6enp7v9c1n/QKVSuUuEF6lUys5mM2nLcpBImACAbrcLzjmCIOjEsQgB/bhYnH03\
+ENR6lba33WdEbHly8ppj2/ag4g8TRRzNph9KqdaKxepTxlbVP2C1WnmeTCaXC4WCQ2QMxQ6ilESj\
+0QjjOF4rldwVACAAqNW+LBkGnQsDACID+XzBMQxa3tr6vAgArF6vJzjvNHK5wsRpyzwpnIfwfX9H\
+Sn2dwrB9J5lMnrpnw2LbDsbGxtKMqUVizLyfyWTTF9b2k8lk04Zh3CPG1Mwo1R3EcRxojRnSGlnT\
+TIwMmqYJpeQVUgqMHTveFwtjDEREu91ub2Ss1+uBiLUJYN+jiI8Mcs6hNX0lrbvrQRB0RgWDoN1R\
+qveGxsd/vRVCRKNUyXmEOBaC83iTpqbKv7VWK81mM1RKnhuTUmJnxwsB+WR+fj4mACiVZl8pJdd9\
+3+eAPgen0Wz6XCn5qlicew3sPw57f8JDIcSW53nh2VANz2tEcSyqUrJHB6OHoOu6vVbrx0IU8U+N\
+RoNrPQzV8H2PCxFVLevSbdd1D88dHf2sXC7LVuvnkhDRR887Cd3DOOfblpVe6G8DA+/IxsaGMTFx\
+dTOVSs3l8wX771XS8DwviiJes+30rTP1lH7UslJzuVzBBgDfH44NBYG97sd554NtOze11iSEqFmW\
+cyJ2KngEfQ8Atn18z/57/gBelEdqMNUvpgAAAABJRU5ErkJggg==\
 ");
                    }
                  }
@@ -2442,10 +2442,10 @@ qKWN5ichVT1RK2aa7gAAAABJRU5ErkJggg==\
                          offset: 0.572549 0.584314 0.584314 0;
                          child: texture {
                            bounds: 14 29 14 14;
-                            texture: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAAAAXNSR0IArs4c6QAAAHhJREFUKJG9\
-0F8KQEAQx/Hvbs7HEVxF8iRRPChaF3MYXlZtY9AqfrUPOzOf9g/8nPINqoAtBhig80iFKWAV1Afo\
-BAtfXAJsgEGgJkSZaDogASZRr+Vp1g+HQ6vYt9rbjmuNYvhYk+9fRsPzE9Kw4/zLt7FAHou+yw6e\
-9iu4wGcfbQAAAABJRU5ErkJggg==\
+                            texture: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAAABmJLR0QA/wD/AP+gvaeTAAAAeElE\
+QVQokb3QXwpAQBDH8e9uzscRXEXyJFE8KFoXcxheVm1j0Cp+tQ87M5/2D/yc8g2qgC0GGKDzSIUp\
+YBXUB+gEC19cAmyAQaAmRJloOiABJlGv5WnWD4dDq9i32tuOa41i+FiT719Gw/MT0rDj/Mu3sUAe\
+i77LDp72K7jAZx9tAAAAAElFTkSuQmCC\
 ");
                          }
                        }
@@ -2459,12 +2459,12 @@ BAtfXAJsgEGgJkSZaDogASZRr+Vp1g+HQ6vYt9rbjmuNYvhYk+9fRsPzE9Kw4/zLt7FAHou+yw6e\
                        offset: 0.196078 0.196078 0.196078 0;
                        child: texture {
                          bounds: 54 28 16 16;
-                          texture: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAPJJREFUOI21\
-0sEqxFEUx/GP2LGYlIXyBp5BSVKykpSHkCeQGlJT1naylCfQzMITEMmSlYUsRIOy8M9YuH/duXP/\
-Y0pO3W7nnvP93XM6h3+wcWzhHC94xRXqmPwNXsQTOhXnGatV8Dw++sDlKTCbwmN4GADu4AgjqcDG\
-gPAhhnPltzLJp4m/j6GI6RK6TZIb4X03+HsJXMNJLHATwcdJdUuJP4Vr3+P9sWYkUGAt1yemcRfy\
-LuPAetJCTmRG945sx8FR3PcRWcZ7FGtjIi1vTu8iFTgId/n2iZWKFi3gUe9I458r4dJq2MRZAN5w\
-gZ1c2X+2L7dscieExRo2AAAAAElFTkSuQmCC\
+                          texture: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAA8klE\
+QVQ4jbXSwSrEURTH8Y/YsZiUhfIGnkFJUrKSlIeQJ5AaUlPWdrKUJ9DMwhMQyZKVhSxEg7Lwz1i4\
+f925c/9jSk7dbuee8/3dczqHf7BxbOEcL3jFFeqY/A1exBM6FecZq1XwPD76wOUpMJvCY3gYAO7g\
+CCOpwMaA8CGGc+W3Msmnib+PoYjpErpNkhvhfTf4ewlcw0kscBPBx0l1S4k/hWvf4/2xZiRQYC3X\
+J6ZxF/Iu48B60kJOZEb3jmzHwVHc9xFZxnsUa2MiLW9O7yIVOAh3+faJlYoWLeBR70jjnyvh0mrY\
+xFkA3nCBnVzZf7Yvt2xyJ4TFGjYAAAAASUVORK5CYII=\
 ");
                        }
                      }
@@ -2520,11 +2520,11 @@ gZ1c2X+2L7dscieExRo2AAAAAElFTkSuQmCC\
                        offset: 0.196078 0.196078 0.196078 0;
                        child: texture {
                          bounds: 54 51 16 16;
-                          texture: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAM9JREFUOI21\
-0k1OAkEQBeAP4hZWyjlcsDKEQxi8gHu9A+KN5Aas/bkAFyAscHDNsJgGOmN3Y4y+pJLu6qrXr374\
-BwzwjHd8BXvDLLwVcYcKdcYqTErJu1bCGMOWb5ciGWR+PqDt/8QVdEPAI3rn6ovQx0Ps+Ej8UlJQ\
-axp7xPYXBFVcQhz8U9RwES5LXCeCRuhkCJYxwTxDsCgoeIkvuTHeBBVt/waXnHqwwr3vvegmSqhD\
-7Dola6JZktwqb3BbKAvNhj3hVTPebThPD7L/FHtCEluLOU5q/wAAAABJRU5ErkJggg==\
+                          texture: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAAz0lE\
+QVQ4jbXSTU4CQRAF4A/iFlbKOVywMoRDGLyAe70D4o3kBqz9uQAXICxwcM2wmAY6Y3djjL6kku7q\
+qtevfvgHDPCMd3wFe8MsvBVxhwp1xipMSsm7VsIYw5ZvlyIZZH4+oO3/xBV0Q8Ajeufqi9DHQ+z4\
+SPxSUlBrGnvE9hcEVVxCHPxT1HARLktcJ4JG6GQIljHBPEOwKCh4iS+5Md4EFW3/BpecerDCve+9\
+6CZKqEPsOiVrolmS3CpvcFsoC82GPeFVM95tOE8Psv8Ue0ISW4s5Tmr/AAAAAElFTkSuQmCC\
 ");
                        }
                      }
@@ -2575,10 +2575,10 @@ axp7xPYXBFVcQhz8U9RwES5LXCeCRuhkCJYxwTxDsCgoeIkvuTHeBBVt/waXnHqwwr3vvegmSqhD\
                          offset: 0.572549 0.584314 0.584314 0;
                          child: texture {
                            bounds: 14 75 14 14;
-                            texture: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAAAAXNSR0IArs4c6QAAAHhJREFUKJG9\
-0F8KQEAQx/Hvbs7HEVxF8iRRPChaF3MYXlZtY9AqfrUPOzOf9g/8nPINqoAtBhig80iFKWAV1Afo\
-BAtfXAJsgEGgJkSZaDogASZRr+Vp1g+HQ6vYt9rbjmuNYvhYk+9fRsPzE9Kw4/zLt7FAHou+yw6e\
-9iu4wGcfbQAAAABJRU5ErkJggg==\
+                            texture: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAAABmJLR0QA/wD/AP+gvaeTAAAAeElE\
+QVQokb3QXwpAQBDH8e9uzscRXEXyJFE8KFoXcxheVm1j0Cp+tQ87M5/2D/yc8g2qgC0GGKDzSIUp\
+YBXUB+gEC19cAmyAQaAmRJloOiABJlGv5WnWD4dDq9i32tuOa41i+FiT719Gw/MT0rDj/Mu3sUAe\
+i77LDp72K7jAZx9tAAAAAElFTkSuQmCC\
 ");
                          }
                        }
@@ -2592,12 +2592,12 @@ BAtfXAJsgEGgJkSZaDogASZRr+Vp1g+HQ6vYt9rbjmuNYvhYk+9fRsPzE9Kw4/zLt7FAHou+yw6e\
                        offset: 0.196078 0.196078 0.196078 0;
                        child: texture {
                          bounds: 54 74 16 16;
-                          texture: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAP5JREFUOI2l\
-088qRVEUx/EPQjdhcl2JkY6pqYmZMpKBdJ/iegcZeAkP4AEk5QGY8AKSETIQ4kpHdA3Olt2xzz3J\
-r9Zgr/1b3/1vbf6pgURuGh2M4TTkXnCDC+SxeahU3MYxVnGEJwyigRYyPIcgTMbF+5gM47vE7oax\
-jLkyYAZ7JeBbAkBx7CWMxoAtTCSMVRrBQgxYS5jKwLJmY0CWMMzXAMZjwGfCsF4D6MWAq4Qhw2If\
-QDcGHFSYOmhWzF3zc9MtXArnKukBu7iNcjkOkX934quiTTf9fr4GVvARVn3HCR5T29pQtG+vIu4V\
-TdRXTezgXPGJujjDNqbqiv+sLyHHMHlr8LK9AAAAAElFTkSuQmCC\
+                          texture: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAA/klE\
+QVQ4jaXTzypFURTH8Q9CN2FyXYmRjqmpiZkykoF0n+J6Bxl4CQ/gASTlAZjwApIRMhDiSkd0Dc6W\
+3bHPPcmv1mCv/Vvf/W9t/qmBRG4aHYzhNORecIML5LF5qFTcxjFWcYQnDKKBFjI8hyBMxsX7mAzj\
+u8TuhrGMuTJgBnsl4FsCQHHsJYzGgC1MJIxVGsFCDFhLmMrAsmZjQJYwzNcAxmPAZ8KwXgPoxYCr\
+hCHDYh9ANwYcVJg6aFbMXfNz0y1cCucq6QG7uI1yOQ6Rf3fiq6JNN/1+vgZW8BFWfccJHlPb2lC0\
+b68i7hVN1FdN7OBc8Ym6OMM2puqK/6wvIccweWvwsr0AAAAASUVORK5CYII=\
 ");
                        }
                      }
@@ -2659,9 +2659,9 @@ TdRXTezgXPGJujjDNqbqiv+sLyHHMHlr8LK9AAAAAElFTkSuQmCC\
                          offset: 0.572549 0.584314 0.584314 0;
                          child: texture {
                            bounds: 14 98 14 14;
-                            texture: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAAAAXNSR0IArs4c6QAAAEpJREFUKJFj\
-YBiZgI2BgaGVgYHhERS3MDAwsBKjsZWBgeE/Gm4mRuNjLBofoitiwqLxPzFi2DQuIlIMA7AyQPz0\
-EIobGYgMnOEGAEnmE7O2/wC1AAAAAElFTkSuQmCC\
+                            texture: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAAABmJLR0QA/wD/AP+gvaeTAAAASklE\
+QVQokWNgGJmAjYGBoZWBgeERFLcwMDCwEqOxlYGB4T8abiZG42MsGh+iK2LCovE/MWLYNC4iUgwD\
+sDJA/PQQihsZiAyc4QYASeYTs7b/ALUAAAAASUVORK5CYII=\
 ");
                          }
                        }
@@ -2675,14 +2675,14 @@ EIobGYgMnOEGAEnmE7O2/wC1AAAAAElFTkSuQmCC\
                        offset: 0.196078 0.196078 0.196078 0;
                        child: texture {
                          bounds: 54 97 16 16;
-                          texture: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAU9JREFUOI2V\
-079L13EQx/HHV80EExGRQlFQFNcWfywiGK61ZKE4ujS06V/g6Bq055KDIKjo5PIVwYamwDAC00gd\
-RKQ0KfwxfO+Db7+IXz04OLh7vu59d59PudvtNf5gGLv4XaL+mrViAUvouA9Yh0l8wUX4J7zFg1Jw\
-J34mYLGvofomsBIV+HwLnPk7lAcDXuAYB0nRKXrxvyi+wAl+BPMcNtGPsURgM8S/F8VZ/hW6sAFH\
-qMJAUvAX7fhXFGf5pzHGbg6zyMVM3ZjDMrbwC+doQBP6MBqvOkRFDrWYwF4scQg9aMbjENjHTlzh\
-Y+ykEVPZIuuxeIcLZD6DGomtRGL9DvAqzmJ0ZQpfV38IfcV4CJ0mDY6Rxxt8C24wfcF80iGPEbTF\
-aHVoUfix8kndh1TgEaZjYaVGOMN7PKRwvtSa8RLPouuTEN3DtqsrbGXAJQOahFqC25AXAAAAAElF\
-TkSuQmCC\
+                          texture: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAABT0lE\
+QVQ4jZXTv0vXcRDH8cdXzQQTEZFCUVAU1xZ/LCIYrrVkoTi6NLTpX+DoGrTnkoMgqOjk8hXBhqbA\
+MALTSB1EpDQp/DF874Nvv4hfPTg4uHu+7n13n0+52+01/mAYu/hdov6atWIBS+i4D1iHSXzBRfgn\
+vMWDUnAnfiZgsa+h+iawEhX4fAuc+TuUBwNe4BgHSdEpevG/KL7ACX4E8xw20Y+xRGAzxL8XxVn+\
+FbqwAUeowkBS8Bft+FcUZ/mnMcZuDrPIxUzdmMMytvAL52hAE/owGq86REUOtZjAXixxCD1oxuMQ\
+2MdOXOFj7KQRU9ki67F4hwtkPoMaia1EYv0O8CrOYnRlCl9Xfwh9xXgInSYNjpHHG3wLbjB9wXzS\
+IY8RtMVodWhR+LHySd2HVOARpmNhpUY4w3s8pHC+1JrxEs+i65MQ3cO2qytsZcAlA5qEWoLbkBcA\
+AAAASUVORK5CYII=\
 ");
                        }
                      }
Author	SHA1	Message	Date
Matthias Clasen	ce09db1401	Bump pango req to 1.49.1 We are using pango api that was introduced in 1.49.1 without ifdefs, so we should require it.	2021-09-04 09:41:20 -04:00
Matthias Clasen	ed96414483	Avoid hand-rolled color glyph information Followup to `b244f31337`. Pango provides color glyph information for us now, so we don't need to steal a bit anymore.	2021-09-04 09:39:29 -04:00
Matthias Clasen	e6de8a1746	Fix text node diffing Now that text nodes carry flags, we need to compare them (even though it is very unlikely that they will differ from node to node).	2021-09-04 09:37:29 -04:00
Matthias Clasen	db1fc454ee	Redo font options handling Avoid cairo types in the API by introducing a GskTextRenderFlags enum.	2021-09-04 09:37:01 -04:00
				`@@ -1 +0,0 @@`
				`hsl.css:22:17-18: error: GTK_CSS_PARSER_ERROR_SYNTAX`