gsk: Support hue interpolation in cairo

Since cairos gradient code isn't flexible enough to let us interpolate in oklch, add additional color stops and let cairo interpolate in the ccs. This isn't as accurate as interpolating in oklch, but it gets an ok result for fallback situations.
gtk: Don't optimize gradients away too eagerly
2024-10-04 23:32:44 -04:00 · 2024-10-04 21:21:32 -04:00 · 2024-10-04 21:16:36 -04:00 · 2024-10-04 21:16:36 -04:00 · 2024-10-04 21:16:36 -04:00 · 2024-10-04 21:16:35 -04:00
682 changed files with 66739 additions and 33207 deletions
@@ -26,6 +26,7 @@ variables:
  BACKEND_FLAGS: "-Dx11-backend=true -Dwayland-backend=true -Dbroadway-backend=true"
  FEATURE_FLAGS: "-Dvulkan=enabled -Dcloudproviders=enabled -Dbuild-testsuite=true -Dintrospection=enabled"
  MESON_TEST_TIMEOUT_MULTIPLIER: 3
+  MESON_TEST_MAX_PROCESSES: 8
  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v52"

 workflow:
@@ -67,7 +68,6 @@ style-check-diff:
        - "${CI_PROJECT_DIR}/_build/report-x11.xml"
        - "${CI_PROJECT_DIR}/_build/report-wayland.xml"
        - "${CI_PROJECT_DIR}/_build/report-wayland_gl.xml"
-        - "${CI_PROJECT_DIR}/_build/report-wayland_gles2.xml"
        - "${CI_PROJECT_DIR}/_build/report-broadway.xml"
    name: "gtk-${CI_COMMIT_REF_NAME}"
    paths:
@@ -118,8 +118,9 @@ release-build:
  script:
    - .gitlab-ci/show-info-linux.sh
    - mkdir _install
-    - export PATH="$HOME/.local/bin:${CI_PROJECT_DIR}/_install/bin:$PATH"
-    - .gitlab-ci/install-meson-project.sh --prefix ${CI_PROJECT_DIR}/_install https://gitlab.gnome.org/jadahl/catch.git main
+    # don't use catch by default, since it causes sporadic test failures
+    # - export PATH="$HOME/.local/bin:${CI_PROJECT_DIR}/_install/bin:$PATH"
+    # - .gitlab-ci/install-meson-project.sh --prefix ${CI_PROJECT_DIR}/_install https://gitlab.gnome.org/jadahl/catch.git main
    - meson subprojects download
    - meson subprojects update --reset
    - meson setup
@@ -134,8 +135,6 @@ release-build:
    - PKG_CONFIG_PATH=${CI_PROJECT_DIR}/_install/lib64/pkgconfig:${CI_PROJECT_DIR}/_install/share/pkgconfig meson setup _build_hello examples/hello
    - LD_LIBRARY_PATH=${CI_PROJECT_DIR}/_install/lib64 meson compile -C _build_hello
    - .gitlab-ci/run-tests.sh _build wayland gtk
-    # only repeat test runs that are likely affected by test setups
-    - .gitlab-ci/run-tests.sh _build wayland_gles2 gtk:gdk,gtk:gsk-gl

 fedora-clang:
  extends: .build-fedora-default
@@ -414,11 +413,12 @@ static-scan:
 # Run tests with the address sanitizer. We need to turn off introspection
 # and f16c, since they are incompatible with asan
 asan-build:
-  image: $FEDORA_IMAGE
+  extends: .build-fedora-default
  tags: [ asan ]
  stage: analysis
  needs: []
  variables:
+    MESON_TEST_MAX_PROCESSES: 4
  script:
    - export PATH="$HOME/.local/bin:$PATH"
    - CC=clang meson setup
@@ -8,16 +8,19 @@ builddir=$1
 setup=$2
 suite=$3
 multiplier=${MESON_TEST_TIMEOUT_MULTIPLIER:-1}
+n_processes=${MESON_TEST_MAX_PROCESSES:-1}

 # Ignore memory leaks lower in dependencies
 export LSAN_OPTIONS=suppressions=$srcdir/lsan.supp:print_suppressions=0:detect_leaks=0:allocator_may_return_null=1

 case "${setup}" in
  x11*)
-    xvfb-run -a -s "-screen 0 1024x768x24 -noreset" \
+    dbus-run-session -- \
+       xvfb-run -a -s "-screen 0 1024x768x24 -noreset" \
          meson test -C ${builddir} \
                --quiet \
                --timeout-multiplier "${multiplier}" \
+                --num-processes "${n_processes}" \
                --print-errorlogs \
                --setup=${setup} \
                --suite=${suite//,/ --suite=} \
@@ -39,9 +42,11 @@ case "${setup}" in
    compositor=$!
    export WAYLAND_DISPLAY=wayland-5

-    meson test -C ${builddir} \
+    dbus-run-session -- \
+          meson test -C ${builddir} \
                --quiet \
                --timeout-multiplier "${multiplier}" \
+                --num-processes "${n_processes}" \
                --print-errorlogs \
                --setup=${setup} \
                --suite=${suite//,/ --suite=} \
@@ -62,9 +67,11 @@ case "${setup}" in
    server=$!
    export BROADWAY_DISPLAY=:5

-    meson test -C ${builddir} \
+    dbus-run-session -- \
+          meson test -C ${builddir} \
                --quiet \
                --timeout-multiplier "${multiplier}" \
+                --num-processes "${n_processes}" \
                --print-errorlogs \
                --setup=${setup} \
                --suite=${suite//,/ --suite=} \
@@ -34,7 +34,9 @@
 <!--
 - Which version of GTK you are using
 - What operating system and version
-  - For Linux, which distribution
+ - What windowing system (X11 or Wayland)
+ - What graphics driver / mesa version
+ - For Linux, which distribution
 - If you built GTK yourself, the list of options used to configure the build
 -->

@@ -1,4 +1,249 @@
-Overview of Changes in 4.15.5, xx-xx-xxxx
+Overview of Changes in 4.17.0, xx-xx-xxxx
+=========================================
+
+
+Overview of Changes in 4.16.2, 09-25-2024
+=========================================
+
+* GtkLabel:
+ - Fix centered text in RTL
+
+* Gsk:
+ - Speed up some Vulkan operations
+ - Improve startup speed by avoiding initialization
+   of GL and Vulkan in most cases
+ - Reduce critials at startup to warnings
+ - Fix a crash on startup with some Vulkan drivers
+ - Fix a big texture leak in NGL
+
+* Gdk:
+ - Speed up memory format conversions
+
+* Wayland:
+ - Be more careful with mimetypes during DND or copy-paste
+
+* Tools:
+ - builder-tool: Improve conversion of boxes
+
+* Translation updates:
+ Brazilian Portuguese
+ Bulgarian
+ Catalan
+ Chinese (China)
+ Georgian
+ German
+ Hebrew
+ Indonesian
+ Persian
+ Polish
+ Portuguese
+ Slovenian
+ Spanish
+ Turkish
+ Ukrainian
+
+
+Overview of Changes in 4.16.1, 09-16-2024
+=========================================
+
+* GtkFileChooser:
+ - Plug a memory leak
+
+* GtkCalendar:
+ - Avoid ending up with invalid dates
+
+* Printing:
+ - Fix initial printer selection in the print dialog
+
+* Gsk:
+ - Fix shadows for opaque textures
+ - Fix a crash in a corner case
+
+* Css:
+ - Make relative paths work again in theme files
+
+* Accessibility:
+ - Fix detection of the Flatpak portal
+
+* MacOS:
+ - Fix keyboard input in popovers
+ - Keep DND icons above regular windows
+ - Ignore events from DND icons
+
+* Translation updates
+ Basque
+ British English
+ Bulgarian
+ Czech
+ Danish
+ Georgian
+ Hungarian
+ Lithuanian
+ Portuguese
+ Spanish
+ Swedish
+
+
+Overview of Changes in 4.16.0, 09-06-2024
+=========================================
+
+Note: This release changes the default GSK renderer to be Vulkan,
+on Wayland. Other platforms still use ngl. The intent of this change
+is to use the best available platform APIs. You can still override
+the renderer choice using the GSK_RENDERER environment variable.
+
+We believe that most of the problems reported with the new renderers
+during the 4.13 and 4.15 development cycles have been addressed by now.
+
+But the new renderers and dmabuf support are using graphics drivers
+in different ways than the old gl renderer, and trigger new driver bugs.
+Therefore, it is recommended to use the latest mesa release (24.2)
+with the new renderers.
+
+* GtkScale:
+ - Fix positioning of scale values
+
+* GtkEmojiChooser:
+ - Make Control-clicks work for the recent section
+
+* GtkPopover:
+ - Make sure focus lands on the right widget when cascading
+
+* GtkSpinButton:
+ - Disable Emoji input for numeric spin buttons
+
+* GtkSingleSelection:
+ - Implement unselect_all
+
+* Accssibility:
+ - Fix roles for radio buttons
+ - Check if ATs are listening before exporting trees
+ - Add a check for sandboxed accessibility bus
+ - Fix handling of the error message relation
+ - Turn criticals into debug messages
+ - Set expanded states properly in menus
+
+* CSS:
+ - Fix a few issues on bigendian systems
+ - Avoid a crash with relative colors
+
+* GSK:
+ - Use the right GL context when exporting textures
+ - Don't let colors influence depth decisions
+ - Allow uploading of mipmap levels when tiling textures
+
+* GDK:
+ - Update keysyms from libX11 1.8.10
+ - Implement cpu-side mipmapping
+ - Use a thread pool for color conversions and mipmapping
+
+* Vulkan:
+ - Fix drag surface offsets
+
+* Wayland:
+ - Fix a crash
+ - Associate EGL windows with context later
+
+* X11:
+ - Fix initial EGL context creation
+ - Fix a problem with GL context creation
+
+* Broadway:
+ - Implement compute_size and request_layout
+
+* MacOS:
+ - Set transparent backgroiund for toplevel windows
+
+* Windows:
+ - Improve debug output
+ - Detect Mesas d3d12 driver and request GDI compat
+
+* Demos:
+ - Set window icons in demos
+ - Add a 64k x 64k image to the image scaling demo
+
+* Translation updates
+ Belarusian
+ Brazilian Portuguese
+ Catalan
+ Czech
+ Galician
+ German
+ Hebrew
+ Indonesian
+ Korean
+ Lithuanian
+ Persian
+ Polish
+ Portuguese
+ Slovenian
+ Spanish
+ Turkish
+ Ukrainian
+
+
+Overview of Changes in 4.15.6, 08-26-2024
+=========================================
+
+* GtkCheckButton:
+ - Add a grouped style class for radio buttons
+
+* GtkScale:
+ - Fix alignment and positioning problems
+
+* Css:
+ - Fix crashes in the variable support
+
+* Gsk:
+ - Make graphics offloading work better with kwin
+ - Make colorstate transfer functions more robust
+ - GC dead textures more agressively
+ - Only use a single render pass per frame
+
+* GL:
+ - Round damage rectangles properly
+ - Use the shared context when creating textures
+ - Fix a file descriptor leak in dmabuf export
+
+* Vulkan:
+ - Round damage rectangles properly
+
+* Wayland:
+ - Work with the kwin implementation of xx-color-management-v4
+
+* Windows:
+ - Make gtk_show_uri use SHOpenWithDialog()
+ - Enable incremental rendering with WGL
+
+* Macos:
+ - Open context menus on Ctrl-left click
+
+* Debugging:
+ - Show color state information in the inspector
+ - Collect input event traces in the recorder
+ - Add shortcuts for toggling recording: Super-r
+   and for screenshots: Super-c
+ - Split the GDK_DEBUG env var into GDK_DEBUG and GDK_DISABLE
+ - Add GDK_DISABLE=color-mgmt and GDK_DISABLE=offload
+
+* Tools:
+ - Add a 'Paste as node' action in gtk4-node-editor
+
+* Translations updates
+ Basque
+ Belarusian
+ Brazilian Portuguese
+ Chinese (China)
+ Georgian
+ Hebrew
+ Hindi
+ Russian
+ Slovenian
+ Turkish
+ Ukrainian
+
+
+Overview of Changes in 4.15.5, 11-08-2024
 =========================================

 * GtkTextView:
@@ -6,7 +251,7 @@ Overview of Changes in 4.15.5, xx-xx-xxxx

 * CSS:
 - Propagate color state information to GSK for many features:
-   colors, borders, shadows
+   colors, borders, shadows, text

 * Gdk:
 - Fix an fd leak in the Vulkan code
@@ -17,12 +262,13 @@ Overview of Changes in 4.15.5, xx-xx-xxxx
 - Fix Emoji rendering in Vulkan
 - Rework color handling to take color states into account
 - Implement more powerful occlusion culling
+ - Minimize our use of renderpasses

 * Macos:
 - Fix window transparency

 * Debugging:
- - The inspector shows details about color states now
+ - The inspector shows details about color states

 * Deprecations:
 - gdk_draw_context_begin/end_frame
@@ -31,6 +277,9 @@ Overview of Changes in 4.15.5, xx-xx-xxxx
 * Build:
 - Require gstreamer 1.24

+* Translation updates
+ Romanian
+

 Overview of Changes in 4.15.4, 30-07-2024
 =========================================
@@ -136,9 +136,13 @@ In the bug report please include:

   - which version of GTK you are using
   - what operating system and version
+   - what windowing system (X11 or Wayland)
+   - what graphics driver / mesa version
   - for Linux, which distribution
   - if you built GTK, the list of options used to configure the build

+  Most of this information can be found in the GTK inspector.
+
  And anything else you think is relevant.

 * How to reproduce the bug.
@@ -1,26 +0,0 @@
-uniform float u_time;
-
-void
-mainImage(out vec4 fragColor, in vec2 fragCoord, in vec2 resolution, in vec2 uv)
-{
-  vec2 pos = (fragCoord.xy * 2.0 - resolution.xy)/ min (resolution.x, resolution.y) ;
-
-  float t0 = sin ((u_time + 0.00)*1.0);
-  float t1 = sin ((u_time + 0.30)*0.4);
-  float t2 = cos ((u_time + 0.23)*0.9);
-  float t3 = cos ((u_time + 0.41)*0.6);
-  float t4 = cos ((u_time + 0.11)*0.3);
-
-  vec2 p0 = vec2 (t1, t0) ;
-  vec2 p1 = vec2 (t2, t3) ;
-  vec2 p2 = vec2 (t4, t3) ;
-
-  float r = 1.0/distance (pos, p0);
-  float g = 1.0/distance (pos, p1);
-  float b = 1.0/distance (pos, p2);
-  float sum = r + g + b;
-
-  float alpha = 1.0 - pow (1.0/(sum), 40.0)*pow (10.0, 40.0*0.7);
-
-  fragColor = vec4 (r*0.5, g*0.5, b*0.5, 1.0) * alpha;
-}
@@ -1,226 +0,0 @@
-uniform float iTime;
-
-// Originally from: https://www.shadertoy.com/view/3ljyDD
-// License CC0: Hexagonal tiling + cog wheels
-//  Nothing fancy, just hexagonal tiling + cog wheels
-
-#define PI      3.141592654
-#define TAU     (2.0*PI)
-#define MROT(a) mat2(cos(a), sin(a), -sin(a), cos(a))
-
-float hash(in vec2 co) {
-  return fract(sin(dot(co.xy ,vec2(12.9898,58.233))) * 13758.5453);
-}
-
-float pcos(float a) {
-  return 0.5 + 0.5*cos(a);
-}
-
-void rot(inout vec2 p, float a) {
-  float c = cos(a);
-  float s = sin(a);
-  p = vec2(c*p.x + s*p.y, -s*p.x + c*p.y);
-}
-
-float modPolar(inout vec2 p, float repetitions) {
-  float angle = 2.0*PI/repetitions;
-  float a = atan(p.y, p.x) + angle/2.;
-  float r = length(p);
-  float c = floor(a/angle);
-  a = mod(a,angle) - angle/2.;
-  p = vec2(cos(a), sin(a))*r;
-  // For an odd number of repetitions, fix cell index of the cell in -x direction
-  // (cell index would be e.g. -5 and 5 in the two halves of the cell):
-  if (abs(c) >= (repetitions/2.0)) c = abs(c);
-  return c;
-}
-
-float pmin(float a, float b, float k) {
-  float h = clamp( 0.5+0.5*(b-a)/k, 0.0, 1.0 );
-  return mix( b, a, h ) - k*h*(1.0-h);
-}
-
-const vec2 sz       = vec2(1.0, sqrt(3.0));
-const vec2 hsz      = 0.5*sz;
-const float smallCount = 16.0;
-
-vec2 hextile(inout vec2 p) {
-  // See Art of Code: Hexagonal Tiling Explained!
-  // https://www.youtube.com/watch?v=VmrIDyYiJBA
-
-  vec2 p1 = mod(p, sz)-hsz;
-  vec2 p2 = mod(p - hsz*1.0, sz)-hsz;
-  vec2 p3 = mix(p2, p1, vec2(length(p1) < length(p2)));
-  vec2 n = p3 - p;
-  p = p3;
-
-  return n;
-}
-
-float circle(vec2 p, float r) {
-  return length(p) - r;
-}
-
-float box(vec2 p, vec2 b) {
-  vec2 d = abs(p)-b;
-  return length(max(d,0.0)) + min(max(d.x,d.y),0.0);
-}
-
-float unevenCapsule(vec2 p, float r1, float r2, float h) {
-  p.x = abs(p.x);
-  float b = (r1-r2)/h;
-  float a = sqrt(1.0-b*b);
-  float k = dot(p,vec2(-b,a));
-  if( k < 0.0 ) return length(p) - r1;
-  if( k > a*h ) return length(p-vec2(0.0,h)) - r2;
-  return dot(p, vec2(a,b) ) - r1;
-}
-
-float cogwheel(vec2 p, float innerRadius, float outerRadius, float cogs, float holes) {
-  float cogWidth  = 0.25*innerRadius*TAU/cogs;
-
-  float d0 = circle(p, innerRadius);
-
-  vec2 icp = p;
-  modPolar(icp, holes);
-  icp -= vec2(innerRadius*0.55, 0.0);
-  float d1 = circle(icp, innerRadius*0.25);
-
-  vec2 cp = p;
-  modPolar(cp, cogs);
-  cp -= vec2(innerRadius, 0.0);
-  float d2 = unevenCapsule(cp.yx, cogWidth, cogWidth*0.75, (outerRadius-innerRadius));
-
-  float d3 = circle(p, innerRadius*0.20);
-
-  float d = 1E6;
-  d = min(d, d0);
-  d = pmin(d, d2, 0.5*cogWidth);
-  d = min(d, d2);
-  d = max(d, -d1);
-  d = max(d, -d3);
-
-  return d;
-}
-
-float ccell1(vec2 p, float r) {
-  float d = 1E6;
-  const float bigCount = 60.0;
-
-  vec2 cp0 = p;
-  rot(cp0, -iTime*TAU/bigCount);
-  float d0 = cogwheel(cp0, 0.36, 0.38, bigCount, 5.0);
-
-  vec2 cp1 = p;
-  float nm = modPolar(cp1, 6.0);
-
-  cp1 -= vec2(0.5, 0.0);
-  rot(cp1, 0.2+TAU*nm/2.0 + iTime*TAU/smallCount);
-  float d1 = cogwheel(cp1, 0.11, 0.125, smallCount, 5.0);
-
-  d = min(d, d0);
-  d = min(d, d1);
-  return d;
-}
-
-float ccell2(vec2 p, float r) {
-  float d = 1E6;
-  vec2 cp0 = p;
-  float nm = modPolar(cp0, 6.0);
-  vec2 cp1 = cp0;
-  const float off = 0.275;
-  const float count = smallCount + 2.0;
-  cp0 -= vec2(off, 0.0);
-  rot(cp0, 0.+TAU*nm/2.0 - iTime*TAU/count);
-  float d0 = cogwheel(cp0, 0.09, 0.105, count, 5.0);
-
-
-  cp1 -= vec2(0.5, 0.0);
-  rot(cp1, 0.2+TAU*nm/2.0 + iTime*TAU/smallCount);
-  float d1 = cogwheel(cp1, 0.11, 0.125, smallCount, 5.0);
-
-  float l = length(p);
-  float d2 = l - (off+0.055);
-  float d3 = d2 + 0.020;;
-
-  vec2 tp0 = p;
-  modPolar(tp0, 60.0);
-  tp0.x -= off;
-  float d4 = box(tp0, vec2(0.0125, 0.005));
-
-  float ctime = -(iTime*0.05 + r)*TAU;
-
-  vec2 tp1 = p;
-  rot(tp1, ctime*12.0);
-  tp1.x -= 0.13;
-  float d5 = box(tp1, vec2(0.125, 0.005));
-
-  vec2 tp2 = p;
-  rot(tp2, ctime);
-  tp2.x -= 0.13*0.5;
-  float d6 = box(tp2, vec2(0.125*0.5, 0.0075));
-
-  float d7 = l - 0.025;
-  float d8 = l - 0.0125;
-
-  d = min(d, d0);
-  d = min(d, d1);
-  d = min(d, d2);
-  d = max(d, -d3);
-  d = min(d, d4);
-  d = min(d, d5);
-  d = min(d, d6);
-  d = min(d, d7);
-  d = max(d, -d8);
-
-  return d;
-}
-
-float df(vec2 p, float scale, inout vec2 nn) {
-  p /= scale;
-  nn = hextile(p);
-  nn = floor(nn + 0.5);
-  float r = hash(nn);
-
-  float d;;
-
-  if (r < 0.5) {
-    d = ccell1(p, r);
-  } else {
-    d = ccell2(p, r);
-  }
-
-  return d*scale;
-}
-
-vec3 postProcess(vec3 col, vec2 q)  {
-  //col = saturate(col);
-  col=pow(clamp(col,0.0,1.0),vec3(0.75));
-  col=col*0.6+0.4*col*col*(3.0-2.0*col);  // contrast
-  col=mix(col, vec3(dot(col, vec3(0.33))), -0.4);  // satuation
-  col*=0.5+0.5*pow(19.0*q.x*q.y*(1.0-q.x)*(1.0-q.y),0.7);  // vigneting
-  return col;
-}
-
-void mainImage(out vec4 fragColor, in vec2 fragCoord, in vec2 resolution, in vec2 uv) {
-  vec2 q = fragCoord/resolution.xy;
-  vec2 p = -1.0 + 2.0*q;
-  p.x *= resolution.x/resolution.y;
-  float tm = iTime*0.1;
-  p += vec2(cos(tm), sin(tm*sqrt(0.5)));
-  float z = mix(0.5, 1.0, pcos(tm*sqrt(0.3)));
-  float aa = 4.0 / resolution.y;
-
-  vec2 nn = vec2(0.0);
-  float d = df(p, z, nn);
-
-  vec3 col = vec3(160.0)/vec3(255.0);
-  vec3 baseCol = vec3(0.3);
-  vec4 logoCol = vec4(baseCol, 1.0)*smoothstep(-aa, 0.0, -d);
-  col = mix(col, logoCol.xyz, pow(logoCol.w, 8.0));
-  col += 0.4*pow(abs(sin(20.0*d)), 0.6);
-
-  col = postProcess(col, q);
-
-  fragColor = vec4(col, 1.0);
-}
@@ -1,27 +0,0 @@
-uniform float progress;
-uniform sampler2D u_texture1;
-uniform sampler2D u_texture2;
-
-vec4 getFromColor (vec2 uv) {
-  return GskTexture(u_texture1, uv);
-}
-
-vec4 getToColor (vec2 uv) {
-  return GskTexture(u_texture2, uv);
-}
-
-// Source: https://gl-transitions.com/editor/crosswarp
-// Author: Eke Péter <peterekepeter@gmail.com>
-// License: MIT
-
-vec4 transition(vec2 p) {
-  float x = progress;
-  x=smoothstep(.0,1.0,(x*2.0+p.x-1.0));
-  return mix(getFromColor((p-.5)*(1.-x)+.5), getToColor((p-.5)*x+.5), x);
-}
-
-
-void mainImage(out vec4 fragColor, in vec2 fragCoord, in vec2 resolution, in vec2 uv)
-{
-  fragColor = transition(uv);
-}
@@ -146,21 +146,6 @@
    <file>cogs.glsl</file>
    <file>glowingstars.glsl</file>
  </gresource>
-  <gresource prefix="/gltransition">
-    <file>gtkshaderstack.c</file>
-    <file>gtkshaderstack.h</file>
-    <file>gtkshaderbin.h</file>
-    <file>gtkshaderbin.c</file>
-    <file>gskshaderpaintable.h</file>
-    <file>gskshaderpaintable.c</file>
-    <file>wind.glsl</file>
-    <file>radial.glsl</file>
-    <file>crosswarp.glsl</file>
-    <file>kaleidoscope.glsl</file>
-    <file>cogs2.glsl</file>
-    <file>ripple.glsl</file>
-    <file>background.glsl</file>
-  </gresource>
  <gresource prefix="/iconscroll">
    <file>iconscroll.ui</file>
  </gresource>
@@ -296,7 +281,6 @@
    <file>gears.c</file>
    <file>gestures.c</file>
    <file>glarea.c</file>
-    <file>gltransition.c</file>
    <file>headerbar.c</file>
    <file>hypertext.c</file>
    <file>iconscroll.c</file>
@@ -454,6 +438,10 @@
    <file>icons/16x16/categories/applications-other.png</file>
    <file>icons/48x48/status/starred.png</file>
    <file alias="icons/scalable/apps/org.gtk.Demo4.svg">data/scalable/apps/org.gtk.Demo4.svg</file>
+    <file>portland-rose-thumbnail.png</file>
+    <file>large-image-thumbnail.png</file>
+    <file compressed="true">large-image.png</file>
+    <file compressed="true">Moby-Dick.txt</file>
  </gresource>
  <gresource prefix="/org/gtk/Demo4/gtk">
    <file preprocess="xml-stripblanks">help-overlay.ui</file>
@@ -55,7 +55,7 @@ mode_switch_state_set (GtkSwitch *sw,
    {
      gtk_widget_set_visible (label, TRUE);
      gtk_accessible_update_relation (GTK_ACCESSIBLE (sw),
-                                      GTK_ACCESSIBLE_RELATION_ERROR_MESSAGE, label,
+                                      GTK_ACCESSIBLE_RELATION_ERROR_MESSAGE, label, NULL,
                                      -1);
      gtk_accessible_update_state (GTK_ACCESSIBLE (sw),
                                   GTK_ACCESSIBLE_STATE_INVALID, GTK_ACCESSIBLE_INVALID_TRUE,
@@ -9,7 +9,6 @@

 #include "gtkfishbowl.h"
 #include "gtkgears.h"
-#include "gskshaderpaintable.h"

 #include "nodewidget.h"
 #include "graphwidget.h"
@@ -152,46 +151,6 @@ create_switch (void)
  return w;
 }

-static gboolean
-update_paintable (GtkWidget     *widget,
-                  GdkFrameClock *frame_clock,
-                  gpointer       user_data)
-{
-  GskShaderPaintable *paintable;
-  gint64 frame_time;
-
-  paintable = GSK_SHADER_PAINTABLE (gtk_picture_get_paintable (GTK_PICTURE (widget)));
-  frame_time = gdk_frame_clock_get_frame_time (frame_clock);
-  gsk_shader_paintable_update_time (paintable, 0, frame_time);
-
-  return G_SOURCE_CONTINUE;
-}
-
-static GtkWidget *
-create_cogs (void)
-{
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-  GtkWidget *picture;
-  static GskGLShader *cog_shader = NULL;
-  GdkPaintable *paintable;
-
- if (cog_shader == NULL)
-    cog_shader = gsk_gl_shader_new_from_resource ("/gltransition/cogs2.glsl");
-  paintable = gsk_shader_paintable_new (g_object_ref (cog_shader), NULL);
-  picture = gtk_picture_new_for_paintable (paintable);
-  gtk_widget_set_size_request (picture, 150, 75);
-  gtk_widget_add_tick_callback (picture, update_paintable, NULL, NULL);
-
-  return picture;
-G_GNUC_END_IGNORE_DEPRECATIONS
-}
-
-static gboolean
-check_cogs (GtkFishbowl *fb)
-{
-  return GSK_IS_GL_RENDERER (gtk_native_get_renderer (gtk_widget_get_native (GTK_WIDGET (fb))));
-}
-
 static void
 mapped (GtkWidget *w)
 {
@@ -241,7 +200,6 @@ static const struct {
  { "Gears",      create_gears,          NULL },
  { "Switch",     create_switch,         NULL },
  { "Menubutton", create_menu_button,    NULL },
-  { "Shader",     create_cogs,           check_cogs },
  { "Tiger",      create_tiger,          NULL },
  { "Graph",      create_graph,          NULL },
 };
@@ -276,7 +276,7 @@ gtk_font_plane_class_init (GtkFontPlaneClass *class)

 GtkWidget *
 gtk_font_plane_new (GtkAdjustment *weight_adj,
-                     GtkAdjustment *width_adj)
+                    GtkAdjustment *width_adj)
 {
  return g_object_new (GTK_TYPE_FONT_PLANE,
                       "weight-adjustment", weight_adj,
@@ -55,7 +55,7 @@ struct _GtkFontPlaneClass


 GType       gtk_font_plane_get_type (void) G_GNUC_CONST;
-GtkWidget * gtk_font_plane_new      (GtkAdjustment *width_adj,
-                                     GtkAdjustment *weight_adj);
+GtkWidget * gtk_font_plane_new      (GtkAdjustment *weight_adj,
+                                     GtkAdjustment *width_adj);

 G_END_DECLS
@@ -1,366 +0,0 @@
-/* OpenGL/Transitions and Effects
- * #Keywords: OpenGL, shader, effect
- *
- * Create transitions between pages using a custom fragment shader.
- *
- * The example transitions here are taken from gl-transitions.com, and you
- * can edit the shader code itself on the last page of the stack.
- *
- * The transitions work with arbitrary content. We use images, shaders
- * GL areas and plain old widgets to demonstrate this.
- *
- * The demo also shows some over-the-top effects like wobbly widgets,
- * and animated backgrounds.
- */
-
-#include <math.h>
-#include <gtk/gtk.h>
-#include "gtkshaderstack.h"
-#include "gtkshaderbin.h"
-#include "gtkshadertoy.h"
-#include "gskshaderpaintable.h"
-
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-
-static GtkWidget *demo_window = NULL;
-
-static void
-close_window (GtkWidget *widget)
-{
-  /* Reset the state */
-  demo_window = NULL;
-}
-
-static void
-text_changed (GtkTextBuffer *buffer,
-              GtkWidget     *button)
-{
-  gtk_widget_set_visible (button, TRUE);
-}
-
-static void
-apply_text (GtkWidget     *button,
-            GtkTextBuffer *buffer)
-{
-  GtkWidget *stack;
-  GskGLShader *shader;
-  GtkTextIter start, end;
-  char *text;
-
-  stack = g_object_get_data (G_OBJECT (button), "the-stack");
-
-  gtk_text_buffer_get_bounds (buffer, &start, &end);
-  text = gtk_text_buffer_get_text (buffer, &start, &end, TRUE);
-
-  GBytes *bytes = g_bytes_new_take (text, strlen (text));
-  shader = gsk_gl_shader_new_from_bytes (bytes);
-
-  gtk_shader_stack_set_shader (GTK_SHADER_STACK (stack), shader);
-
-  g_object_unref (shader);
-  g_bytes_unref (bytes);
-
-  gtk_widget_set_visible (button, FALSE);
-}
-
-static void
-go_back (GtkWidget     *button,
-         GtkWidget     *stack)
-{
-  gtk_shader_stack_transition (GTK_SHADER_STACK (stack), FALSE);
-}
-
-static void
-go_forward (GtkWidget     *button,
-            GtkWidget     *stack)
-{
-  gtk_shader_stack_transition (GTK_SHADER_STACK (stack), TRUE);
-}
-
-static void
-clicked_cb (GtkGestureClick *gesture,
-            guint            n_pressed,
-            double           x,
-            double           y,
-            gpointer         data)
-{
-  gtk_gesture_set_state (GTK_GESTURE (gesture), GTK_EVENT_SEQUENCE_CLAIMED);
-}
-
-static GtkWidget *
-ripple_bin_new (void)
-{
-  GtkWidget *bin = gtk_shader_bin_new ();
-  static GskGLShader *shader = NULL;
-
-  if (shader == NULL)
-    shader = gsk_gl_shader_new_from_resource ("/gltransition/ripple.glsl");
-
-  gtk_shader_bin_add_shader (GTK_SHADER_BIN (bin), shader, GTK_STATE_FLAG_PRELIGHT, GTK_STATE_FLAG_PRELIGHT, 20);
-
-  return bin;
-}
-
-static GtkWidget *
-new_shadertoy (const char *path)
-{
-  GBytes *shader;
-  GtkWidget *toy;
-
-  toy = gtk_shadertoy_new ();
-  shader = g_resources_lookup_data (path, 0, NULL);
-  gtk_shadertoy_set_image_shader (GTK_SHADERTOY (toy),
-                                  g_bytes_get_data (shader, NULL));
-  g_bytes_unref (shader);
-
-  return toy;
-}
-
-static gboolean
-update_paintable (GtkWidget     *widget,
-                  GdkFrameClock *frame_clock,
-                  gpointer       user_data)
-{
-  GskShaderPaintable *paintable;
-  gint64 frame_time;
-
-  paintable = GSK_SHADER_PAINTABLE (gtk_picture_get_paintable (GTK_PICTURE (widget)));
-  frame_time = gdk_frame_clock_get_frame_time (frame_clock);
-  gsk_shader_paintable_update_time (paintable, 0, frame_time);
-
-  return G_SOURCE_CONTINUE;
-}
-
-static GtkWidget *
-make_shader_stack (const char *name,
-                   const char *resource_path,
-                   int active_child,
-                   GtkWidget  *scale)
-{
-  GtkWidget *stack, *child, *widget, *vbox, *hbox, *bin;
-  GtkWidget *label, *button, *tv;
-  GskGLShader *shader;
-  GObjectClass *class;
-  GParamSpecFloat *pspec;
-  GtkAdjustment *adjustment;
-  GtkTextBuffer *buffer;
-  GBytes *bytes;
-  GtkEventController *controller;
-  GdkPaintable *paintable;
-
-  stack = gtk_shader_stack_new ();
-  shader = gsk_gl_shader_new_from_resource (resource_path);
-  gtk_shader_stack_set_shader (GTK_SHADER_STACK (stack), shader);
-  g_object_unref (shader);
-
-  child = gtk_picture_new_for_resource ("/css_blendmodes/ducky.png");
-  gtk_picture_set_can_shrink (GTK_PICTURE (child), TRUE);
-  gtk_shader_stack_add_child (GTK_SHADER_STACK (stack), child);
-
-  shader = gsk_gl_shader_new_from_resource ("/gltransition/cogs2.glsl");
-  paintable = gsk_shader_paintable_new (shader, NULL);
-
-  child = gtk_picture_new_for_paintable (paintable);
-  gtk_widget_add_tick_callback (child, update_paintable, NULL, NULL);
-  gtk_picture_set_can_shrink (GTK_PICTURE (child), TRUE);
-  gtk_shader_stack_add_child (GTK_SHADER_STACK (stack), child);
-
-  child = gtk_picture_new_for_resource ("/transparent/portland-rose.jpg");
-  gtk_picture_set_can_shrink (GTK_PICTURE (child), TRUE);
-  gtk_shader_stack_add_child (GTK_SHADER_STACK (stack), child);
-
-  child = new_shadertoy ("/shadertoy/neon.glsl");
-  gtk_shader_stack_add_child (GTK_SHADER_STACK (stack), child);
-
-  child = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
-
-  class = g_type_class_ref (GTK_TYPE_SHADER_STACK);
-  pspec = G_PARAM_SPEC_FLOAT (g_object_class_find_property (class, "duration"));
-
-  adjustment = gtk_range_get_adjustment (GTK_RANGE (scale));
-  if (gtk_adjustment_get_lower (adjustment) == 0.0 &&
-      gtk_adjustment_get_upper (adjustment) == 0.0)
-    {
-      gtk_adjustment_configure (adjustment,
-                                pspec->default_value,
-                                pspec->minimum,
-                                pspec->maximum,
-                                0.1, 0.5, 0);
-    }
-
-  g_type_class_unref (class);
-
-  g_object_bind_property (adjustment, "value",
-                          stack, "duration",
-                          G_BINDING_DEFAULT);
-
-  widget = gtk_scrolled_window_new ();
-  gtk_scrolled_window_set_has_frame (GTK_SCROLLED_WINDOW (widget), TRUE);
-  gtk_widget_set_hexpand (widget, TRUE);
-  gtk_widget_set_vexpand (widget, TRUE);
-
-  controller = GTK_EVENT_CONTROLLER (gtk_gesture_click_new ());
-  gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (controller), 0);
-  g_signal_connect (controller, "released", G_CALLBACK (clicked_cb), NULL);
-  gtk_event_controller_set_propagation_phase (controller, GTK_PHASE_BUBBLE);
-  gtk_widget_add_controller (GTK_WIDGET (widget), controller);
-
-  tv = gtk_text_view_new ();
-  gtk_text_view_set_left_margin (GTK_TEXT_VIEW (tv), 4);
-  gtk_text_view_set_right_margin (GTK_TEXT_VIEW (tv), 4);
-  gtk_text_view_set_top_margin (GTK_TEXT_VIEW (tv), 4);
-  gtk_text_view_set_bottom_margin (GTK_TEXT_VIEW (tv), 4);
-  buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (tv));
-  bytes = g_resources_lookup_data (resource_path, 0, NULL);
-  gtk_text_buffer_set_text (buffer,
-                            (const char *)g_bytes_get_data (bytes, NULL),
-                            g_bytes_get_size (bytes));
-  g_bytes_unref (bytes);
-  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (widget), tv);
-
-  gtk_box_append (GTK_BOX (child), widget);
-
-  gtk_shader_stack_add_child (GTK_SHADER_STACK (stack), child);
-
-  gtk_shader_stack_set_active (GTK_SHADER_STACK (stack), active_child);
-
-  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
-
-  widget = gtk_center_box_new ();
-  label = gtk_label_new (name);
-  gtk_widget_add_css_class (label, "title-4");
-  gtk_widget_set_size_request (label, -1, 26);
-  gtk_center_box_set_center_widget (GTK_CENTER_BOX (widget), label);
-
-  button = gtk_button_new_from_icon_name ("view-refresh-symbolic");
-  g_signal_connect (buffer, "changed", G_CALLBACK (text_changed), button);
-  g_object_set_data (G_OBJECT (button), "the-stack", stack);
-  g_signal_connect (button, "clicked", G_CALLBACK (apply_text), buffer);
-  gtk_widget_set_halign (button, GTK_ALIGN_CENTER);
-  gtk_widget_set_valign (button, GTK_ALIGN_CENTER);
-  gtk_widget_add_css_class (button, "small");
-  gtk_widget_set_visible (button, FALSE);
-  gtk_center_box_set_end_widget (GTK_CENTER_BOX (widget), button);
-
-  gtk_box_append (GTK_BOX (vbox), widget);
-
-  GtkWidget *bin2 = ripple_bin_new ();
-  gtk_shader_bin_set_child (GTK_SHADER_BIN (bin2), stack);
-
-  gtk_box_append (GTK_BOX (vbox), bin2);
-
-  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
-  gtk_widget_set_halign (hbox, GTK_ALIGN_CENTER);
-
-  gtk_box_append (GTK_BOX (vbox), hbox);
-
-  button = gtk_button_new_from_icon_name ("go-previous-symbolic");
-  g_signal_connect (button, "clicked", G_CALLBACK (go_back), stack);
-  bin = ripple_bin_new ();
-  gtk_shader_bin_set_child (GTK_SHADER_BIN (bin), button);
-  gtk_box_append (GTK_BOX (hbox), bin);
-
-  button = gtk_button_new_from_icon_name ("go-next-symbolic");
-  g_signal_connect (button, "clicked", G_CALLBACK (go_forward), stack);
-  bin = ripple_bin_new ();
-  gtk_shader_bin_set_child (GTK_SHADER_BIN (bin), button);
-  gtk_box_append (GTK_BOX (hbox), bin);
-
-  return vbox;
-}
-
-static void
-remove_provider (gpointer data)
-{
-  GtkStyleProvider *provider = GTK_STYLE_PROVIDER (data);
-
-  gtk_style_context_remove_provider_for_display (gdk_display_get_default (), provider);
-  g_object_unref (provider);
-}
-
-static GtkWidget *
-create_gltransition_window (GtkWidget *do_widget)
-{
-  GtkWidget *window, *headerbar, *scale, *outer_grid, *grid, *background;
-  GdkPaintable *paintable;
-  GtkCssProvider *provider;
-
-  window = gtk_window_new ();
-  gtk_window_set_display (GTK_WINDOW (window),  gtk_widget_get_display (do_widget));
-  gtk_window_set_title (GTK_WINDOW (window), "Transitions and Effects");
-  headerbar = gtk_header_bar_new ();
-  scale = gtk_scale_new (GTK_ORIENTATION_HORIZONTAL, NULL);
-  gtk_scale_set_draw_value (GTK_SCALE (scale), FALSE);
-  gtk_widget_set_size_request (scale, 100, -1);
-  gtk_widget_set_tooltip_text (scale, "Transition duration");
-  gtk_header_bar_pack_end (GTK_HEADER_BAR (headerbar), scale);
-  gtk_window_set_titlebar (GTK_WINDOW (window), headerbar);
-  gtk_window_set_default_size (GTK_WINDOW (window), 800, 600);
-  g_signal_connect (window, "destroy", G_CALLBACK (close_window), NULL);
-
-  outer_grid = gtk_grid_new ();
-  gtk_window_set_child (GTK_WINDOW (window), outer_grid);
-
-  paintable = gsk_shader_paintable_new (gsk_gl_shader_new_from_resource ("/gltransition/background.glsl"), NULL);
-  background = gtk_picture_new_for_paintable (paintable);
-  gtk_widget_add_tick_callback (background, update_paintable, NULL, NULL);
-
-  gtk_grid_attach (GTK_GRID (outer_grid),
-                   background,
-                   0, 0, 1, 1);
-
-  grid = gtk_grid_new ();
-  gtk_grid_attach (GTK_GRID (outer_grid),
-                   grid,
-                   0, 0, 1, 1);
-
-  gtk_widget_set_halign (grid, GTK_ALIGN_CENTER);
-  gtk_widget_set_valign (grid, GTK_ALIGN_CENTER);
-  gtk_widget_set_margin_start (grid, 12);
-  gtk_widget_set_margin_end (grid, 12);
-  gtk_widget_set_margin_top (grid, 12);
-  gtk_widget_set_margin_bottom (grid, 12);
-  gtk_grid_set_row_spacing (GTK_GRID (grid), 6);
-  gtk_grid_set_column_spacing (GTK_GRID (grid), 6);
-  gtk_grid_set_row_homogeneous (GTK_GRID (grid), TRUE);
-  gtk_grid_set_column_homogeneous (GTK_GRID (grid), TRUE);
-
-  gtk_grid_attach (GTK_GRID (grid),
-                   make_shader_stack ("Wind", "/gltransition/wind.glsl", 0, scale),
-                   0, 0, 1, 1);
-  gtk_grid_attach (GTK_GRID (grid),
-                   make_shader_stack ("Radial", "/gltransition/radial.glsl", 1, scale),
-                   1, 0, 1, 1);
-  gtk_grid_attach (GTK_GRID (grid),
-                   make_shader_stack ("Crosswarp", "/gltransition/crosswarp.glsl", 2, scale),
-                   0, 1, 1, 1);
-  gtk_grid_attach (GTK_GRID (grid),
-                   make_shader_stack ("Kaleidoscope", "/gltransition/kaleidoscope.glsl", 3, scale),
-                   1, 1, 1, 1);
-
-  provider = gtk_css_provider_new ();
-  gtk_css_provider_load_from_string (provider, "button.small { padding: 0; }");
-  gtk_style_context_add_provider_for_display (gdk_display_get_default (),
-                                              GTK_STYLE_PROVIDER (provider),
-                                              GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
-
-  g_object_set_data_full (G_OBJECT (window), "provider", provider, remove_provider);
-
-  return window;
-}
-
-GtkWidget *
-do_gltransition (GtkWidget *do_widget)
-{
-  if (!demo_window)
-    demo_window = create_gltransition_window (do_widget);
-
-  if (!gtk_widget_get_visible (demo_window))
-    gtk_widget_set_visible (demo_window, TRUE);
-  else
-    gtk_window_destroy (GTK_WINDOW (demo_window));
-
-  return demo_window;
-}
-
-G_GNUC_END_IGNORE_DEPRECATIONS
@@ -1,338 +0,0 @@
-/*
- * Copyright © 2020 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.1 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/>.
- *
- * Authors: Matthias Clasen <mclasen@redhat.com>
- */
-
-#include "config.h"
-
-#include <gtk/gtk.h>
-#include "gskshaderpaintable.h"
-
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-
-/**
- * GskShaderPaintable:
- *
- * `GskShaderPaintable` is an implementation of the `GdkPaintable` interface
- * that uses a `GskGLShader` to create pixels.
- *
- * You can set the uniform data that the shader needs for rendering
- * using gsk_shader_paintable_set_args(). This function can
- * be called repeatedly to change the uniform data for the next
- * snapshot.
- *
- * Commonly, time is passed to shaders as a float uniform containing
- * the elapsed time in seconds. The convenience API
- * gsk_shader_paintable_update_time() can be called from a `GtkTickCallback`
- * to update the time based on the frame time of the frame clock.
- */
-
-
-struct _GskShaderPaintable
-{
-  GObject parent_instance;
-
-  GskGLShader *shader;
-  GBytes *args;
-
-  gint64 start_time;
-};
-
-struct _GskShaderPaintableClass
-{
-  GObjectClass parent_class;
-};
-
-enum {
-  PROP_0,
-  PROP_SHADER,
-  PROP_ARGS,
-
-  N_PROPS,
-};
-
-static GParamSpec *properties[N_PROPS] = { NULL, };
-
-static void
-gsk_shader_paintable_paintable_snapshot (GdkPaintable *paintable,
-                                         GdkSnapshot  *snapshot,
-                                         double        width,
-                                         double        height)
-{
-  GskShaderPaintable *self = GSK_SHADER_PAINTABLE (paintable);
-
-  gtk_snapshot_push_gl_shader (snapshot, self->shader, &GRAPHENE_RECT_INIT(0, 0, width, height), g_bytes_ref (self->args));
-  gtk_snapshot_pop (snapshot);
-}
-
-static void
-gsk_shader_paintable_paintable_init (GdkPaintableInterface *iface)
-{
-  iface->snapshot = gsk_shader_paintable_paintable_snapshot;
-}
-
-G_DEFINE_TYPE_EXTENDED (GskShaderPaintable, gsk_shader_paintable, G_TYPE_OBJECT, 0,
-                        G_IMPLEMENT_INTERFACE (GDK_TYPE_PAINTABLE,
-                                               gsk_shader_paintable_paintable_init))
-
-static void
-gsk_shader_paintable_set_property (GObject      *object,
-                                   guint         prop_id,
-                                   const GValue *value,
-                                   GParamSpec   *pspec)
-
-{
-  GskShaderPaintable *self = GSK_SHADER_PAINTABLE (object);
-
-  switch (prop_id)
-    {
-    case PROP_SHADER:
-      gsk_shader_paintable_set_shader (self, g_value_get_object (value));
-      break;
-
-    case PROP_ARGS:
-      gsk_shader_paintable_set_args (self, g_value_get_boxed (value));
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-gsk_shader_paintable_get_property (GObject    *object,
-                                   guint       prop_id,
-                                   GValue     *value,
-                                   GParamSpec *pspec)
-{
-  GskShaderPaintable *self = GSK_SHADER_PAINTABLE (object);
-
-  switch (prop_id)
-    {
-    case PROP_SHADER:
-      g_value_set_object (value, self->shader);
-      break;
-
-    case PROP_ARGS:
-      g_value_set_boxed (value, self->args);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-gsk_shader_paintable_finalize (GObject *object)
-{
-  GskShaderPaintable *self = GSK_SHADER_PAINTABLE (object);
-
-  g_clear_pointer (&self->args, g_bytes_unref);
-  g_clear_object (&self->shader);
-
-  G_OBJECT_CLASS (gsk_shader_paintable_parent_class)->finalize (object);
-}
-
-static void
-gsk_shader_paintable_class_init (GskShaderPaintableClass *klass)
-{
-  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-
-  gobject_class->get_property = gsk_shader_paintable_get_property;
-  gobject_class->set_property = gsk_shader_paintable_set_property;
-  gobject_class->finalize = gsk_shader_paintable_finalize;
-
-  properties[PROP_SHADER] =
-    g_param_spec_object ("shader", "Shader", "The shader",
-                         GSK_TYPE_GL_SHADER,
-                         G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);
-
-  properties[PROP_ARGS] =
-    g_param_spec_boxed ("args", "Arguments", "The uniform arguments",
-                        G_TYPE_BYTES,
-                        G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);
-
-  g_object_class_install_properties (gobject_class, N_PROPS, properties);
-}
-
-static void
-gsk_shader_paintable_init (GskShaderPaintable *self)
-{
-}
-
-/**
- * gsk_shader_paintable_new:
- * @shader: (transfer full) (nullable): the shader to use
- * @data: (transfer full) (nullable): uniform data
- *
- * Creates a paintable that uses the @shader to create
- * pixels. The shader must not require input textures.
- * If @data is %NULL, all uniform values are set to zero.
- *
- * Returns: (transfer full): a new `GskShaderPaintable`
- */
-GdkPaintable *
-gsk_shader_paintable_new (GskGLShader *shader,
-                          GBytes      *data)
-{
-  GdkPaintable *ret;
-
-  g_return_val_if_fail (shader == NULL || GSK_IS_GL_SHADER (shader), NULL);
-
-  if (shader && !data)
-    {
-      int size = gsk_gl_shader_get_args_size (shader);
-      data = g_bytes_new_take (g_new0 (guchar, size), size);
-    }
-
-  ret = g_object_new (GSK_TYPE_SHADER_PAINTABLE,
-                      "shader", shader,
-                      "args", data,
-                      NULL);
-
-  g_clear_object (&shader);
-  g_clear_pointer (&data, g_bytes_unref);
-
-  return ret;
-}
-
-/**
- * gsk_shader_paintable_set_shader:
- * @self: a `GskShaderPaintable`
- * @shader: the `GskGLShader` to use
- *
- * Sets the shader that the paintable will use
- * to create pixels. The shader must not require
- * input textures.
- */
-void
-gsk_shader_paintable_set_shader (GskShaderPaintable *self,
-                                 GskGLShader        *shader)
-{
-  g_return_if_fail (GSK_IS_SHADER_PAINTABLE (self));
-  g_return_if_fail (shader == NULL || GSK_IS_GL_SHADER (shader));
-  g_return_if_fail (shader == NULL || gsk_gl_shader_get_n_textures (shader) == 0);
-
-  if (!g_set_object (&self->shader, shader))
-    return;
-
-  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_SHADER]);
-  gdk_paintable_invalidate_contents (GDK_PAINTABLE (self));
-
-  g_clear_pointer (&self->args, g_bytes_unref);
-}
-
-/**
- * gsk_shader_paintable_get_shader:
- * @self: a `GskShaderPaintable`
- *
- * Returns the shader that the paintable is using.
- *
- * Returns: (transfer none): the `GskGLShader` that is used
- */
-GskGLShader *
-gsk_shader_paintable_get_shader (GskShaderPaintable *self)
-{
-  g_return_val_if_fail (GSK_IS_SHADER_PAINTABLE (self), NULL);
-
-  return self->shader;
-}
-
-/**
- * gsk_shader_paintable_set_args:
- * @self: a `GskShaderPaintable`
- * @data: Data block with uniform data for the shader
- *
- * Sets the uniform data that will be passed to the
- * shader when rendering. The @data will typically
- * be produced by a `GskUniformDataBuilder`.
- *
- * Note that the @data should be considered immutable
- * after it has been passed to this function.
- */
-void
-gsk_shader_paintable_set_args (GskShaderPaintable *self,
-                                       GBytes             *data)
-{
-  g_return_if_fail (GSK_IS_SHADER_PAINTABLE (self));
-  g_return_if_fail (data == NULL || g_bytes_get_size (data) == gsk_gl_shader_get_args_size (self->shader));
-
-  g_clear_pointer (&self->args, g_bytes_unref);
-  if (data)
-    self->args = g_bytes_ref (data);
-
-  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_ARGS]);
-  gdk_paintable_invalidate_contents (GDK_PAINTABLE (self));
-}
-
-/**
- * gsk_shader_paintable_get_args:
- * @self: a `GskShaderPaintable`
- *
- * Returns the uniform data set with
- * gsk_shader_paintable_get_args().
- *
- * Returns: (transfer none): the uniform data
- */
-GBytes *
-gsk_shader_paintable_get_args (GskShaderPaintable *self)
-{
-  g_return_val_if_fail (GSK_IS_SHADER_PAINTABLE (self), NULL);
-
-  return self->args;
-}
-
-/**
- * gsk_shader_paintable_update_time:
- * @self: a `GskShaderPaintable`
- * @time_idx: the index of the uniform for time in seconds as float
- * @frame_time: the current frame time, as returned by `GdkFrameClock`
- *
- * This function is a convenience wrapper for
- * gsk_shader_paintable_set_args() that leaves all
- * uniform values unchanged, except for the uniform with
- * index @time_idx, which will be set to the elapsed time
- * in seconds, since the first call to this function.
- *
- * This function is usually called from a `GtkTickCallback`.
- */
-void
-gsk_shader_paintable_update_time (GskShaderPaintable *self,
-                                  int                 time_idx,
-                                  gint64              frame_time)
-{
-  GskShaderArgsBuilder *builder;
-  GBytes *args;
-  float time;
-
-  if (self->start_time == 0)
-    self->start_time = frame_time;
-
-  time = (frame_time - self->start_time) / (float)G_TIME_SPAN_SECOND;
-
-  builder = gsk_shader_args_builder_new (self->shader, self->args);
-  gsk_shader_args_builder_set_float (builder, time_idx, time);
-  args = gsk_shader_args_builder_free_to_args (builder);
-
-  gsk_shader_paintable_set_args (self, args);
-
-  g_bytes_unref (args);
-}
-
-G_GNUC_END_IGNORE_DEPRECATIONS
@@ -1,47 +0,0 @@
-/*
- * Copyright © 2020 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.1 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/>.
- *
- * Authors: Matthias Clasen <mclasen@redhat.com>
- */
-
-#pragma once
-
-#include <gdk/gdk.h>
-#include <gsk/gsk.h>
-
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-
-G_BEGIN_DECLS
-
-#define GSK_TYPE_SHADER_PAINTABLE (gsk_shader_paintable_get_type ())
-
-G_DECLARE_FINAL_TYPE (GskShaderPaintable, gsk_shader_paintable, GSK, SHADER_PAINTABLE, GObject)
-
-GdkPaintable *   gsk_shader_paintable_new              (GskGLShader        *shader,
-                                                        GBytes             *data);
-
-GskGLShader *    gsk_shader_paintable_get_shader       (GskShaderPaintable *self);
-void             gsk_shader_paintable_set_shader       (GskShaderPaintable *self,
-                                                        GskGLShader        *shader);
-GBytes *         gsk_shader_paintable_get_args         (GskShaderPaintable *self);
-void             gsk_shader_paintable_set_args         (GskShaderPaintable *self,
-                                                        GBytes             *data);
-void             gsk_shader_paintable_update_time      (GskShaderPaintable *self,
-                                                        int                 time_idx,
-                                                        gint64              frame_time);
-G_END_DECLS
-
-G_GNUC_END_IGNORE_DEPRECATIONS
@@ -55,7 +55,7 @@ void       gtk_fishbowl_set_animating     (GtkFishbowl       *fishbowl,
                                           gboolean           animating);
 gboolean   gtk_fishbowl_get_benchmark     (GtkFishbowl       *fishbowl);
 void       gtk_fishbowl_set_benchmark     (GtkFishbowl       *fishbowl,
-                                           gboolean           animating);
+                                           gboolean           benchmark);
 double     gtk_fishbowl_get_framerate     (GtkFishbowl       *fishbowl);
 gint64     gtk_fishbowl_get_update_delay  (GtkFishbowl       *fishbowl);
 void       gtk_fishbowl_set_update_delay  (GtkFishbowl       *fishbowl,
@@ -1,268 +0,0 @@
-#include "gtkshaderbin.h"
-
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-
-typedef struct {
-  GskGLShader *shader;
-  GtkStateFlags state;
-  GtkStateFlags state_mask;
-  float extra_border;
-  gboolean compiled;
-  gboolean compiled_ok;
-} ShaderInfo;
-
-struct _GtkShaderBin
-{
-  GtkWidget parent_instance;
-  GtkWidget *child;
-  ShaderInfo *active_shader;
-  GPtrArray *shaders;
-  guint tick_id;
-  float time;
-  float mouse_x, mouse_y;
-  gint64 first_frame_time;
-};
-
-struct _GtkShaderBinClass
-{
-  GtkWidgetClass parent_class;
-};
-
-G_DEFINE_TYPE (GtkShaderBin, gtk_shader_bin, GTK_TYPE_WIDGET)
-
-static void
-shader_info_free (ShaderInfo *info)
-{
-  g_object_unref (info->shader);
-  g_free (info);
-}
-
-static void
-gtk_shader_bin_finalize (GObject *object)
-{
-  GtkShaderBin *self = GTK_SHADER_BIN (object);
-
-  g_ptr_array_free (self->shaders, TRUE);
-
-  G_OBJECT_CLASS (gtk_shader_bin_parent_class)->finalize (object);
-}
-
-static void
-gtk_shader_bin_dispose (GObject *object)
-{
-  GtkShaderBin *self = GTK_SHADER_BIN (object);
-
-  g_clear_pointer (&self->child, gtk_widget_unparent);
-
-  G_OBJECT_CLASS (gtk_shader_bin_parent_class)->dispose (object);
-}
-
-static gboolean
-gtk_shader_bin_tick (GtkWidget     *widget,
-                     GdkFrameClock *frame_clock,
-                     gpointer       unused)
-{
-  GtkShaderBin *self = GTK_SHADER_BIN (widget);
-  gint64 frame_time;
-
-  frame_time = gdk_frame_clock_get_frame_time (frame_clock);
-  if (self->first_frame_time == 0)
-    self->first_frame_time = frame_time;
-  self->time = (frame_time - self->first_frame_time) / (float)G_USEC_PER_SEC;
-
-  gtk_widget_queue_draw (widget);
-
-  return G_SOURCE_CONTINUE;
-}
-
-static void
-motion_cb (GtkEventControllerMotion *controller,
-           double                    x,
-           double                    y,
-           GtkShaderBin             *self)
-{
-  self->mouse_x = x;
-  self->mouse_y = y;
-}
-
-static void
-gtk_shader_bin_init (GtkShaderBin *self)
-{
-  GtkEventController *controller;
-  self->shaders = g_ptr_array_new_with_free_func ((GDestroyNotify)shader_info_free);
-
-  controller = gtk_event_controller_motion_new ();
-  g_signal_connect (controller, "motion", G_CALLBACK (motion_cb), self);
-  gtk_widget_add_controller (GTK_WIDGET (self), controller);
-}
-
-void
-gtk_shader_bin_update_active_shader (GtkShaderBin *self)
-{
-  GtkStateFlags new_state = gtk_widget_get_state_flags (GTK_WIDGET (self));
-  ShaderInfo *new_shader = NULL;
-
-  for (int i = 0; i < self->shaders->len; i++)
-    {
-      ShaderInfo *info = g_ptr_array_index (self->shaders, i);
-
-      if ((info->state_mask & new_state) == info->state)
-        {
-          new_shader = info;
-          break;
-        }
-    }
-
-  if (self->active_shader == new_shader)
-    return;
-
-  self->active_shader = new_shader;
-  self->first_frame_time = 0;
-
-  if (self->active_shader)
-    {
-      if (self->tick_id == 0)
-        self->tick_id = gtk_widget_add_tick_callback (GTK_WIDGET (self),
-                                                      gtk_shader_bin_tick,
-                                                      NULL, NULL);
-    }
-  else
-    {
-      if (self->tick_id != 0)
-        {
-          gtk_widget_remove_tick_callback (GTK_WIDGET (self), self->tick_id);
-          self->tick_id = 0;
-        }
-    }
-
-  gtk_widget_queue_draw (GTK_WIDGET (self));
-}
-
-static void
-gtk_shader_bin_state_flags_changed (GtkWidget        *widget,
-                                    GtkStateFlags     previous_state_flags)
-{
-  GtkShaderBin *self = GTK_SHADER_BIN (widget);
-
-  gtk_shader_bin_update_active_shader (self);
-}
-
-void
-gtk_shader_bin_add_shader (GtkShaderBin *self,
-                           GskGLShader  *shader,
-                           GtkStateFlags state,
-                           GtkStateFlags state_mask,
-                           float         extra_border)
-{
-  ShaderInfo *info = g_new0 (ShaderInfo, 1);
-  info->shader = g_object_ref (shader);
-  info->state = state;
-  info->state_mask = state_mask;
-  info->extra_border = extra_border;
-
-  g_ptr_array_add (self->shaders, info);
-
-  gtk_shader_bin_update_active_shader (self);
-}
-
-void
-gtk_shader_bin_set_child (GtkShaderBin *self,
-                          GtkWidget    *child)
-{
-
-  if (self->child == child)
-    return;
-
-  g_clear_pointer (&self->child, gtk_widget_unparent);
-
-  if (child)
-    {
-      self->child = child;
-      gtk_widget_set_parent (child, GTK_WIDGET (self));
-    }
-}
-
-GtkWidget *
-gtk_shader_bin_get_child   (GtkShaderBin *self)
-{
-  return self->child;
-}
-
-static void
-gtk_shader_bin_snapshot (GtkWidget   *widget,
-                         GtkSnapshot *snapshot)
-{
-  GtkShaderBin *self = GTK_SHADER_BIN (widget);
-  int width, height;
-
-  width = gtk_widget_get_width (widget);
-  height = gtk_widget_get_height (widget);
-
-  if (self->active_shader)
-    {
-      if (!self->active_shader->compiled)
-        {
-          GtkNative *native = gtk_widget_get_native (widget);
-          GskRenderer *renderer = gtk_native_get_renderer (native);
-          GError *error = NULL;
-
-          self->active_shader->compiled = TRUE;
-          self->active_shader->compiled_ok =
-            gsk_gl_shader_compile (self->active_shader->shader,
-                                   renderer, &error);
-          if (!self->active_shader->compiled_ok)
-            {
-              g_warning ("GtkShaderBin failed to compile shader: %s", error->message);
-              g_error_free (error);
-            }
-        }
-
-      if (self->active_shader->compiled_ok)
-        {
-          float border = self->active_shader->extra_border;
-          graphene_vec2_t mouse;
-          graphene_vec2_init (&mouse, self->mouse_x + border, self->mouse_y + border);
-          gtk_snapshot_push_gl_shader (snapshot, self->active_shader->shader,
-                                       &GRAPHENE_RECT_INIT(-border, -border, width+2*border, height+2*border),
-                                       gsk_gl_shader_format_args (self->active_shader->shader,
-                                                                  "u_time", self->time,
-                                                                  "u_mouse", &mouse,
-                                                                  NULL));
-          gtk_widget_snapshot_child (widget, self->child, snapshot);
-          gtk_snapshot_gl_shader_pop_texture (snapshot);
-          gtk_snapshot_pop (snapshot);
-
-          return;
-        }
-    }
-
-  /* Non-shader fallback */
-  gtk_widget_snapshot_child (widget, self->child, snapshot);
-}
-
-static void
-gtk_shader_bin_class_init (GtkShaderBinClass *class)
-{
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
-  GObjectClass *object_class = G_OBJECT_CLASS (class);
-
-  object_class->finalize = gtk_shader_bin_finalize;
-  object_class->dispose = gtk_shader_bin_dispose;
-
-  gtk_widget_class_set_layout_manager_type (widget_class, GTK_TYPE_BIN_LAYOUT);
-
-  widget_class->snapshot = gtk_shader_bin_snapshot;
-  widget_class->state_flags_changed = gtk_shader_bin_state_flags_changed;
-}
-
-GtkWidget *
-gtk_shader_bin_new (void)
-{
-  GtkShaderBin *self;
-
-  self = g_object_new (GTK_TYPE_SHADER_BIN, NULL);
-
-  return GTK_WIDGET (self);
-}
-
-G_GNUC_END_IGNORE_DEPRECATIONS
@@ -1,24 +0,0 @@
-#pragma once
-
-#include <gtk/gtk.h>
-
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_SHADER_BIN      (gtk_shader_bin_get_type ())
-G_DECLARE_FINAL_TYPE (GtkShaderBin, gtk_shader_bin, GTK, SHADER_BIN, GtkWidget)
-
-GtkWidget  *gtk_shader_bin_new        (void);
-void        gtk_shader_bin_add_shader (GtkShaderBin *self,
-                                       GskGLShader  *shader,
-                                       GtkStateFlags state,
-                                       GtkStateFlags state_mask,
-                                       float         extra_border);
-void       gtk_shader_bin_set_child   (GtkShaderBin *self,
-                                       GtkWidget    *child);
-GtkWidget *gtk_shader_bin_get_child   (GtkShaderBin *self);
-
-G_END_DECLS
-
-G_GNUC_END_IGNORE_DEPRECATIONS
@@ -1,365 +0,0 @@
-#include "gtkshaderstack.h"
-
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-
-struct _GtkShaderStack
-{
-  GtkWidget parent_instance;
-
-  GskGLShader *shader;
-  GPtrArray *children;
-  int current;
-  int next;
-  gboolean backwards;
-
-  guint tick_id;
-  float time;
-  float duration;
-  gint64 start_time;
-};
-
-struct _GtkShaderStackClass
-{
-  GtkWidgetClass parent_class;
-};
-
-
-enum {
-  PROP_DURATION = 1,
-  NUM_PROPERTIES
-};
-
-static GParamSpec *properties[NUM_PROPERTIES] = { NULL };
-
-G_DEFINE_TYPE (GtkShaderStack, gtk_shader_stack, GTK_TYPE_WIDGET)
-
-static void
-gtk_shader_stack_finalize (GObject *object)
-{
-  GtkShaderStack *self = GTK_SHADER_STACK (object);
-
-  g_object_unref (self->shader);
-
-  G_OBJECT_CLASS (gtk_shader_stack_parent_class)->finalize (object);
-}
-
-static void
-update_child_visible (GtkShaderStack *self)
-{
-  int i;
-
-  for (i = 0; i < self->children->len; i++)
-    {
-      GtkWidget *child = g_ptr_array_index (self->children, i);
-
-      gtk_widget_set_child_visible (child,
-                                    i == self->current || i == self->next);
-    }
-}
-
-static gboolean
-transition_cb (GtkWidget     *widget,
-               GdkFrameClock *clock,
-               gpointer       unused)
-{
-  GtkShaderStack *self = GTK_SHADER_STACK (widget);
-  gint64 frame_time;
-
-  frame_time = gdk_frame_clock_get_frame_time (clock);
-
-  if (self->start_time == 0)
-    self->start_time = frame_time;
-
-  self->time = (frame_time - self->start_time) / (float)G_USEC_PER_SEC;
-
-  gtk_widget_queue_draw (widget);
-
-  if (self->time >= self->duration)
-    {
-      self->current = self->next;
-      self->next = -1;
-
-      update_child_visible (self);
-
-      return G_SOURCE_REMOVE;
-    }
-  else
-    return G_SOURCE_CONTINUE;
-}
-
-static void
-start_transition (GtkShaderStack *self)
-{
-  self->start_time = 0;
-  self->tick_id = gtk_widget_add_tick_callback (GTK_WIDGET (self),
-                                                transition_cb,
-                                                NULL, NULL);
-}
-
-static void
-stop_transition (GtkShaderStack *self)
-{
-  if (self->tick_id != 0)
-    {
-      gtk_widget_remove_tick_callback (GTK_WIDGET (self), self->tick_id);
-      self->tick_id = 0;
-    }
-
-  if (self->next != -1)
-    self->current = self->next;
-  self->next = -1;
-
-  update_child_visible (self);
-}
-
-static void
-gtk_shader_stack_dispose (GObject *object)
-{
-  GtkShaderStack *self = GTK_SHADER_STACK (object);
-
-  stop_transition (self);
-
-  g_clear_pointer (&self->children, g_ptr_array_unref);
-
-  G_OBJECT_CLASS (gtk_shader_stack_parent_class)->dispose (object);
-}
-
-void
-gtk_shader_stack_transition (GtkShaderStack *self,
-                             gboolean forward)
-{
-  stop_transition (self);
-
-  self->backwards = !forward;
-  if (self->backwards)
-    self->next = (self->current + self->children->len - 1) % self->children->len;
-  else
-    self->next = (self->current + 1) % self->children->len;
-
-  update_child_visible (self);
-
-  start_transition (self);
-}
-
-static void
-gtk_shader_stack_init (GtkShaderStack *self)
-{
-  self->children = g_ptr_array_new_with_free_func ((GDestroyNotify)gtk_widget_unparent);
-  self->current = -1;
-  self->next = -1;
-  self->backwards = FALSE;
-  self->duration = 1.0;
-}
-
-static void
-gtk_shader_stack_measure (GtkWidget      *widget,
-                          GtkOrientation  orientation,
-                          int             for_size,
-                          int            *minimum,
-                          int            *natural,
-                          int            *minimum_baseline,
-                          int            *natural_baseline)
-{
-  GtkShaderStack *self = GTK_SHADER_STACK (widget);
-  int i;
-
-  *minimum = 0;
-  *natural = 0;
-
-  for (i = 0; i < self->children->len; i++)
-    {
-      GtkWidget *child = g_ptr_array_index (self->children, i);
-      int child_min, child_nat;
-
-      if (gtk_widget_get_visible (child))
-        {
-          gtk_widget_measure (child, orientation, for_size, &child_min, &child_nat, NULL, NULL);
-
-          *minimum = MAX (*minimum, child_min);
-          *natural = MAX (*natural, child_nat);
-        }
-    }
-}
-
-static void
-gtk_shader_stack_size_allocate (GtkWidget *widget,
-                                int        width,
-                                int        height,
-                                int        baseline)
-{
-  GtkShaderStack *self = GTK_SHADER_STACK (widget);
-  GtkAllocation child_allocation;
-  GtkWidget *child;
-  int i;
-
-  child_allocation.x = 0;
-  child_allocation.y = 0;
-  child_allocation.width = width;
-  child_allocation.height = height;
-
-  for (i = 0; i < self->children->len; i++)
-    {
-      child = g_ptr_array_index (self->children, i);
-      if (gtk_widget_get_visible (child))
-        gtk_widget_size_allocate (child, &child_allocation, -1);
-    }
-}
-
-static void
-gtk_shader_stack_snapshot (GtkWidget   *widget,
-                           GtkSnapshot *snapshot)
-{
-  GtkShaderStack *self = GTK_SHADER_STACK (widget);
-  int width, height;
-  GtkWidget *current, *next;
-
-  width = gtk_widget_get_width (widget);
-  height = gtk_widget_get_height (widget);
-
-  current = g_ptr_array_index (self->children, self->current);
-
-  if (self->next == -1)
-    {
-      gtk_widget_snapshot_child (widget, current, snapshot);
-    }
-  else
-    {
-      GtkNative *native = gtk_widget_get_native (widget);
-      GskRenderer *renderer = gtk_native_get_renderer (native);
-      float progress;
-
-      next = g_ptr_array_index (self->children, self->next);
-
-      progress = self->time / self->duration;
-
-      if (self->backwards)
-        {
-          GtkWidget *tmp = next;
-          next = current;
-          current = tmp;
-          progress = 1. - progress;
-        }
-
-      if (gsk_gl_shader_compile (self->shader, renderer, NULL))
-        {
-          gtk_snapshot_push_gl_shader (snapshot,
-                                       self->shader,
-                                       &GRAPHENE_RECT_INIT(0, 0, width, height),
-                                       gsk_gl_shader_format_args (self->shader,
-                                                                  "progress", progress,
-                                                                  NULL));
-
-          gtk_widget_snapshot_child (widget, current, snapshot);
-          gtk_snapshot_gl_shader_pop_texture (snapshot); /* current child */
-          gtk_widget_snapshot_child (widget, next, snapshot);
-          gtk_snapshot_gl_shader_pop_texture (snapshot); /* next child */
-          gtk_snapshot_pop (snapshot);
-        }
-      else
-        {
-          /* Non-shader fallback */
-          gtk_widget_snapshot_child (widget, current, snapshot);
-        }
-    }
-}
-
-static void
-gtk_shader_stack_get_property (GObject      *object,
-                               guint         prop_id,
-                               GValue       *value,
-                               GParamSpec   *pspec)
-{
-  GtkShaderStack *self = GTK_SHADER_STACK (object);
-
-  switch (prop_id)
-    {
-    case PROP_DURATION:
-      g_value_set_float (value, self->duration);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-gtk_shader_stack_set_property (GObject      *object,
-                               guint         prop_id,
-                               const GValue *value,
-                               GParamSpec   *pspec)
-{
-  GtkShaderStack *self = GTK_SHADER_STACK (object);
-
-  switch (prop_id)
-    {
-    case PROP_DURATION:
-      self->duration = g_value_get_float (value);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-gtk_shader_stack_class_init (GtkShaderStackClass *class)
-{
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
-  GObjectClass *object_class = G_OBJECT_CLASS (class);
-
-  object_class->finalize = gtk_shader_stack_finalize;
-  object_class->dispose = gtk_shader_stack_dispose;
-  object_class->get_property = gtk_shader_stack_get_property;
-  object_class->set_property = gtk_shader_stack_set_property;
-
-  widget_class->snapshot = gtk_shader_stack_snapshot;
-  widget_class->measure = gtk_shader_stack_measure;
-  widget_class->size_allocate = gtk_shader_stack_size_allocate;
-
-  properties[PROP_DURATION] =
-      g_param_spec_float ("duration", "Duration", "Duration",
-                          0.1, 3.0, 1.0,
-                          G_PARAM_READWRITE);
-
-  g_object_class_install_properties (object_class, NUM_PROPERTIES, properties);
-}
-
-GtkWidget *
-gtk_shader_stack_new (void)
-{
-  return g_object_new (GTK_TYPE_SHADER_STACK, NULL);
-}
-
-void
-gtk_shader_stack_set_shader (GtkShaderStack *self,
-                             GskGLShader    *shader)
-{
-  g_set_object (&self->shader, shader);
-}
-
-void
-gtk_shader_stack_add_child (GtkShaderStack *self,
-                            GtkWidget      *child)
-{
-  g_ptr_array_add (self->children, child);
-  gtk_widget_set_parent (child, GTK_WIDGET (self));
-  gtk_widget_queue_resize (GTK_WIDGET (self));
-
-  if (self->current == -1)
-    self->current = 0;
-  else
-    gtk_widget_set_child_visible (child, FALSE);
-}
-
-void
-gtk_shader_stack_set_active (GtkShaderStack *self,
-                             int             index)
-{
-  stop_transition (self);
-  self->current = MIN (index, self->children->len);
-  update_child_visible (self);
-}
-
-G_GNUC_END_IGNORE_DEPRECATIONS
@@ -1,24 +0,0 @@
-#pragma once
-
-#include <gtk/gtk.h>
-
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_SHADER_STACK     (gtk_shader_stack_get_type ())
-G_DECLARE_FINAL_TYPE (GtkShaderStack, gtk_shader_stack, GTK, SHADER_STACK, GtkWidget)
-
-GtkWidget * gtk_shader_stack_new          (void);
-void        gtk_shader_stack_set_shader   (GtkShaderStack *self,
-                                           GskGLShader    *shader);
-void        gtk_shader_stack_add_child    (GtkShaderStack *self,
-                                           GtkWidget      *child);
-void        gtk_shader_stack_transition   (GtkShaderStack *self,
-                                           gboolean        forward);
-void        gtk_shader_stack_set_active   (GtkShaderStack *self,
-                                           int             index);
-
-G_END_DECLS
-
-G_GNUC_END_IGNORE_DEPRECATIONS
@@ -1,5 +1,7 @@
 #pragma once

+#include <gdk/gdk.h>
+
 typedef struct _GdkHSLA GdkHSLA;

 struct _GdkHSLA {
@@ -13,7 +13,7 @@ static GtkWidget *window = NULL;
 static GtkWidget *scrolledwindow;
 static int selected;

-#define N_WIDGET_TYPES 8
+#define N_WIDGET_TYPES 9


 static int hincrement = 5;
@@ -73,30 +73,77 @@ populate_icons (void)
  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolledwindow), grid);
 }

-static char *content;
-static gsize content_len;
-
 extern void fontify (const char *format, GtkTextBuffer *buffer);

+enum {
+  PLAIN_TEXT,
+  HIGHLIGHTED_TEXT,
+  UNDERLINED_TEXT,
+};
+
 static void
-populate_text (gboolean highlight)
+underlinify (GtkTextBuffer *buffer)
+{
+  GtkTextTagTable *tags;
+  GtkTextTag *tag[3];
+  GtkTextIter start, end;
+
+  tags = gtk_text_buffer_get_tag_table (buffer);
+  tag[0] = gtk_text_tag_new ("error");
+  tag[1] = gtk_text_tag_new ("strikeout");
+  tag[2] = gtk_text_tag_new ("double");
+  g_object_set (tag[0], "underline", PANGO_UNDERLINE_ERROR, NULL);
+  g_object_set (tag[1], "strikethrough", TRUE, NULL);
+  g_object_set (tag[2],
+                "underline", PANGO_UNDERLINE_DOUBLE,
+                "underline-rgba", &(GdkRGBA){0., 1., 1., 1. },
+                NULL);
+  gtk_text_tag_table_add (tags, tag[0]);
+  gtk_text_tag_table_add (tags, tag[1]);
+  gtk_text_tag_table_add (tags, tag[2]);
+
+  gtk_text_buffer_get_start_iter (buffer, &end);
+
+  while (TRUE)
+    {
+      gtk_text_iter_forward_word_end (&end);
+      start = end;
+      gtk_text_iter_backward_word_start (&start);
+      gtk_text_buffer_apply_tag (buffer, tag[g_random_int_range (0, 3)], &start, &end);
+      if (!gtk_text_iter_forward_word_ends (&end, 3))
+        break;
+    }
+}
+
+static void
+populate_text (const char *resource, int kind)
 {
  GtkWidget *textview;
  GtkTextBuffer *buffer;
+  char *content;
+  gsize content_len;
+  GBytes *bytes;

-  if (!content)
-    {
-      GBytes *bytes;
-
-      bytes = g_resources_lookup_data ("/sources/font_features.c", 0, NULL);
-      content = g_bytes_unref_to_data (bytes, &content_len);
-    }
+  bytes = g_resources_lookup_data (resource, 0, NULL);
+  content = g_bytes_unref_to_data (bytes, &content_len);

  buffer = gtk_text_buffer_new (NULL);
  gtk_text_buffer_set_text (buffer, content, (int)content_len);

-  if (highlight)
-    fontify ("c", buffer);
+  switch (kind)
+    {
+    case HIGHLIGHTED_TEXT:
+      fontify ("c", buffer);
+      break;
+
+    case UNDERLINED_TEXT:
+      underlinify (buffer);
+      break;
+
+    case PLAIN_TEXT:
+    default:
+      break;
+    }

  textview = gtk_text_view_new ();
  gtk_text_view_set_buffer (GTK_TEXT_VIEW (textview), buffer);
@@ -155,14 +202,6 @@ populate_image (void)
 {
  GtkWidget *image;

-  if (!content)
-    {
-      GBytes *bytes;
-
-      bytes = g_resources_lookup_data ("/sources/font_features.c", 0, NULL);
-      content = g_bytes_unref_to_data (bytes, &content_len);
-    }
-
  image = gtk_picture_new_for_resource ("/sliding_puzzle/portland-rose.jpg");
  gtk_picture_set_can_shrink (GTK_PICTURE (image), FALSE);

@@ -255,35 +294,40 @@ set_widget_type (int type)

    case 1:
      gtk_window_set_title (GTK_WINDOW (window), "Scrolling plain text");
-      populate_text (FALSE);
+      populate_text ("/sources/font_features.c", PLAIN_TEXT);
      break;

    case 2:
-      gtk_window_set_title (GTK_WINDOW (window), "Scrolling complex text");
-      populate_text (TRUE);
+      gtk_window_set_title (GTK_WINDOW (window), "Scrolling colored text");
+      populate_text ("/sources/font_features.c", HIGHLIGHTED_TEXT);
      break;

    case 3:
+      gtk_window_set_title (GTK_WINDOW (window), "Scrolling text with underlines");
+      populate_text ("/org/gtk/Demo4/Moby-Dick.txt", UNDERLINED_TEXT);
+      break;
+
+    case 4:
      gtk_window_set_title (GTK_WINDOW (window), "Scrolling text with Emoji");
      populate_emoji_text ();
      break;

-    case 4:
+    case 5:
      gtk_window_set_title (GTK_WINDOW (window), "Scrolling a big image");
      populate_image ();
      break;

-    case 5:
+    case 6:
      gtk_window_set_title (GTK_WINDOW (window), "Scrolling a list");
      populate_list ();
      break;

-    case 6:
+    case 7:
      gtk_window_set_title (GTK_WINDOW (window), "Scrolling a columned list");
      populate_list2 ();
      break;

-    case 7:
+    case 8:
      gtk_window_set_title (GTK_WINDOW (window), "Scrolling a grid");
      populate_grid ();
      break;
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
  <object class="GtkWindow" id="window">
-    <property name="resizable">0</property>
+    <property name="resizable">1</property>
    <property name="default-width">500</property>
    <property name="default-height">500</property>
    <child type="titlebar">
@@ -14,6 +14,103 @@
 #include <gtk/gtk.h>
 #include "demo3widget.h"

+static GtkWidget *window = NULL;
+static GCancellable *cancellable = NULL;
+
+static void
+load_texture (GTask        *task,
+              gpointer      source_object,
+              gpointer      task_data,
+              GCancellable *cable)
+{
+  GFile *file = task_data;
+  GdkTexture *texture;
+  GError *error = NULL;
+
+  texture = gdk_texture_new_from_file (file, &error);
+
+  if (texture)
+    g_task_return_pointer (task, texture, g_object_unref);
+  else
+    g_task_return_error (task, error);
+}
+
+static void
+set_wait_cursor (GtkWidget *widget)
+{
+  gtk_widget_set_cursor_from_name (GTK_WIDGET (gtk_widget_get_root (widget)), "wait");
+}
+
+static void
+unset_wait_cursor (GtkWidget *widget)
+{
+  gtk_widget_set_cursor (GTK_WIDGET (gtk_widget_get_root (widget)), NULL);
+}
+
+static void
+texture_loaded (GObject      *source,
+                GAsyncResult *result,
+                gpointer      data)
+{
+  GdkTexture *texture;
+  GError *error = NULL;
+
+  texture = g_task_propagate_pointer (G_TASK (result), &error);
+
+  if (!texture)
+    {
+      g_print ("%s\n", error->message);
+      g_error_free (error);
+      return;
+    }
+
+  if (!window)
+    {
+      g_object_unref (texture);
+      return;
+    }
+
+  unset_wait_cursor (GTK_WIDGET (data));
+
+  g_object_set (G_OBJECT (data), "texture", texture, NULL);
+}
+
+static void
+open_file_async (GFile     *file,
+                 GtkWidget *demo)
+{
+  GTask *task;
+
+  set_wait_cursor (demo);
+
+  task = g_task_new (demo, cancellable, texture_loaded, demo);
+  g_task_set_task_data (task, g_object_ref (file), g_object_unref);
+  g_task_run_in_thread (task, load_texture);
+  g_object_unref (task);
+}
+
+static void
+open_portland_rose (GtkWidget *button,
+                    GtkWidget *demo)
+{
+  GFile *file;
+
+  file = g_file_new_for_uri ("resource:///transparent/portland-rose.jpg");
+  open_file_async (file, demo);
+  g_object_unref (file);
+}
+
+static void
+open_large_image (GtkWidget *button,
+                  GtkWidget *demo)
+{
+  GFile *file;
+
+  file = g_file_new_for_uri ("resource:///org/gtk/Demo4/large-image.png");
+  open_file_async (file, demo);
+  g_object_unref (file);
+}
+
 static void
 file_opened (GObject      *source,
             GAsyncResult *result,
@@ -21,7 +118,6 @@ file_opened (GObject      *source,
 {
  GFile *file;
  GError *error = NULL;
-  GdkTexture *texture;

  file = gtk_file_dialog_open_finish (GTK_FILE_DIALOG (source), result, &error);

@@ -32,17 +128,9 @@ file_opened (GObject      *source,
      return;
    }

-  texture = gdk_texture_new_from_file (file, &error);
-  g_object_unref (file);
-  if (!texture)
-    {
-      g_print ("%s\n", error->message);
-      g_error_free (error);
-      return;
-    }
+  open_file_async (file, data);

-  g_object_set (G_OBJECT (data), "texture", texture, NULL);
-  g_object_unref (texture);
+  g_object_unref (file);
 }

 static void
@@ -116,11 +204,26 @@ transform_from (GBinding     *binding,
  return TRUE;
 }

+static void
+free_cancellable (gpointer data)
+{
+  g_cancellable_cancel (cancellable);
+  g_clear_object (&cancellable);
+}
+
+static gboolean
+cancel_load (GtkWidget *widget,
+             GVariant  *args,
+             gpointer   data)
+{
+  unset_wait_cursor (widget);
+  g_cancellable_cancel (G_CANCELLABLE (data));
+  return TRUE;
+}
+
 GtkWidget *
 do_image_scaling (GtkWidget *do_widget)
 {
-  static GtkWidget *window = NULL;
-
  if (!window)
    {
      GtkWidget *box;
@@ -130,6 +233,7 @@ do_image_scaling (GtkWidget *do_widget)
      GtkWidget *scale;
      GtkWidget *dropdown;
      GtkWidget *button;
+      GtkEventController *controller;

      window = gtk_window_new ();
      gtk_window_set_title (GTK_WINDOW (window), "Image Scaling");
@@ -138,6 +242,20 @@ do_image_scaling (GtkWidget *do_widget)
                              gtk_widget_get_display (do_widget));
      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);

+      cancellable = g_cancellable_new ();
+      g_object_set_data_full (G_OBJECT (window), "cancellable",
+                              cancellable, free_cancellable);
+
+      controller = gtk_shortcut_controller_new ();
+      gtk_shortcut_controller_add_shortcut (GTK_SHORTCUT_CONTROLLER (controller),
+                                            gtk_shortcut_new (
+                                                gtk_keyval_trigger_new (GDK_KEY_Escape, 0),
+                                                gtk_callback_action_new (cancel_load, cancellable, NULL)
+                                                ));
+      gtk_shortcut_controller_set_scope (GTK_SHORTCUT_CONTROLLER (controller),
+                                         GTK_SHORTCUT_SCOPE_GLOBAL);
+      gtk_widget_add_controller (window, controller);
+
      box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
      gtk_window_set_child (GTK_WINDOW (window), box);

@@ -156,6 +274,22 @@ do_image_scaling (GtkWidget *do_widget)
      g_signal_connect (button, "clicked", G_CALLBACK (open_file), widget);
      gtk_box_append (GTK_BOX (box2), button);

+      button = gtk_button_new ();
+      gtk_button_set_child (GTK_BUTTON (button),
+                            gtk_image_new_from_resource ("/org/gtk/Demo4/portland-rose-thumbnail.png"));
+      gtk_widget_add_css_class (button, "image-button");
+      gtk_widget_set_tooltip_text (button, "Portland Rose");
+      g_signal_connect (button, "clicked", G_CALLBACK (open_portland_rose), widget);
+      gtk_box_append (GTK_BOX (box2), button);
+
+      button = gtk_button_new ();
+      gtk_button_set_child (GTK_BUTTON (button),
+                            gtk_image_new_from_resource ("/org/gtk/Demo4/large-image-thumbnail.png"));
+      gtk_widget_add_css_class (button, "image-button");
+      gtk_widget_set_tooltip_text (button, "Large image");
+      g_signal_connect (button, "clicked", G_CALLBACK (open_large_image), widget);
+      gtk_box_append (GTK_BOX (box2), button);
+
      button = gtk_button_new_from_icon_name ("object-rotate-right-symbolic");
      gtk_widget_set_tooltip_text (button, "Rotate");
      g_signal_connect (button, "clicked", G_CALLBACK (rotate), widget);
@@ -191,7 +325,9 @@ do_image_scaling (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (window))
    gtk_widget_set_visible (window, TRUE);
  else
-    gtk_window_destroy (GTK_WINDOW (window));
+    {
+      gtk_window_destroy (GTK_WINDOW (window));
+    }

  return window;
 }
@@ -1,41 +0,0 @@
-uniform float progress;
-uniform sampler2D u_texture1;
-uniform sampler2D u_texture2;
-
-vec4 getFromColor (vec2 uv) {
-  return GskTexture(u_texture1, uv);
-}
-
-vec4 getToColor (vec2 uv) {
-  return GskTexture(u_texture2, uv);
-}
-
-// Source: https://gl-transitions.com/editor/kaleidoscope
-// Author: nwoeanhinnogaehr
-// License: MIT
-
-const float speed = 1.0;
-const float angle = 1.0;
-const float power = 1.5;
-
-vec4 transition(vec2 uv) {
-  vec2 p = uv.xy / vec2(1.0).xy;
-  vec2 q = p;
-  float t = pow(progress, power)*speed;
-  p = p -0.5;
-  for (int i = 0; i < 7; i++) {
-    p = vec2(sin(t)*p.x + cos(t)*p.y, sin(t)*p.y - cos(t)*p.x);
-    t += angle;
-    p = abs(mod(p, 2.0) - 1.0);
-  }
-  abs(mod(p, 1.0));
-  return mix(
-    mix(getFromColor(q), getToColor(q), progress),
-    mix(getFromColor(p), getToColor(p), progress), 1.0 - 2.0*abs(progress - 0.5));
-}
-
-
-void mainImage(out vec4 fragColor, in vec2 fragCoord, in vec2 resolution, in vec2 uv)
-{
-  fragColor = transition(uv);
-}
@@ -355,28 +355,28 @@ create_clocks_model (void)
  g_list_store_append (result, clock);
  g_object_unref (clock);
  /* A bunch of timezones with GTK hackers */
-  clock = gtk_clock_new ("San Francisco", g_time_zone_new ("America/Los_Angeles"));
+  clock = gtk_clock_new ("San Francisco", g_time_zone_new_identifier ("America/Los_Angeles"));
  g_list_store_append (result, clock);
  g_object_unref (clock);
-  clock = gtk_clock_new ("Xalapa", g_time_zone_new ("America/Mexico_City"));
+  clock = gtk_clock_new ("Xalapa", g_time_zone_new_identifier ("America/Mexico_City"));
  g_list_store_append (result, clock);
  g_object_unref (clock);
-  clock = gtk_clock_new ("Boston", g_time_zone_new ("America/New_York"));
+  clock = gtk_clock_new ("Boston", g_time_zone_new_identifier ("America/New_York"));
  g_list_store_append (result, clock);
  g_object_unref (clock);
-  clock = gtk_clock_new ("London", g_time_zone_new ("Europe/London"));
+  clock = gtk_clock_new ("London", g_time_zone_new_identifier ("Europe/London"));
  g_list_store_append (result, clock);
  g_object_unref (clock);
-  clock = gtk_clock_new ("Berlin", g_time_zone_new ("Europe/Berlin"));
+  clock = gtk_clock_new ("Berlin", g_time_zone_new_identifier ("Europe/Berlin"));
  g_list_store_append (result, clock);
  g_object_unref (clock);
-  clock = gtk_clock_new ("Moscow", g_time_zone_new ("Europe/Moscow"));
+  clock = gtk_clock_new ("Moscow", g_time_zone_new_identifier ("Europe/Moscow"));
  g_list_store_append (result, clock);
  g_object_unref (clock);
-  clock = gtk_clock_new ("New Delhi", g_time_zone_new ("Asia/Kolkata"));
+  clock = gtk_clock_new ("New Delhi", g_time_zone_new_identifier ("Asia/Kolkata"));
  g_list_store_append (result, clock);
  g_object_unref (clock);
-  clock = gtk_clock_new ("Shanghai", g_time_zone_new ("Asia/Shanghai"));
+  clock = gtk_clock_new ("Shanghai", g_time_zone_new_identifier ("Asia/Shanghai"));
  g_list_store_append (result, clock);
  g_object_unref (clock);

@@ -156,11 +156,6 @@ gtk_demo_run (GtkDemo   *self,
  if (result == NULL)
    return FALSE;

-  if (GTK_IS_WINDOW (result))
-    {
-      gtk_window_set_transient_for (GTK_WINDOW (result), GTK_WINDOW (window));
-      gtk_window_set_modal (GTK_WINDOW (result), TRUE);
-    }
  return TRUE;
 }

@@ -832,9 +827,6 @@ static gboolean
 demo_can_run (GtkWidget  *window,
              const char *name)
 {
-  if (name != NULL && strcmp (name, "gltransition") == 0)
-    return GSK_IS_GL_RENDERER (gtk_native_get_renderer (GTK_NATIVE (window)));
-
  return TRUE;
 }

@@ -1068,6 +1060,8 @@ command_line (GApplication            *app,

  window = gtk_application_get_windows (GTK_APPLICATION (app))->data;

+  gtk_window_set_icon_name (GTK_WINDOW (window), "org.gtk.Demo4");
+
  if (name == NULL)
    goto out;

@@ -33,7 +33,6 @@ demos = files([
  'gears.c',
  'gestures.c',
  'glarea.c',
-  'gltransition.c',
  'headerbar.c',
  'hypertext.c',
  'iconscroll.c',
@@ -117,10 +116,7 @@ extra_demo_sources = files([
  'gtkfishbowl.c',
  'fontplane.c',
  'gtkgears.c',
-  'gtkshaderbin.c',
  'gtkshadertoy.c',
-  'gtkshaderstack.c',
-  'gskshaderpaintable.c',
  'hsla.c',
  'puzzlepiece.c',
  'bluroverlay.c',
@@ -5,4 +5,4 @@
 #define NODE_TYPE_WIDGET (node_widget_get_type ())
 G_DECLARE_FINAL_TYPE (NodeWidget, node_widget, NODE, WIDGET, GtkWidget)

-GtkWidget * node_widget_new       (const char *file);
+GtkWidget * node_widget_new       (const char *resource);
@@ -225,7 +225,8 @@ print_ready (GObject      *source,

  if (!g_output_stream_close (stream, NULL, &error))
    {
-      g_print ("Error from close: %s\n", error->message);
+      if (!g_error_matches (error, GTK_DIALOG_ERROR, GTK_DIALOG_ERROR_DISMISSED))
+        g_print ("Error from close: %s\n", error->message);
      g_error_free (error);
    }

@@ -1,34 +0,0 @@
-uniform float progress;
-uniform sampler2D u_texture1;
-uniform sampler2D u_texture2;
-
-vec4 getFromColor (vec2 uv) {
-  return GskTexture(u_texture1, uv);
-}
-
-vec4 getToColor (vec2 uv) {
-  return GskTexture(u_texture2, uv);
-}
-
-// Source: https://gl-transitions.com/editor/Radial
-// License: MIT
-// Author: Xaychru
-
-const float smoothness = 1.0;
-
-const float PI = 3.141592653589;
-
-vec4 transition(vec2 p) {
-  vec2 rp = p*2.-1.;
-  return mix(
-    getToColor(p),
-    getFromColor(p),
-    smoothstep(0., smoothness, atan(rp.y,rp.x) - (progress-.5) * PI * 2.5)
-  );
-}
-
-
-void mainImage(out vec4 fragColor, in vec2 fragCoord, in vec2 resolution, in vec2 uv)
-{
-  fragColor = transition(uv);
-}
@@ -1,43 +0,0 @@
-uniform float u_time;
-uniform vec2 u_mouse;
-uniform sampler2D u_texture1;
-
-#define PI      3.141592654
-
-float decay(float v, float t)
-{
-  return v * (1.0 / (1.0 + t*t));
-}
-
-void mainImage(out vec4 fragColor, in vec2 fragCoord, in vec2 resolution, in vec2 uv)
-{
-  // Temporary to loop time every 1 sec
-  float time = u_time;
-  // we normalize all the effects according to the min height/width
-  float size = min(resolution.x, resolution.y);
-
-  // Animate one wave over size in 0.3 sec
-  float wave_speed = size / 0.3;
-  float wave_length = size / 1.0;
-  float wave_height = size  * 0.1;
-
-  vec2 center = u_mouse;
-  vec2 direction_from_center = fragCoord - center;
-  float distance_from_center = length(direction_from_center);
-
-  /* Normalize direction */
-  direction_from_center = direction_from_center / distance_from_center;
-
-  float propagation_length = time * wave_speed;
-
-  float t = (propagation_length - distance_from_center) / wave_length;
-  float offset_magnitude = 0.0;
-  if (t > 0.0)
-    offset_magnitude = decay(wave_height * sin(t * 2.0 * PI), t);
-
-  vec2 offset = direction_from_center * min(offset_magnitude, distance_from_center);
-  vec2 source = fragCoord - offset;
-
-  vec2 uv2 = source / resolution;
-  fragColor = GskTexture(u_texture1, vec2(uv2.x, 1.0-uv2.y));
-}
@@ -43,7 +43,7 @@ GtkListItemFactory *
                suggestion_entry_get_factory        (SuggestionEntry     *self);

 void            suggestion_entry_set_use_filter     (SuggestionEntry     *self,
-                                                     gboolean             use_ilter);
+                                                     gboolean             use_filter);
 gboolean        suggestion_entry_get_use_filter     (SuggestionEntry     *self);

 void            suggestion_entry_set_expression     (SuggestionEntry     *self,
@@ -1,33 +0,0 @@
-uniform float progress;
-uniform sampler2D u_texture1;
-uniform sampler2D u_texture2;
-
-vec4 getFromColor (vec2 uv) {
-  return GskTexture(u_texture1, uv);
-}
-
-vec4 getToColor (vec2 uv) {
-  return GskTexture(u_texture2, uv);
-}
-
-// Source: https://gl-transitions.com/editor/wind
-// Author: gre
-// License: MIT
-
-const float size = 0.2;
-
-float rand(vec2 co) {
-  return fract(sin(dot(co.xy ,vec2(12.9898,78.233))) * 43758.5453);
-}
-
-vec4 transition(vec2 p) {
-  float r = rand(vec2(0, p.y));
-  float m = smoothstep(0.0, -size, p.x*(1.0-size) + size*r - (progress * (1.0 + size)));
-  return mix(getFromColor(p), getToColor(p), m);
-}
-
-
-void mainImage(out vec4 fragColor, in vec2 fragCoord, in vec2 resolution, in vec2 uv)
-{
-  fragColor = transition(uv);
-}
@@ -139,6 +139,8 @@ icon_browser_app_activate (GApplication *app)
  if (g_strcmp0 (PROFILE, "devel") == 0)
    gtk_widget_add_css_class (GTK_WIDGET (win), "devel");

+  gtk_window_set_icon_name (GTK_WINDOW (win), "org.gtk.IconBrowser4");
+
  gtk_window_present (GTK_WINDOW (win));
 }

@@ -219,6 +219,8 @@ node_editor_application_activate (GApplication *app)
  if (g_strcmp0 (PROFILE, "devel") == 0)
    gtk_widget_add_css_class (GTK_WIDGET (win), "devel");

+  gtk_window_set_icon_name (GTK_WINDOW (win), "org.gtk.gtk4.NodeEditor");
+
  gtk_window_present (GTK_WINDOW (win));
 }

@@ -925,7 +925,7 @@ export_image_response_cb (GObject      *source,
      GdkTexture *texture;
      GskRenderer *renderer;

-      renderer = gsk_gl_renderer_new ();
+      renderer = gsk_ngl_renderer_new ();
      if (!gsk_renderer_realize_for_display (renderer, gdk_display_get_default (), NULL))
        {
          g_object_unref (renderer);
@@ -1205,6 +1205,19 @@ node_editor_window_add_renderer (NodeEditorWindow *self,
  g_object_unref (paintable);
 }

+static void
+update_paste_action (GdkClipboard *clipboard,
+                     GParamSpec   *pspec,
+                     gpointer      data)
+{
+  GtkWidget *widget = GTK_WIDGET (data);
+  gboolean has_node;
+
+  has_node = gdk_content_formats_contain_mime_type (gdk_clipboard_get_formats (clipboard), "application/x-gtk-render-node");
+
+  gtk_widget_action_set_enabled (widget, "paste-node", has_node);
+}
+
 static void
 node_editor_window_realize (GtkWidget *widget)
 {
@@ -1242,6 +1255,7 @@ node_editor_window_realize (GtkWidget *widget)
  self->after_paint_handler = g_signal_connect (frameclock, "after-paint",
                                                G_CALLBACK (after_paint), self);

+  g_signal_connect (gtk_widget_get_clipboard (widget), "notify::formats", G_CALLBACK (update_paste_action), widget);
 }

 static void
@@ -1251,6 +1265,8 @@ node_editor_window_unrealize (GtkWidget *widget)
  GdkFrameClock *frameclock;
  guint i;

+  g_signal_handlers_disconnect_by_func (gtk_widget_get_clipboard (widget), update_paste_action, widget);
+
  frameclock = gtk_widget_get_frame_clock (widget);
  g_signal_handler_disconnect (frameclock, self->after_paint_handler);
  self->after_paint_handler = 0;
@@ -1615,6 +1631,41 @@ edit_action_cb (GtkWidget  *widget,
  node_editor_window_edit (self, &start);
 }

+static void
+text_received (GObject      *source,
+               GAsyncResult *result,
+               gpointer      data)
+{
+  GdkClipboard *clipboard = GDK_CLIPBOARD (source);
+  NodeEditorWindow *self = NODE_EDITOR_WINDOW (data);
+  char *text;
+
+  text = gdk_clipboard_read_text_finish (clipboard, result, NULL);
+  if (text)
+    {
+      GtkTextBuffer *buffer;
+      GtkTextIter start, end;
+
+      buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (self->text_view));
+      gtk_text_buffer_begin_user_action (buffer);
+      gtk_text_buffer_get_bounds (buffer, &start, &end);
+      gtk_text_buffer_delete (buffer, &start, &end);
+      gtk_text_buffer_insert (buffer, &start, text, -1);
+      gtk_text_buffer_end_user_action (buffer);
+      g_free (text);
+    }
+}
+
+static void
+paste_node_cb (GtkWidget  *widget,
+               const char *action_name,
+               GVariant   *parameter)
+{
+  GdkClipboard *clipboard = gtk_widget_get_clipboard (widget);
+
+  gdk_clipboard_read_text_async (clipboard, NULL, text_received, widget);
+}
+
 static void
 node_editor_window_set_property (GObject      *object,
                                 guint         prop_id,
@@ -1727,6 +1778,13 @@ node_editor_window_class_init (NodeEditorWindowClass *class)
  action = gtk_named_action_new ("smart-edit");
  shortcut = gtk_shortcut_new (trigger, action);
  gtk_widget_class_add_shortcut (widget_class, shortcut);
+
+  gtk_widget_class_install_action (widget_class, "paste-node", NULL, paste_node_cb);
+
+  trigger = gtk_keyval_trigger_new (GDK_KEY_v, GDK_CONTROL_MASK | GDK_SHIFT_MASK);
+  action = gtk_named_action_new ("paste-node");
+  shortcut = gtk_shortcut_new (trigger, action);
+  gtk_widget_class_add_shortcut (widget_class, shortcut);
 }

 static GtkWidget *
@@ -22,6 +22,10 @@
  </menu>
  <menu id="extra_menu">
    <section>
+      <item>
+        <attribute name="label" translatable="yes">Paste _Node</attribute>
+        <attribute name="action">paste-node</attribute>
+      </item>
      <item>
        <attribute name="label" translatable="yes">Assisted _Edit</attribute>
        <attribute name="action">smart-edit</attribute>
@@ -798,7 +798,7 @@ activate (GApplication *app)
  if (g_strcmp0 (PROFILE, "devel") == 0)
    gtk_widget_add_css_class (GTK_WIDGET (main_window), "devel");

-  gtk_window_set_icon_name (GTK_WINDOW (main_window), "text-editor");
+  gtk_window_set_icon_name (GTK_WINDOW (main_window), "org.gtk.PrintEditor4");
  gtk_window_set_default_size (GTK_WINDOW (main_window), 400, 600);
  gtk_application_window_set_show_menubar (GTK_APPLICATION_WINDOW (main_window), TRUE);
  update_title (GTK_WINDOW (main_window));
@@ -2241,6 +2241,7 @@ activate (GApplication *app)
  if (g_strcmp0 (PROFILE, "devel") == 0)
    gtk_widget_add_css_class (GTK_WIDGET (window), "devel");

+  gtk_window_set_icon_name (window, "org.gtk.WidgetFactory4");
  gtk_application_add_window (GTK_APPLICATION (app), window);
  g_action_map_add_action_entries (G_ACTION_MAP (window),
                                   win_entries, G_N_ELEMENTS (win_entries),
@@ -151,10 +151,11 @@ Checks whether the widget is set to be visible or not.
 - Methods are special functions whose first argument is always the instance
   of a certain class. The instance argument for newly written code should be
   called `self`.
- - If a method is a setter or a getter for an object property, you should
-   add an `(attributes org.gtk.Method.set_property=property-name)` or a
-   an `(attributes org.gtk.Method.get_property=property-name)` annotation
-   to the method's identifier
+ - If a method is a setter or a getter for an object property
+   `GtkClassName:prop-name`, and if its name does not match the naming scheme
+   `gtk_class_name_{g,s}et_prop_name`, you should add a `(set-property
+   prop-name)` or a `(get-property prop-name)` annotation to the method's
+   identifier
 - If a method changes one or more properties as side effect, link those
   properties in the method's description
 - If a method is a signal emitter, you should use the
@@ -192,9 +193,10 @@ Checks whether the widget is set to be visible or not.
   purposes.
 - Always note if setting a property has side effects, like causing another
   property to change state.
- - If the property has public accessors you should annotate it with
-   the `(attributes org.gtk.Property.set=setter_function)` and
-   `(attributes org.gtk.Property.get=getter_function)` attributes
+ - If a property `GtkClassName:prop-name` has a public getter or setter, and
+   they do not match the naming scheme `gtk_class_name_{g,s}et_prop_name` you
+   should annotate it with the `(setter setter_function)` and `(getter
+   getter_function)`.
 - The syntax for property documentation is:

 ```c
@@ -38,7 +38,7 @@ if get_option('documentation')
      gdk_gir[0],
    ],
    depends: gdk_gir[0],
-    suite: ['docs'],
+    suite: ['docs', 'failing'],
  )

  if x11_enabled
@@ -1,12 +1,16 @@
 Title: The Broadway windowing system
 Slug: broadway

-## Using GTK with Broadway
-
 The GDK Broadway backend provides support for displaying GTK applications in
 a web browser, using HTML5 and web sockets.

-To run your application in this way, first run the broadway server,
+Broadway was written as an experiment and is not the most actively developed
+backend. It supports the features that were required of GDK backends in GTK 4.0,
+but may not be up-to-date with the latest developments.
+
+## Using GTK with Broadway
+
+To run your application under Broadway, first run the broadway server,
 `gtk-broadwayd`, that ships with GTK:

 ```
@@ -265,13 +265,6 @@ support in the file chooser.
 This option controls whether GTK should use colord for color
 calibration support in the cups print backend.

-## `avif`
-
-This option controls whether GTK will use libavif for loading
-textures from AVIF image files. Note that the purpose of this option
-is to facilitate development of GTK. The support for this image format
-is not guaranteed and may go away at any time.
-
 ### `documentation`, `man-pages` and `screenshots`

 The *gi-docgen* package is used to generate the reference documentation
@@ -66,8 +66,8 @@ The clock has several phases:
 - Layout
 - Paint

- The phases happens in this order and we will always run each
- phase through before going back to the start.
+The phases happen in this order and all phases will always run
+through before going back to the start.

 The Events phase is a stretch of time between each redraw where
 GTK processes input events from the user and other events
@@ -66,10 +66,6 @@ You can compile the program above with GCC using:
 gcc $( pkg-config --cflags gtk4 ) -o example-0 example-0.c $( pkg-config --libs gtk4 )
 ```

-**Note**: If the above compilation does not work due to an error regarding `G_APPLICATION_DEFAULT_FLAGS`
-this could be due to your OS providing an older version of GLib. For GLib versions older than 2.74 you
-will need to replace `G_APPLICATION_DEFAULT_FLAGS` with `G_APPLICATION_FLAGS_NONE` in this example, and
-others in this documentation.
 For more information on how to compile a GTK application, please
 refer to the [Compiling GTK Applications](compiling.html)
 section in this reference.
@@ -260,4 +260,4 @@ name = "StyleProvider"
  hidden = true

 [check]
-skip_deprecated = true
+ignore_deprecated = true
@@ -74,7 +74,7 @@ if get_option('documentation')
      gtk_gir[0],
    ],
    depends: gtk_gir[0],
-    suite: ['docs'],
+    suite: ['docs', 'failing'],
  )
 endif

@@ -24,36 +24,36 @@ the motivation and goals of larger API changes.
 ## Cell renderers are going away

 Cell renderers were introduced in GTK 2 to support rendering of
-"big data" UIs, in particular treeviews. Over the years, more
-"data-like" widgets have started to use them, and cell renderers
+“big data” UIs, in particular treeviews. Over the years, more
+“data-like” widgets have started to use them, and cell renderers
 have grown into a shadowy, alternative rendering infrastructure
 that duplicates much of what widgets do, while duplicating the
 code and adding their own dose of bugs.

-In GTK 4, replacement widgets for GtkTreeView, GtkIconView and
-GtkComboBox have appeared: GtkListView, GtkColumnView, GtkGridView
-and GtkDropDown. For GTK 5, we will take the next step and remove
+In GTK 4, replacement widgets for `GtkTreeView`, `GtkIconView` and
+`GtkComboBox` have appeared: [class@Gtk.ListView], [class@Gtk.ColumnView], [class@Gtk.GridView]
+and [class@Gtk.DropDown]. For GTK 5, we will take the next step and remove
 all cell renderer-based widgets.

 ## Themed rendering APIs are going away

 The old GTK 2 era rendering APIs for theme components like
-gtk_render_frame() or gtk_render_check() have not been used by
+`gtk_render_frame()` or `gtk_render_check()` have not been used by
 GTK itself even in later GTK 3, but they have been kept around
-for the benefit of "external drawing" users - applications that
+for the benefit of “external drawing” users — applications that
 want their controls to look like GTK without using widgets.

 Supporting this is increasingly getting in the way of making
 the GTK CSS machinery fast and correct. One notable problem is
-that temporary style changes (using gtk_style_context_save())
+that temporary style changes (using `gtk_style_context_save()`)
 is breaking animations. Therefore, these APIs will be going away
-in GTK 5, together with their more modern GtkSnapshot variants
-like gtk_snapshot_render_background() or gtk_snapshot_render_focus().
+in GTK 5, together with their more modern [class@Gtk.Snapshot] variants
+like `gtk_snapshot_render_background()` or `gtk_snapshot_render_focus()`.

 The best way to render parts of your widget using CSS styling
 is to use subwidgets. For example, to show a piece of text with
 fonts, effects and shadows according to the current CSS style,
-use a GtkLabel.
+use a [class@Gtk.Label].

 If you have a need for custom drawing that fits into the current
 (dark or light) theme, e.g. for rendering a graph, you can still
@@ -62,28 +62,28 @@ get the current style foreground color, using

 ## Local stylesheets are going away

-The cascading part of GTK's CSS implementation is complicated by
+The cascading part of GTK’s CSS implementation is complicated by
 the existence of local stylesheets (i.e. those added with
-gtk_style_context_add_provider()). And local stylesheets are
+`gtk_style_context_add_provider()`). And local stylesheets are
 unintuitive in that they do not apply to the whole subtree of
 widgets, but just to the one widget where the stylesheet was
 added.

-GTK 5 will no longer provide this functionality. The recommendations
-is to use a global stylesheet (i.e. gtk_style_context_add_provider_for_display())
+GTK 5 will no longer provide this functionality. The recommendation
+is to use a global stylesheet (i.e. [func@Gtk.StyleContext.add_provider_for_display])
 and rely on style classes to make your CSS apply only where desired.

 ## Non-standard CSS extensions are going away

-GTK's CSS machinery has a some non-standard extensions around colors:
-named colors with \@define-color and color functions: lighter(), darker(),
-shade(), alpha(), mix().
+GTK’s CSS machinery has a some non-standard extensions around colors:
+named colors with `@define-color` and color functions: `lighter()`, `darker()`,
+`shade()`, `alpha()`, `mix()`.

 GTK now implements equivalent functionality from the CSS specs.

-### \@define-color is going away
+### `@define-color` is going away

-\@define-color should be replaced by custom properties in the :root scope.
+`@define-color` should be replaced by custom properties in the `:root` scope.

 Instead of

@@ -117,9 +117,9 @@ spec.

 ### Color expressions are going away

-The color functions can all be replaced by combinations of calc() and color-mix().
+The color functions can all be replaced by combinations of `calc()` and `color-mix()`.

-ligher(c) and darker(c) are just shade(c, 1.3) or shade(c, 0.7), respectively, and
+`lighter(c)` and `darker(c)` are just `shade(c, 1.3)` or `shade(c, 0.7)`, respectively, and
 thus can be handled the same way as shade in the examples below.

 Replace
@@ -164,7 +164,7 @@ d {

 Variations of these replacements are possible.

-Note that GTK has historically computed mix() and shade() values in the SRGB and HSL
+Note that GTK has historically computed `mix()` and `shade()` values in the SRGB and HSL
 colorspaces, but using OKLAB instead might yield slightly better results.

 For more information about color-mix(), see the
@@ -172,32 +172,32 @@ For more information about color-mix(), see the

 ## Chooser interfaces are going away

-The GtkColorChooser, GtkFontChooser, GtkFileChooser and GtkAppChooser
+The `GtkColorChooser`, `GtkFontChooser`, `GtkFileChooser` and `GtkAppChooser`
 interfaces and their implementations as dialogs, buttons and widgets
 are phased out. The are being replaced by a new family of async APIs
 that will be more convenient to use from language bindings, in particular
 for languages that have concepts like promises. The new APIs are
 [class@Gtk.ColorDialog], [class@Gtk.FontDialog] and [class@Gtk.FileDialog],
-There are also equivalents for some of the 'button' widgets:
+There are also equivalents for some of the “button” widgets:
 [class@Gtk.ColorDialogButton], [class@Gtk.FontDialogButton].

 ## GtkMessageDialog is going away

-Like the Chooser interfaces, GtkMessageDialog has been replaced by
+Like the Chooser interfaces, `GtkMessageDialog` has been replaced by
 a new async API that will be more convenient, in particular for
 language binding. The new API is [class@Gtk.AlertDialog].

 ## GtkDialog is going away

-After gtk_dialog_run() was removed, the usefulness of GtkDialog
-is much reduced, and it has awkward, archaice APIs. Therefore,
+After `gtk_dialog_run()` was removed, the usefulness of `GtkDialog`
+is much reduced, and it has awkward, archaic APIs. Therefore,
 it is dropped. The recommended replacement is to just create
 your own window and add buttons as required, either in the header
 or elsewhere.

 ## GtkInfoBar is going away

-GtkInfoBar had a dialog API, and with dialogs going away, it was time to
+`GtkInfoBar` had a dialog API, and with dialogs going away, it was time to
 retire it. If you need such a widget, it is relatively trivial to create one
 using a [class@Gtk.Revealer] with labels and buttons.

@@ -205,11 +205,11 @@ Other libraries, such as libadwaita, may provide replacements as well.

 ## gtk_show_uri is being replaced

-Instead of gtk_show_uri(), you should use GtkUriLauncher or GtkFileLauncher.
+Instead of `gtk_show_uri()`, you should use [class@Gtk.UriLauncher]or [class@Gtk.FileLauncher].

 ## GtkStatusbar is going away

-This is an oldfashioned widget that does not do all that much anymore, since
+This is an old fashioned widget that does not do all that much any more, since
 it no longer has a resize handle for the window.

 ## GtkLockButton and GtkVolumeButton are going away
@@ -217,22 +217,22 @@ it no longer has a resize handle for the window.
 These are very specialized widgets that should better live with the application
 where they are used.

-## Widget size api changes
+## Widget size API changes

-The functions gtk_widget_get_allocated_width() and gtk_widget_get_allocated_height()
+The functions `gtk_widget_get_allocated_width()` and `gtk_widget_get_allocated_height()`
 are going away. In most cases, [method@Gtk.Widget.get_width] and [method@Gtk.Widget.get_height]
 are suitable replacements. Note that the semantics are slightly different though:
 the old functions return the size of the CSS border area, while the new functions return
 the size of the widgets content area. In places where this difference matters, you can
 use `gtk_widget_compute_bounds (widget, widget, &bounds)` instead.

-The function gtk_widget_get_allocation() is also going away. It does not have a direct
+The function `gtk_widget_get_allocation()` is also going away. It does not have a direct
 replacement, but the previously mentioned alternatives can be used for it too.

-The function gtk_widget_get_allocated_baseline() has been renamed to [method@Gtk.Widget.get_baseline].
+The function `gtk_widget_get_allocated_baseline()` has been renamed to [method@Gtk.Widget.get_baseline].

 ## Stop using GdkPixbuf

-GTK is moving away from GdkPixbuf as the primary API for transporting image data, in favor
-of GdkTexture. APIs that are accepting or returning GdkPixbufs are being replaced by equivalent
-APIs using GdkTexture or GdkPaintable objects.
+GTK is moving away from `GdkPixbuf` as the primary API for transporting image data, in favor
+of [class@Gdk.Texture]. APIs that are accepting or returning `GdkPixbuf`s are being replaced by equivalent
+APIs using `GdkTexture` or [iface@Gdk.Paintable] objects.
@@ -181,15 +181,21 @@ matrix3d() production to specify all 16 values individually.

 ### conic-gradient

-| property | syntax           | default                | printed     |
-| -------- | ---------------- | ---------------------- | ----------- |
-| bounds   | `<rect>`         | 50                     | always      |
-| center   | `<point>`        | 25, 25                 | always      |
-| rotation | `<number>`       | 0                      | always      |
-| stops    | `<color-stop>`   | 0 #AF0, 1 #F0C         | always      |
+| property          | syntax          | default        | printed     |
+| ----------------- | --------------- | -------------- | ----------- |
+| bounds            | `<rect>`        | 50             | always      |
+| center            | `<point>`       | 25, 25         | always      |
+| rotation          | `<number>`      | 0              | always      |
+| stops             | `<color-stop>`  | 0 #AF0, 1 #F0C | always      |
+| interpolation     | `<color-state>` | srgb           | non-default |
+| hue-interpolation | `<hue-interp>`  | shorter        | non-default |

 Creates a node like `gsk_conic_gradient_node_new()` with the given properties.

+Possible values for the hue-interpolation property are:
+
+    hue-interpolation: shorter | longer | increasing | decreasing
+
 ### cross-fade

 | property | syntax           | default                | printed     |
@@ -258,12 +264,14 @@ Creates a node like `gsk_inset_shadow_node_new()` with the given properties.

 ### linear-gradient

-| property | syntax           | default                | printed     |
-| -------- | ---------------- | ---------------------- | ----------- |
-| bounds   | `<rect>`         | 50                     | always      |
-| start    | `<point>`        | 0 0                    | always      |
-| end      | `<point>`        | 0 50                   | always      |
-| stops    | `<color-stop>`   | 0 #AF0, 1 #F0C         | always      |
+| property          | syntax          | default        | printed     |
+| ----------------- | --------------- | -------------- | ----------- |
+| bounds            | `<rect>`        | 50             | always      |
+| start             | `<point>`       | 0 0            | always      |
+| end               | `<point>`       | 0 50           | always      |
+| stops             | `<color-stop>`  | 0 #AF0, 1 #F0C | always      |
+| interpolation     | `<color-state>` | srgb           | non-default |
+| hue-interpolation | `<hue-interp>`  | shorter        | non-default |

 Creates a node like `gsk_linear_gradient_node_new()` with the given properties.

@@ -305,15 +313,17 @@ Creates a node like `gsk_outset_shadow_node_new()` with the given properties.

 ### radial-gradient

-| property | syntax           | default                | printed     |
-| -------- | ---------------- | ---------------------- | ----------- |
-| bounds   | `<rect>`         | 50                     | always      |
-| center   | `<point>`        | 25 25                  | always      |
-| hradius  | `<number>`       | 25                     | always      |
-| vradius  | `<number>`       | 25                     | always      |
-| start    | `<number>`       | 0                      | always      |
-| end      | `<number>`       | 1                      | always      |
-| stops    | `<color-stop>`   | 0 #AF0, 1 #F0C         | always      |
+| property          | syntax          | default        | printed     |
+| ----------------- | --------------- | -------------- | ----------- |
+| bounds            | `<rect>`        | 50             | always      |
+| center            | `<point>`       | 25 25          | always      |
+| hradius           | `<number>`      | 25             | always      |
+| vradius           | `<number>`      | 25             | always      |
+| start             | `<number>`      | 0              | always      |
+| end               | `<number>`      | 1              | always      |
+| stops             | `<color-stop>`  | 0 #AF0, 1 #F0C | always      |
+| interpolation     | `<color-state>` | srgb           | non-default |
+| hue-interpolation | `<hue-interp>`  | shorter        | non-default |

 Creates a node like `gsk_radial_gradient_node_new()` with the given properties.

@@ -19,8 +19,7 @@ be used for end-user configuration and customization.
 ### `GTK_DEBUG`

 This variable can be set to a list of debug options, which cause GTK to
-print out different types of debugging information. Some of these options
-are only available when GTK has been configured with `-Ddebug=true`.
+print out different types of debugging information.

 `actions`
 : Actions and menu models
@@ -65,7 +64,7 @@ are only available when GTK has been configured with `-Ddebug=true`.
 : Layout managers

 `accessibility`
-: Accessibility state changs
+: Accessibility state changes

 A number of keys are influencing behavior instead of just logging:

@@ -169,8 +168,7 @@ The `loaders.cache` file is generated by the
 ### `GDK_DEBUG`

 This variable can be set to a list of debug options, which cause GDK to
-print out different types of debugging information. Some of these options
-are only available when GTK has been configured with `-Ddebug=true`.
+print out different types of debugging information.

 `misc`
 : Miscellaneous information
@@ -223,36 +221,15 @@ A number of options affect behavior instead of logging:
 : Force graphics offload for all textures, even when slower. This allows
  to debug offloading in the absence of dmabufs.

-`gl-disable`
-: Disable OpenGL support
-
 `gl-no-fractional`
 : Disable fractional scaling for OpenGL.

 `gl-debug`
 : Insert debugging information in OpenGL

-`gl-disable-gl`
-: Don't allow the use of OpenGL GL API. This forces GLES to be used
-
-`gl-disable-gles`
-: Don't allow the use of OpenGL GLES API. This forces GL to be used
-
 `gl-prefer-gl`
 : Prefer OpenGL over OpenGL ES. This was the default behavior before GTK 4.14.

-`gl-egl`
-: Use an EGL context on X11 or Windows
-
-`gl-glx`
-: Use GLX on X11
-
-`gl-wgl`
-: Use WGL on Windows
-
-`vulkan-disable`
-: Disable Vulkan support
-
 `vulkan-validate`
 : Load the Vulkan validation layer, if available

@@ -262,27 +239,26 @@ A number of options affect behavior instead of logging:
 `high-depth`
 : Use high bit depth rendering if possible

+`linear`
+: Enable linear rendering
+
+`hdr`
+: Force HDR rendering
+
 `no-vsync`
 : Repaint instantly (uses 100% CPU with animations)

-`dmabuf-disable`
-: Disable dmabuf support
-
 The special value `all` can be used to turn on all debug options. The special
 value `help` can be used to obtain a list of all supported debug options.

 ### `GSK_DEBUG`

 This variable can be set to a list of debug options, which cause GSK to
-print out different types of debugging information. Some of these options
-are only available when GTK has been configured with `-Ddebug=true`.
+print out different types of debugging information.

 `renderer`
 : General renderer information

-`opengl`
-: OpenGL renderer information
-
 `vulkan`
 : Check Vulkan errors

@@ -309,12 +285,12 @@ A number of options affect behavior instead of logging:
 `staging`
 : Use a staging image for texture upload (Vulkan only)

-`offload-disable`
-: Disable graphics offload to subsurfaces
-
 `cairo`
 : Overlay error pattern over cairo drawing (finds fallbacks)

+`occlusion`
+: Overlay highlight over areas optimized via occlusion culling
+
 The special value `all` can be used to turn on all debug options. The special
 value `help` can be used to obtain a list of all supported debug options.

@@ -347,6 +323,41 @@ a `*`, which means: try all remaining backends. The special value
 backends. For more information about selecting backends,
 see the [func@Gdk.DisplayManager.get] function.

+### `GDK_DISABLE`
+
+This variable can be set to a list of values, which cause GDK to
+disable certain features.
+
+`gl`
+: Disable OpenGL support
+
+`gl-api`
+: Don't allow the use of OpenGL GL API. This forces GLES to be used
+
+`gles-api`
+: Don't allow the use of OpenGL GLES API. This forces GL to be used
+
+`egl`
+: Don't allow the use of an EGL context
+
+`glx`
+: Don't allow the use of GLX
+
+`wgl`
+: Don't allow the use of WGL
+
+`vulkan`
+: Disable Vulkan support
+
+`dmabuf`
+: Disable dmabuf support
+
+`offload`
+: Disable graphics offload to subsurfaces
+
+`color-mgmt`
+: Disable color management
+
 ### `GDK_GL_DISABLE`

 This variable can be set to a list of values, which cause GDK to
@@ -369,13 +380,6 @@ does not support them.
 `base-instance`
 :GL_EXT_base_instance

-### `GDK_VULKAN_DEVICE`
-
-This variable can be set to the index of a Vulkan device to override
-the default selection of the device that is used for Vulkan rendering.
-The special value `list` can be used to obtain a list of all Vulkan
-devices.
-
 ### `GDK_VULKAN_DISABLE`

 This variable can be set to a list of values, which cause GDK to
@@ -389,15 +393,6 @@ does not support them.
 `ycbr`
 : Do not support Ycbcr textures

-`descriptor-indexing`
-: Force slow descriptor set layout codepath
-
-`dynamic-indexing`
-: Hardcode small number of buffer and texture arrays
-
-`nonuniform-indexing`
-: Split draw calls to ensure uniform texture accesses
-
 `semaphore-export`
 : Disable sync of exported dmabufs

@@ -407,6 +402,9 @@ does not support them.
 `incremental-present`
 : Do not send damage regions

+`swapchain-maintenance`
+: Do not use advanced swapchain features
+
 The special value `all` can be used to turn on all values. The special
 value `help` can be used to obtain a list of all supported values.

@@ -425,14 +423,8 @@ using and the GDK backend supports them:
 `cairo`
 : Selects the fallback Cairo renderer

-`opengl`
-: Selects the default OpenGL renderer
-
-`gl`
-: Selects the "gl" OpenGL renderer
-
 `ngl`
-: Selects the "ngl" OpenGL renderer
+: Selects the OpenGL renderer

 `vulkan`
 : Selects the Vulkan renderer
@@ -461,12 +453,12 @@ using and the GDK backend supports them:
 This variable can be set to a list of values, which cause GSK to
 disable certain optimizations of the "ngl" and "vulkan" renderer.

-`uber`
-: Don't use the uber shader
-
 `clear`
 : Use shaders instead of vkCmdClearAttachment()/glClear()

+`merge`
+: USe one vkCmdDraw()/glDrawArrays() per operation
+
 `blit`
 : Use shaders instead of vkCmdBlit()/glBlitFramebuffer()

@@ -476,6 +468,13 @@ disable certain optimizations of the "ngl" and "vulkan" renderer.
 `mipmap`
 : Avoid creating mipmaps

+`to-image`
+: Don't fast-path creation of images for nodes
+
+`occlusion`
+: Disable occlusion culling via opacity tracking
+
+
 The special value `all` can be used to turn on all values. The special
 value `help` can be used to obtain a list of all supported values.

@@ -563,6 +562,12 @@ To enable the GTK inspector, you can use the <kbd>Control</kbd>+<kbd>Shift</kbd>
 <kbd>Control</kbd>+<kbd>Shift</kbd>+<kbd>D</kbd> keyboard shortcuts, or
 set the `GTK_DEBUG=interactive` environment variable.

+After opening the inspector, it listens for a few keyboard shortcuts that
+let you use its frame and event recording functionality without moving the
+focus away from the application window: <kbd>Super</kbd>+<kbd>R</kbd> turns
+the recording on and off, and <kbd>Super</kbd>+<kbd>C</kbd> records a single
+frame.
+
 There are a few more environment variables that can be set to influence
 how the inspector renders its UI. `GTK_INSPECTOR_DISPLAY` and
 `GTK_INSPECTOR_RENDERER` determine the GDK display and the GSK
@@ -573,6 +578,7 @@ the GTK inspector. The keyboard shortcuts can be disabled with the
 `enable-inspector-keybinding` key in the `org.gtk.Settings.Debug`
 GSettings schema.

+
 ## Profiling

 GTK supports profiling with sysprof. It exports timing information
@@ -171,7 +171,7 @@ Each relation name is part of the `GtkAccessibleRelation` enumeration.
 | %GTK_ACCESSIBLE_RELATION_CONTROLS | “aria-controls” | a list of `GtkAccessible` |
 | %GTK_ACCESSIBLE_RELATION_DESCRIBED_BY | “aria-describedby” | a list of `GtkAccessible` |
 | %GTK_ACCESSIBLE_RELATION_DETAILS | “aria-details” | a list of `GtkAccessible` |
-| %GTK_ACCESSIBLE_RELATION_ERROR_MESSAGE | “aria-errormessage” | `GtkAccessible` |
+| %GTK_ACCESSIBLE_RELATION_ERROR_MESSAGE | “aria-errormessage” | a list of `GtkAccessible` |
 | %GTK_ACCESSIBLE_RELATION_FLOW_TO | “aria-flowto” | a list of `GtkAccessible` |
 | %GTK_ACCESSIBLE_RELATION_LABELLED_BY | “aria-labelledby” | a list of `GtkAccessible` |
 | %GTK_ACCESSIBLE_RELATION_OWNS | “aria-owns” | a list of `GtkAccessible` |
@@ -300,7 +300,7 @@ The attributes can also enhance the UI:

 ```c
 gtk_button_set_label (GTK_BUTTON (button), "Download");
-gtk_box_append (GTK_BOX (button), button);
+gtk_box_append (GTK_BOX (box), button);

 gtk_label_set_text (GTK_LABEL (label), "Final report.pdf");
 gtk_box_append (GTK_BOX (box), label);
@@ -9,6 +9,7 @@ documentation in the form of man pages.
 - [gtk4-demo-application](gtk4-demo-application.html)
 - [gtk4-encode-symbolic-svg](gtk4-encode-symbolic-svg.html)
 - [gtk4-icon-browser](gtk4-icon-browser.html)
+ - [gtk4-image-tool](gtk4-image-tool.html)
 - [gtk4-launch](gtk4-launch.html)
 - [gtk4-node-editor](gtk4-node-editor.html)
 - [gtk4-path-tool](gtk4-path-tool.html)
@@ -49,7 +49,7 @@ main (int   argc,
  g_chdir (GTK_SRCDIR);
 #endif

-  GtkApplication *app = gtk_application_new ("org.gtk.example", G_APPLICATION_FLAGS_NONE);
+  GtkApplication *app = gtk_application_new ("org.gtk.example", G_APPLICATION_DEFAULT_FLAGS);
  g_signal_connect (app, "activate", G_CALLBACK (activate), NULL);

  int status = g_application_run (G_APPLICATION (app), argc, argv);
@@ -173,7 +173,7 @@ main (int    argc,
  GtkApplication *app;
  int status;

-  app = gtk_application_new ("org.gtk.example", G_APPLICATION_FLAGS_NONE);
+  app = gtk_application_new ("org.gtk.example", G_APPLICATION_DEFAULT_FLAGS);
  g_signal_connect (app, "activate", G_CALLBACK (activate), NULL);
  status = g_application_run (G_APPLICATION (app), argc, argv);
  g_object_unref (app);
@@ -60,7 +60,7 @@ main (int    argc,
  GtkApplication *app;
  int status;

-  app = gtk_application_new ("org.gtk.example", G_APPLICATION_FLAGS_NONE);
+  app = gtk_application_new ("org.gtk.example", G_APPLICATION_DEFAULT_FLAGS);
  g_signal_connect (app, "activate", G_CALLBACK (activate), NULL);
  status = g_application_run (G_APPLICATION (app), argc, argv);
  g_object_unref (app);
@@ -37,10 +37,8 @@ main (int argc,
 {
  GtkApplication *app;

-  app = gtk_application_new ("org.gtk.Example.GtkSearchBar",
-      G_APPLICATION_FLAGS_NONE);
-  g_signal_connect (app, "activate",
-      G_CALLBACK (activate_cb), NULL);
+  app = gtk_application_new ("org.gtk.Example.GtkSearchBar", G_APPLICATION_DEFAULT_FLAGS);
+  g_signal_connect (app, "activate", G_CALLBACK (activate_cb), NULL);

  return g_application_run (G_APPLICATION (app), argc, argv);
 }
@@ -19,7 +19,7 @@ main (int    argc,
  GtkApplication *app;
  int status;

-  app = gtk_application_new ("org.gtk.example", G_APPLICATION_FLAGS_NONE);
+  app = gtk_application_new ("org.gtk.example", G_APPLICATION_DEFAULT_FLAGS);
  g_signal_connect (app, "activate", G_CALLBACK (activate), NULL);
  status = g_application_run (G_APPLICATION (app), argc, argv);
  g_object_unref (app);
@@ -111,7 +111,7 @@ gboolean            broadway_server_surface_translate         (BroadwayServer  *
                                                               int              dx,
                                                               int              dy);
 guint32             broadway_server_upload_texture            (BroadwayServer  *server,
-                                                               GBytes          *texture);
+                                                               GBytes          *bytes);
 void                broadway_server_release_texture           (BroadwayServer  *server,
                                                               guint32          id);
 cairo_surface_t   * broadway_server_create_surface            (int              width,
@@ -56,7 +56,7 @@ void     _gdk_broadway_surface_translate          (GdkSurface *surface,
                                                   int        dx,
                                                   int        dy);
 gboolean _gdk_broadway_moveresize_handle_event    (GdkDisplay *display,
-                                                   BroadwayInputMsg *msg);
+                                                   BroadwayInputMsg *event);
 gboolean _gdk_broadway_moveresize_configure_done  (GdkDisplay *display,
                                                   GdkSurface  *surface);
 void     _gdk_broadway_roundtrip_notify           (GdkSurface  *surface,
@@ -49,6 +49,135 @@

 G_DEFINE_TYPE (GdkBroadwaySurface, gdk_broadway_surface, GDK_TYPE_SURFACE)

+static void
+gdk_broadway_surface_toplevel_resize (GdkSurface *surface,
+                                      int         width,
+                                      int         height);
+
+static void
+gdk_broadway_surface_set_geometry_hints (GdkSurface        *surface,
+                                         const GdkGeometry *geometry,
+                                         GdkSurfaceHints    geom_mask);
+
+static void
+gdk_broadway_surface_move_resize_internal (GdkSurface *surface,
+                                           gboolean    with_move,
+                                           int         x,
+                                           int         y,
+                                           int         width,
+                                           int         height);
+
+static void
+compute_toplevel_size (GdkSurface *surface,
+                       gboolean    resizible,
+                       int        *width,
+                       int        *height)
+{
+  GdkBroadwaySurface *impl = GDK_BROADWAY_SURFACE (surface);
+  GdkDisplay *display = gdk_surface_get_display (surface);
+  GdkMonitor *monitor;
+  GdkToplevelSize size;
+  int bounds_width, bounds_height;
+  GdkGeometry geometry;
+  GdkSurfaceHints mask;
+
+  monitor = gdk_display_get_monitor_at_surface (display, surface);
+  if (monitor)
+    {
+      GdkRectangle monitor_geometry;
+
+      gdk_monitor_get_geometry (monitor, &monitor_geometry);
+      bounds_width = monitor_geometry.width;
+      bounds_height = monitor_geometry.height;
+    }
+  else
+    {
+      bounds_width = G_MAXINT;
+      bounds_height = G_MAXINT;
+    }
+
+  gdk_toplevel_size_init (&size, bounds_width, bounds_height);
+  gdk_toplevel_notify_compute_size (GDK_TOPLEVEL (surface), &size);
+  g_warn_if_fail (size.width > 0);
+  g_warn_if_fail (size.height > 0);
+  *width = size.width;
+  *height = size.height;
+  impl->resizible = (impl->resizible && resizible);
+
+  if (impl->resizible)
+    {
+      geometry.min_width = size.min_width;
+      geometry.min_height = size.min_height;
+      mask = GDK_HINT_MIN_SIZE;
+    }
+  else
+    {
+      geometry.max_width = geometry.min_width = size.width;
+      geometry.max_height = geometry.min_height = size.height;
+      mask = GDK_HINT_MIN_SIZE | GDK_HINT_MAX_SIZE;
+    }
+  gdk_broadway_surface_set_geometry_hints (surface, &geometry, mask);
+
+  if (!(surface->state & (GDK_TOPLEVEL_STATE_FULLSCREEN |
+                          GDK_TOPLEVEL_STATE_MAXIMIZED |
+                          GDK_TOPLEVEL_STATE_TILED |
+                          GDK_TOPLEVEL_STATE_TOP_TILED |
+                          GDK_TOPLEVEL_STATE_RIGHT_TILED |
+                          GDK_TOPLEVEL_STATE_BOTTOM_TILED |
+                          GDK_TOPLEVEL_STATE_LEFT_TILED |
+                          GDK_TOPLEVEL_STATE_MINIMIZED)))
+    {
+      gdk_surface_constrain_size (&geometry, mask,
+				  size.width, size.height,
+				  &size.width, &size.height);
+
+      if (impl->last_computed_width != size.width ||
+           impl->last_computed_height != size.height)
+        {
+          *width = size.width;
+          *height = size.height;
+          impl->last_computed_width = size.width;
+          impl->last_computed_height = size.height;
+
+	  gdk_broadway_surface_toplevel_resize (surface, *width, *height);
+        }
+    }
+
+  if (size.shadow.is_valid)
+    {
+      impl->shadow_left = size.shadow.left;
+      impl->shadow_right = size.shadow.right;
+      impl->shadow_top = size.shadow.top;
+      impl->shadow_bottom = size.shadow.bottom;
+    }
+}
+
+static gboolean
+compute_size_idle (gpointer user_data)
+{
+  GdkSurface *surface = user_data;
+  GdkBroadwaySurface *impl = GDK_BROADWAY_SURFACE (surface);
+  int width, height;
+
+  impl->compute_size_source_id = 0;
+  compute_toplevel_size (surface, TRUE, &width, &height);
+
+  return G_SOURCE_REMOVE;
+}
+
+static void
+on_frame_clock_after_update (GdkFrameClock *clock,
+                             GdkSurface    *surface)
+{
+  GdkBroadwaySurface *impl = GDK_BROADWAY_SURFACE (surface);
+
+  if (impl->compute_size_source_id)
+    {
+      g_clear_handle_id (&impl->compute_size_source_id, g_source_remove);
+      compute_size_idle (surface);
+    }
+}
+
 /* We need to flush in an idle rather than AFTER_PAINT, as the clock
   is frozen during e.g. surface resizes so the paint will not happen
   and the surface resize request is never flushed. */
@@ -112,6 +241,8 @@ connect_frame_clock (GdkSurface *surface)

  g_signal_connect (frame_clock, "before-paint",
                    G_CALLBACK (on_frame_clock_before_paint), surface);
+  g_signal_connect_after (frame_clock, "update",
+			  G_CALLBACK (on_frame_clock_after_update), surface);
  g_signal_connect (frame_clock, "after-paint",
                    G_CALLBACK (on_frame_clock_after_paint), surface);
 }
@@ -123,6 +254,8 @@ disconnect_frame_clock (GdkSurface *surface)

  g_signal_handlers_disconnect_by_func (frame_clock,
                                        on_frame_clock_before_paint, surface);
+  g_signal_handlers_disconnect_by_func (frame_clock,
+                                        on_frame_clock_after_update, surface);
  g_signal_handlers_disconnect_by_func (frame_clock,
                                        on_frame_clock_after_paint, surface);
 }
@@ -137,6 +270,7 @@ gdk_broadway_surface_constructed (GObject *object)
  if (!surface->parent)
    broadway_display->toplevels = g_list_prepend (broadway_display->toplevels, self);

+  self->resizible = TRUE;
  self->id = _gdk_broadway_server_new_surface (broadway_display->server,
                                               self->root_x,
                                               self->root_y,
@@ -316,6 +450,7 @@ gdk_broadway_surface_hide (GdkSurface *surface)

  _gdk_broadway_surface_grab_check_unmap (surface,
                                         _gdk_broadway_server_get_next_serial (broadway_display->server));
+  g_clear_handle_id (&impl->compute_size_source_id, g_source_remove);

  if (_gdk_broadway_server_surface_hide (broadway_display->server, impl->id))
    queue_flush (surface);
@@ -1009,6 +1144,8 @@ _gdk_broadway_moveresize_configure_done (GdkDisplay *display,
  BroadwayInputMsg *tmp_event;
  MoveResizeData *mv_resize = get_move_resize_data (display, FALSE);

+  gdk_surface_request_layout (surface);
+
  if (!mv_resize || surface != mv_resize->moveresize_surface)
    return FALSE;

@@ -1168,6 +1305,43 @@ gdk_broadway_surface_beep (GdkSurface *surface)
  return FALSE;
 }

+static void
+gdk_broadway_surface_request_layout (GdkSurface *surface)
+{
+  GdkBroadwaySurface *impl = GDK_BROADWAY_SURFACE (surface);
+
+  if (!impl->compute_size_source_id &&
+      GDK_IS_TOPLEVEL (surface))
+    {
+      impl->compute_size_source_id = g_idle_add_full (G_PRIORITY_HIGH - 10,
+                                                      compute_size_idle,
+                                                      surface,
+                                                      NULL);
+    }
+}
+
+static gboolean
+gdk_broadway_surface_compute_size (GdkSurface *surface)
+{
+  int width, height;
+
+  if (GDK_IS_TOPLEVEL (surface))
+    {
+      compute_toplevel_size (surface, TRUE, &width, &height);
+    }
+  else
+    {
+      width = gdk_surface_get_width(surface);
+      height = gdk_surface_get_height(surface);
+
+      gdk_broadway_surface_move_resize_internal (surface, FALSE,
+						 0, 0,
+						 width,
+						 height);
+    }
+  return FALSE;
+}
+
 static void
 gdk_broadway_surface_class_init (GdkBroadwaySurfaceClass *klass)
 {
@@ -1187,6 +1361,8 @@ gdk_broadway_surface_class_init (GdkBroadwaySurfaceClass *klass)
  impl_class->destroy_notify = gdk_broadway_surface_destroy_notify;
  impl_class->drag_begin = _gdk_broadway_surface_drag_begin;
  impl_class->get_scale = gdk_broadway_surface_get_scale;
+  impl_class->request_layout = gdk_broadway_surface_request_layout;
+  impl_class->compute_size = gdk_broadway_surface_compute_size;
 }

 #define LAST_PROP 1
@@ -1504,55 +1680,12 @@ gdk_broadway_toplevel_present (GdkToplevel       *toplevel,
                               GdkToplevelLayout *layout)
 {
  GdkSurface *surface = GDK_SURFACE (toplevel);
-  GdkBroadwaySurface *impl = GDK_BROADWAY_SURFACE (surface);
-  GdkDisplay *display = gdk_surface_get_display (surface);
-  GdkMonitor *monitor;
-  GdkToplevelSize size;
-  int bounds_width, bounds_height;
  int width, height;
-  GdkGeometry geometry;
-  GdkSurfaceHints mask;
  gboolean maximize;

  gdk_broadway_surface_unminimize (surface);

-  monitor = gdk_display_get_monitor_at_surface (display, surface);
-  if (monitor)
-    {
-      GdkRectangle monitor_geometry;
-
-      gdk_monitor_get_geometry (monitor, &monitor_geometry);
-      bounds_width = monitor_geometry.width;
-      bounds_height = monitor_geometry.height;
-    }
-  else
-    {
-      bounds_width = G_MAXINT;
-      bounds_height = G_MAXINT;
-    }
-
-  gdk_toplevel_size_init (&size, bounds_width, bounds_height);
-  gdk_toplevel_notify_compute_size (toplevel, &size);
-  g_warn_if_fail (size.width > 0);
-  g_warn_if_fail (size.height > 0);
-  width = size.width;
-  height = size.height;
-
-  if (gdk_toplevel_layout_get_resizable (layout))
-    {
-      geometry.min_width = size.min_width;
-      geometry.min_height = size.min_height;
-      mask = GDK_HINT_MIN_SIZE;
-    }
-  else
-    {
-      geometry.max_width = geometry.min_width = width;
-      geometry.max_height = geometry.min_height = height;
-      mask = GDK_HINT_MIN_SIZE | GDK_HINT_MAX_SIZE;
-    }
-  gdk_broadway_surface_set_geometry_hints (surface, &geometry, mask);
-  gdk_surface_constrain_size (&geometry, mask, width, height, &width, &height);
-  gdk_broadway_surface_toplevel_resize (surface, width, height);
+  compute_toplevel_size (surface, gdk_toplevel_layout_get_resizable (layout), &width, &height);

  if (gdk_toplevel_layout_get_maximized (layout, &maximize))
    {
@@ -1562,14 +1695,7 @@ gdk_broadway_toplevel_present (GdkToplevel       *toplevel,
        gdk_broadway_surface_unmaximize (surface);
    }

-  if (size.shadow.is_valid)
-    {
-      impl->shadow_left = size.shadow.left;
-      impl->shadow_right = size.shadow.right;
-      impl->shadow_top = size.shadow.top;
-      impl->shadow_bottom = size.shadow.bottom;
-    }
-
+  gdk_surface_request_layout (surface);
  show_surface (surface);
 }

@@ -76,6 +76,13 @@ struct _GdkBroadwaySurface
  int shadow_right;
  int shadow_top;
  int shadow_bottom;
+
+  int last_computed_width;
+  int last_computed_height;
+
+  guint compute_size_source_id;
+
+  gboolean resizible;
 };

 struct _GdkBroadwaySurfaceClass
@@ -17,6 +17,7 @@

 #pragma once

+#include <gio/gio.h>

 void     file_transfer_portal_register              (void);

@@ -133,22 +133,35 @@ static const GdkDebugKey gdk_debug_keys[] = {
  { "portals",         GDK_DEBUG_PORTALS, "Force use of portals" },
  { "no-portals",      GDK_DEBUG_NO_PORTALS, "Disable use of portals" },
  { "force-offload",   GDK_DEBUG_FORCE_OFFLOAD, "Force graphics offload for all textures" },
-  { "gl-disable",      GDK_DEBUG_GL_DISABLE, "Disable OpenGL support" },
  { "gl-no-fractional", GDK_DEBUG_GL_NO_FRACTIONAL, "Disable fractional scaling for OpenGL" },
  { "gl-debug",        GDK_DEBUG_GL_DEBUG, "Insert debugging information in OpenGL" },
-  { "gl-disable-gl",   GDK_DEBUG_GL_DISABLE_GL, "Only allow OpenGL GLES API" },
-  { "gl-disable-gles", GDK_DEBUG_GL_DISABLE_GLES, "Don't allow OpenGL GLES API" },
  { "gl-prefer-gl",    GDK_DEBUG_GL_PREFER_GL, "Prefer GL over GLES API" },
-  { "gl-egl",          GDK_DEBUG_GL_EGL, "Use EGL on X11 or Windows" },
-  { "gl-glx",          GDK_DEBUG_GL_GLX, "Use GLX on X11" },
-  { "gl-wgl",          GDK_DEBUG_GL_WGL, "Use WGL on Windows" },
-  { "vulkan-disable",  GDK_DEBUG_VULKAN_DISABLE, "Disable Vulkan support" },
  { "default-settings",GDK_DEBUG_DEFAULT_SETTINGS, "Force default values for xsettings" },
  { "high-depth",      GDK_DEBUG_HIGH_DEPTH, "Use high bit depth rendering if possible" },
  { "no-vsync",        GDK_DEBUG_NO_VSYNC, "Repaint instantly (uses 100% CPU with animations)" },
-  { "dmabuf-disable",  GDK_DEBUG_DMABUF_DISABLE, "Disable dmabuf support" },
 };

+static const GdkDebugKey gdk_feature_keys[] = {
+  { "gl",         GDK_FEATURE_OPENGL,           "Disable OpenGL support" },
+  { "gl-api",     GDK_FEATURE_GL_API,           "Disable non-GLES GL API" },
+  { "gles-api",   GDK_FEATURE_GLES_API,         "Disable GLES GL API" },
+  { "egl",        GDK_FEATURE_EGL,              "Disable EGL" },
+  { "glx",        GDK_FEATURE_GLX,              "Disable GLX" },
+  { "wgl",        GDK_FEATURE_WGL,              "Disable WGL" },
+  { "vulkan",     GDK_FEATURE_VULKAN,           "Disable Vulkan support" },
+  { "dmabuf",     GDK_FEATURE_DMABUF,           "Disable dmabuf support" },
+  { "offload",    GDK_FEATURE_OFFLOAD,          "Disable graphics offload" },
+  { "color-mgmt", GDK_FEATURE_COLOR_MANAGEMENT, "Disable color management" },
+};
+
+
+static GdkFeatures gdk_features;
+
+gboolean
+gdk_has_feature (GdkFeatures features)
+{
+  return (features & gdk_features) == features;
+}

 #ifdef G_HAS_CONSTRUCTORS
 #ifdef G_DEFINE_CONSTRUCTOR_NEEDS_PRAGMA
@@ -216,6 +229,7 @@ gdk_ensure_resources (void)

 guint
 gdk_parse_debug_var (const char        *variable,
+                     const char        *docs,
                     const GdkDebugKey *keys,
                     guint              nkeys)
 {
@@ -276,6 +290,7 @@ gdk_parse_debug_var (const char        *variable,
        max_width = MAX (max_width, strlen (keys[i].key));
      max_width += 4;

+      fprintf (stderr, "%s\n", docs);
      fprintf (stderr, "Supported %s values:\n", variable);
      for (i = 0; i < nkeys; i++) {
        fprintf (stderr, "  %s%*s%s\n", keys[i].key, (int)(max_width - strlen (keys[i].key)), " ", keys[i].help);
@@ -303,21 +318,26 @@ gdk_parse_debug_var (const char        *variable,
 void
 gdk_pre_parse (void)
 {
+  GdkFeatures disabled_features;
+
  gdk_initialized = TRUE;

  gdk_ensure_resources ();

  _gdk_debug_flags = gdk_parse_debug_var ("GDK_DEBUG",
-                                          gdk_debug_keys,
-                                          G_N_ELEMENTS (gdk_debug_keys));
+      "GDK_DEBUG can be set to values that make GDK print out different\n"
+      "types of debugging information or change the behavior of GDK for\n"
+      "debugging purposes.\n",
+      gdk_debug_keys,
+      G_N_ELEMENTS (gdk_debug_keys));

-  /* These are global */
-  if (_gdk_debug_flags & GDK_DEBUG_GL_EGL)
-    gdk_gl_backend_use (GDK_GL_EGL);
-  else if (_gdk_debug_flags & GDK_DEBUG_GL_GLX)
-    gdk_gl_backend_use (GDK_GL_GLX);
-  else if (_gdk_debug_flags & GDK_DEBUG_GL_WGL)
-    gdk_gl_backend_use (GDK_GL_WGL);
+  disabled_features = gdk_parse_debug_var ("GDK_DISABLE",
+      "GDK_DISABLE can be set to values which cause GDK to disable\n"
+      "certain features.\n",
+      gdk_feature_keys,
+      G_N_ELEMENTS (gdk_feature_keys));
+
+  gdk_features = GDK_ALL_FEATURES & ~disabled_features;

 #ifndef G_HAS_CONSTRUCTORS
  stash_and_unset_environment ();
@@ -120,7 +120,7 @@ gdk_app_launch_context_class_init (GdkAppLaunchContextClass *klass)
  context_class->launch_failed = gdk_app_launch_context_launch_failed;

  /**
-   * GdkAppLaunchContext:display: (attributes org.gtk.Property.get=gdk_app_launch_context_get_display)
+   * GdkAppLaunchContext:display:
   *
   * The display that the `GdkAppLaunchContext` is on.
   */
@@ -169,7 +169,7 @@ gdk_app_launch_context_get_display_name (GAppLaunchContext *context,
 }

 /**
- * gdk_app_launch_context_get_display: (attributes org.gtk.Method.get_property=display)
+ * gdk_app_launch_context_get_display:
 * @context: a `GdkAppLaunchContext`
 *
 * Gets the `GdkDisplay` that @context is for.
@@ -122,6 +122,18 @@ gdk_cairo_pattern_add_color_stop_rgba_ccs (cairo_pattern_t *pattern,
  cairo_pattern_add_color_stop_rgba (pattern, offset, color[0], color[1], color[2], color[3]);
 }

+static inline void
+gdk_cairo_pattern_add_color_stop_color (cairo_pattern_t *pattern,
+                                        GdkColorState   *ccs,
+                                        double           offset,
+                                        const GdkColor  *color)
+{
+  float values[4];
+
+  gdk_color_to_float (color, ccs, values);
+  cairo_pattern_add_color_stop_rgba (pattern, offset, values[0], values[1], values[2], values[3]);
+}
+
 static inline void
 gdk_cairo_rect (cairo_t               *cr,
                const graphene_rect_t *rect)
@@ -208,10 +208,7 @@ gdk_cicp_params_class_init (GdkCicpParamsClass *klass)
   * Supported values:
   *
   * - 0: RGB
-   * - 1: BT.709
   * - 2: unspecified
-   * - 5,6: BT.601
-   * - 9: BT.2020
   *
   * Since: 4.16
   */
@@ -58,7 +58,7 @@ void            gdk_cicp_params_set_matrix_coefficients (GdkCicpParams    *self,
 /**
 * GdkCicpRange:
 * @GDK_CICP_RANGE_NARROW: The values use the range of 16-235 (for Y) and 16-240 for u and v.
- * @GDK_CICO_RANGE_FULL: The values use the full range.
+ * @GDK_CICP_RANGE_FULL: The values use the full range.
 *
 * The values of this enumeration describe whether image data uses
 * the full range of 8-bit values.
@@ -79,6 +79,6 @@ gdk_cicp_equivalent (const GdkCicp *p1,
  return gdk_cicp_equal (&n1, &n2);
 }

-const GdkCicp * gdk_cicp_params_get_cicp (GdkCicpParams *params);
+const GdkCicp * gdk_cicp_params_get_cicp (GdkCicpParams *self);

 GdkCicpParams * gdk_cicp_params_new_for_cicp (const GdkCicp  *cicp);
@@ -353,7 +353,7 @@ gdk_clipboard_class_init (GdkClipboardClass *class)
  class->read_finish = gdk_clipboard_read_local_finish;

  /**
-   * GdkClipboard:display: (attributes org.gtk.Property.get=gdk_clipboard_get_display)
+   * GdkClipboard:display:
   *
   * The `GdkDisplay` that the clipboard belongs to.
   */
@@ -366,7 +366,7 @@ gdk_clipboard_class_init (GdkClipboardClass *class)
                         G_PARAM_EXPLICIT_NOTIFY);

  /**
-   * GdkClipboard:formats: (attributes org.gtk.Property.get=gdk_clipboard_get_formats)
+   * GdkClipboard:formats:
   *
   * The possible formats that the clipboard can provide its data in.
   */
@@ -378,7 +378,7 @@ gdk_clipboard_class_init (GdkClipboardClass *class)
                        G_PARAM_EXPLICIT_NOTIFY);

  /**
-   * GdkClipboard:local: (attributes org.gtk.Property.get=gdk_clipboard_is_local)
+   * GdkClipboard:local: (getter is_local)
   *
   * %TRUE if the contents of the clipboard are owned by this process.
   */
@@ -390,7 +390,7 @@ gdk_clipboard_class_init (GdkClipboardClass *class)
                          G_PARAM_EXPLICIT_NOTIFY);

  /**
-   * GdkClipboard:content: (attributes org.gtk.Property.get=gdk_clipboard_get_content)
+   * GdkClipboard:content:
   *
   * The `GdkContentProvider` or %NULL if the clipboard is empty or contents are
   * provided otherwise.
@@ -429,7 +429,7 @@ gdk_clipboard_init (GdkClipboard *clipboard)
 }

 /**
- * gdk_clipboard_get_display: (attributes org.gtk.Method.get_property=display)
+ * gdk_clipboard_get_display:
 * @clipboard: a `GdkClipboard`
 *
 * Gets the `GdkDisplay` that the clipboard was created for.
@@ -447,7 +447,7 @@ gdk_clipboard_get_display (GdkClipboard *clipboard)
 }

 /**
- * gdk_clipboard_get_formats: (attributes org.gtk.Method.get_property=formats)
+ * gdk_clipboard_get_formats:
 * @clipboard: a `GdkClipboard`
 *
 * Gets the formats that the clipboard can provide its current contents in.
@@ -465,7 +465,7 @@ gdk_clipboard_get_formats (GdkClipboard *clipboard)
 }

 /**
- * gdk_clipboard_is_local: (attributes org.gtk.Method.get_property=local)
+ * gdk_clipboard_is_local: (get-property local)
 * @clipboard: a `GdkClipboard`
 *
 * Returns if the clipboard is local.
@@ -489,7 +489,7 @@ gdk_clipboard_is_local (GdkClipboard *clipboard)
 }

 /**
- * gdk_clipboard_get_content: (attributes org.gtk.Method.get_property=content)
+ * gdk_clipboard_get_content:
 * @clipboard: a `GdkClipboard`
 *
 * Returns the `GdkContentProvider` currently set on @clipboard.
@@ -229,20 +229,6 @@ gdk_color_from_rgba (GdkColor        *self,
  gdk_color_finish (&tmp);
 }

-/*< private >
- * gdk_color_get_depth:
- * @self: a `GdkColor`
- *
- * Returns the preferred depth for the color state of @self.
- *
- * Returns: the preferred depth
- */
-GdkMemoryDepth
-(gdk_color_get_depth) (const GdkColor *self)
-{
-  return gdk_color_state_get_depth (self->color_state);
-}
-
 /*< private >
 * gdk_color_print:
 * @self: the `GdkColor` to print
@@ -20,11 +20,20 @@
 * and tests, and must not include other headers.
 */

+#include <glib.h>
+#include <math.h>
+
+static inline int
+sign (float v)
+{
+  return v < 0 ? -1 : 1;
+}
+
 static inline float
 srgb_oetf (float v)
 {
-  if (v > 0.0031308f)
-    return 1.055f * powf (v, 1.f / 2.4f) - 0.055f;
+  if (fabsf (v) > 0.0031308f)
+    return sign (v) * (1.055f * powf (fabsf (v), 1.f / 2.4f) - 0.055f);
  else
    return 12.92f * v;
 }
@@ -32,8 +41,8 @@ srgb_oetf (float v)
 static inline float
 srgb_eotf (float v)
 {
-  if (v >= 0.04045f)
-    return powf (((v + 0.055f) / (1.f + 0.055f)), 2.4f);
+  if (fabsf (v) >= 0.04045f)
+    return sign (v) * powf (((fabsf (v) + 0.055f) / (1.f + 0.055f)), 2.4f);
  else
    return v / 12.92f;
 }
@@ -41,25 +50,25 @@ srgb_eotf (float v)
 static inline float
 gamma22_oetf (float v)
 {
-  return powf (v, 1.f / 2.2f);
+  return sign (v) * powf (fabsf (v), 1.f / 2.2f);
 }

 static inline float
 gamma22_eotf (float v)
 {
-  return powf (v, 2.2f);
+  return sign (v) * powf (fabsf (v), 2.2f);
 }

 static inline float
 gamma28_oetf (float v)
 {
-  return powf (v, 1.f / 2.8f);
+  return sign (v) * powf (fabsf (v), 1.f / 2.8f);
 }

 static inline float
 gamma28_eotf (float v)
 {
-  return powf (v, 2.8f);
+  return sign (v) * powf (fabsf (v), 2.8f);
 }

 static inline float
@@ -71,9 +80,10 @@ pq_eotf (float v)
  float c2 = 2413.0 / (1 << 7);
  float c3 = 2392.0 / (1 << 7);

-  float x = powf (MAX ((powf (v, minv) - c1), 0) / (c2 - (c3 * (powf (v, minv)))), ninv);
+  float x = powf (fabsf (v), minv);
+  x = powf (MAX ((x - c1), 0) / (c2 - (c3 * x)), ninv);

-  return x * 10000 / 203.0;
+  return sign (v) * x * 10000 / 203.0;
 }

 static inline float
@@ -86,7 +96,8 @@ pq_oetf (float v)
  float c2 = 2413.0 / (1 << 7);
  float c3 = 2392.0 / (1 << 7);

-  return powf (((c1 + (c2 * powf (x, n))) / (1 + (c3 * powf (x, n)))), m);
+  x = powf (fabsf (x), n);
+  return sign (v) * powf (((c1 + (c2 * x)) / (1 + (c3 * x))), m);
 }

 static inline float
@@ -95,10 +106,10 @@ bt709_eotf (float v)
  const float a = 1.099;
  const float d = 0.0812;

-  if (v < d)
+  if (fabsf (v) < d)
    return  v / 4.5f;
  else
-    return powf ((v + (a - 1)) / a, 1 / 0.45f);
+    return sign (v) * powf ((fabsf (v) + (a - 1)) / a, 1 / 0.45f);
 }

 static inline float
@@ -107,10 +118,10 @@ bt709_oetf (float v)
  const float a = 1.099;
  const float b = 0.018;

-  if (v < b)
+  if (fabsf (v) < b)
    return v * 4.5f;
  else
-    return a * powf (v, 0.45f) - (a - 1);
+    return sign (v) * (a * powf (fabsf (v), 0.45f) - (a - 1));
 }

 static inline float
@@ -120,10 +131,10 @@ hlg_eotf (float v)
  const float b = 0.28466892;
  const float c = 0.55991073;

-  if (v <= 0.5)
-    return (v * v) / 3;
+  if (fabsf (v) <= 0.5)
+    return sign (v) * (v * v) / 3;
  else
-    return (expf ((v - c) / a) + b) / 12.0;
+    return sign (v) * (expf ((fabsf (v) - c) / a) + b) / 12.0;
 }

 static inline float
@@ -133,10 +144,10 @@ hlg_oetf (float v)
  const float b = 0.28466892;
  const float c = 0.55991073;

-  if (v <= 1/12.0)
-    return sqrtf (3 * v);
+  if (fabsf (v) <= 1/12.0)
+    return sign (v) * sqrtf (3 * fabsf (v));
  else
-    return a * logf (12 * v - b) + c;
+    return sign (v) * (a * logf (12 * fabsf (v) - b) + c);
 }

 /* See http://www.brucelindbloom.com/index.html?Eqn_RGB_XYZ_Matrix.html
@@ -223,38 +234,52 @@ static const float srgb_to_rec2020[9] = {
  0.016394, 0.088011, 0.895380,
 };

-static const float rgb_to_bt601[9] = {
-  0.299000,  0.587000,  0.114000,
- -0.168736, -0.331264,  0.500000,
-  0.500000, -0.418688, -0.081312,
+/* oklab conversion */
+
+static float
+from_oklab_nl (float v)
+{
+  return v * v * v;
+}
+
+static float
+to_oklab_nl (float v)
+{
+  return cbrtf (v);
+}
+
+static const float oklab_to_lms[9] = {
+  1,  0.3963377774,  0.2158037573,
+  1, -0.1055613458, -0.0638541728,
+  1, -0.0894841775, -1.2914855480
 };

-static const float bt601_to_rgb[9] = {
-  1.000000,  0.000000,  1.402000,
-  1.000000, -0.344136, -0.714136,
-  1.000000,  1.772000,  0.000000,
+static const float lms_to_srgb[9] = {
+  4.0767416621, -3.3077115913,  0.2309699292,
+ -1.2684380046,  2.6097574011, -0.3413193965,
+ -0.0041960863, -0.7034186147,  1.7076147010,
 };

-static const float rgb_to_bt709[9] = {
-  0.212600,  0.715200,  0.072200,
- -0.114572, -0.385428,  0.500000,
-  0.500000, -0.454153, -0.045847,
+static const float srgb_to_lms[9] = {
+  0.4122214708, 0.5363325363, 0.0514459929,
+  0.2119034982, 0.6806995451, 0.1073969566,
+  0.0883024619, 0.2817188376, 0.6299787005,
 };

-static const float bt709_to_rgb[9] = {
-  1.000000,  0.000000,  1.574800,
-  1.000000, -0.187324, -0.468124,
-  1.000000,  1.855600, -0.000000,
+static const float lms_to_oklab[9] = {
+  0.2104542553,  0.7936177850, -0.0040720468,
+  1.9779984951, -2.4285922050,  0.4505937099,
+  0.0259040371,  0.7827717662, -0.8086757660,
 };

-static const float rgb_to_bt2020[9] = {
-  0.262700,  0.678000,  0.059300,
- -0.139630, -0.360370,  0.500000,
-  0.500000, -0.459786, -0.040214,
+static const float rec2020_to_lms[9] = {
+  0.616645, 0.360250, 0.023064,
+  0.265075, 0.635874, 0.099059,
+  0.100076, 0.203907, 0.696161,
 };

-static const float bt2020_to_rgb[9] = {
-  1.000000, -0.000000,  1.474600,
-  1.000000, -0.164553, -0.571353,
-  1.000000,  1.881400, -0.000000,
+static const float lms_to_rec2020[9] = {
+  2.140325, -1.246734, 0.106491,
+  -0.884665, 2.163141, -0.278489,
+  -0.048559, -0.454366, 1.502711,
 };
@@ -18,6 +18,8 @@

 #pragma once

+#include "gdkcolorprivate.h"
+
 #include "gdkcolorstateprivate.h"


@@ -116,7 +118,10 @@ _gdk_color_to_float (const GdkColor  *self,
 {
  if (gdk_color_state_equal (self->color_state, color_state))
    {
-      memcpy (values, self->values, sizeof (float) * 4);
+      values[0] = self->values[0];
+      values[1] = self->values[1];
+      values[2] = self->values[2];
+      values[3] = self->values[3];
      return;
    }

@@ -126,10 +131,3 @@ _gdk_color_to_float (const GdkColor  *self,
                                 values);
 }

-#define gdk_color_get_depth(self) _gdk_color_get_depth ((self))
-static inline GdkMemoryDepth
-_gdk_color_get_depth (const GdkColor *self)
-{
-  return gdk_color_state_get_depth (self->color_state);
-}
-
@@ -79,11 +79,10 @@ void              gdk_color_init_from_rgba      (GdkColor               *self,
                                                 const GdkRGBA          *rgba);
 void              gdk_color_finish              (GdkColor               *self);

-gboolean          gdk_color_equal               (const GdkColor         *color1,
-                                                 const GdkColor         *color2);
+gboolean          gdk_color_equal               (const GdkColor         *self,
+                                                 const GdkColor         *other);
 gboolean          gdk_color_is_clear            (const GdkColor         *self);
 gboolean          gdk_color_is_opaque           (const GdkColor         *self);
-GdkMemoryDepth    gdk_color_get_depth           (const GdkColor         *self);

 void              gdk_color_convert             (GdkColor               *self,
                                                 GdkColorState          *color_state,
@@ -18,7 +18,6 @@

 #include "config.h"

-#define GDK_COLOR_STATE_IMPL
 #include "gdkcolorstateprivate.h"

 #include <math.h>
@@ -39,9 +38,9 @@
 * Crucially, GTK knows how to convert colors from one color
 * state to another.
 *
- * `GdkColorState objects are immutable and therefore threadsafe.
+ * `GdkColorState` objects are immutable and therefore threadsafe.
 *
- * Since 4.16
+ * Since: 4.16
 */

 G_DEFINE_BOXED_TYPE (GdkColorState, gdk_color_state,
@@ -173,6 +172,18 @@ gdk_color_state_get_rec2100_linear (void)
  return GDK_COLOR_STATE_REC2100_LINEAR;
 }

+GdkColorState *
+gdk_color_state_get_oklab (void)
+{
+  return GDK_COLOR_STATE_OKLAB;
+}
+
+GdkColorState *
+gdk_color_state_get_oklch (void)
+{
+  return GDK_COLOR_STATE_OKLCH;
+}
+
 /**
 * gdk_color_state_equal:
 * @self: a `GdkColorState`
@@ -224,56 +235,171 @@ gdk_color_state_create_cicp_params (GdkColorState *self)
 /* {{{ Conversion functions */

 typedef float (* GdkTransferFunc) (float v);
+typedef void  (* GdkConvertFunc)  (GdkColorState *self,
+                                   float          values[4]);
 typedef const float GdkColorMatrix[9];

 #define IDENTITY ((float*)0)
 #define NONE ((GdkTransferFunc)0)

-#define TRANSFORM(name, eotf, matrix, oetf) \
+#define CONVERT_FUNC(name) \
 static void \
-name (GdkColorState  *self, \
-      float         (*values)[4], \
-      gsize           n_values) \
+gdk_convert_ ## name (GdkColorState  *self, \
+                      float         (*values)[4], \
+                      gsize           n_values) \
 { \
  for (gsize i = 0; i < n_values; i++) \
    { \
-      if (eotf != NONE) \
-        { \
-          values[i][0] = eotf (values[i][0]); \
-          values[i][1] = eotf (values[i][1]); \
-          values[i][2] = eotf (values[i][2]); \
-        } \
-      if (matrix != IDENTITY) \
-        { \
-          float res[3]; \
-          res[0] = matrix[0] * values[i][0] + matrix[1] * values[i][1] + matrix[2] * values[i][2]; \
-          res[1] = matrix[3] * values[i][0] + matrix[4] * values[i][1] + matrix[5] * values[i][2]; \
-          res[2] = matrix[6] * values[i][0] + matrix[7] * values[i][1] + matrix[8] * values[i][2]; \
-          values[i][0] = res[0]; \
-          values[i][1] = res[1]; \
-          values[i][2] = res[2]; \
-        } \
-      if (oetf != NONE) \
-        { \
-          values[i][0] = oetf (values[i][0]); \
-          values[i][1] = oetf (values[i][1]); \
-          values[i][2] = oetf (values[i][2]); \
-        } \
+      name (self, values[i]); \
    } \
 }

-TRANSFORM(gdk_default_srgb_to_srgb_linear,           srgb_eotf, IDENTITY,        NONE);
-TRANSFORM(gdk_default_srgb_linear_to_srgb,           NONE,      IDENTITY,        srgb_oetf)
-TRANSFORM(gdk_default_rec2100_pq_to_rec2100_linear,  pq_eotf,   IDENTITY,        NONE)
-TRANSFORM(gdk_default_rec2100_linear_to_rec2100_pq,  NONE,      IDENTITY,        pq_oetf)
-TRANSFORM(gdk_default_srgb_linear_to_rec2100_linear, NONE,      srgb_to_rec2020, NONE)
-TRANSFORM(gdk_default_rec2100_linear_to_srgb_linear, NONE,      rec2020_to_srgb, NONE)
-TRANSFORM(gdk_default_srgb_to_rec2100_linear,        srgb_eotf, srgb_to_rec2020, NONE)
-TRANSFORM(gdk_default_rec2100_pq_to_srgb_linear,     pq_eotf,   rec2020_to_srgb, NONE)
-TRANSFORM(gdk_default_srgb_linear_to_rec2100_pq,     NONE,      srgb_to_rec2020, pq_oetf)
-TRANSFORM(gdk_default_rec2100_linear_to_srgb,        NONE,      rec2020_to_srgb, srgb_oetf)
-TRANSFORM(gdk_default_srgb_to_rec2100_pq,            srgb_eotf, srgb_to_rec2020, pq_oetf)
-TRANSFORM(gdk_default_rec2100_pq_to_srgb,            pq_eotf,   rec2020_to_srgb, srgb_oetf)
+#define TRANSFORM(name, eotf, matrix, nonlinear, matrix2, oetf) \
+static inline void \
+name (GdkColorState  *self, \
+      float           values[4]) \
+{ \
+  if (eotf != NONE) \
+    { \
+      values[0] = eotf (values[0]); \
+      values[1] = eotf (values[1]); \
+      values[2] = eotf (values[2]); \
+    } \
+  if (matrix != IDENTITY) \
+    { \
+      float res[3]; \
+      res[0] = matrix[0] * values[0] + matrix[1] * values[1] + matrix[2] * values[2]; \
+      res[1] = matrix[3] * values[0] + matrix[4] * values[1] + matrix[5] * values[2]; \
+      res[2] = matrix[6] * values[0] + matrix[7] * values[1] + matrix[8] * values[2]; \
+      values[0] = res[0]; \
+      values[1] = res[1]; \
+      values[2] = res[2]; \
+    } \
+  if (nonlinear != NONE) \
+    { \
+      values[0] = nonlinear (values[0]); \
+      values[1] = nonlinear (values[1]); \
+      values[2] = nonlinear (values[2]); \
+    } \
+  if (matrix2 != IDENTITY) \
+    { \
+      float res[3]; \
+      res[0] = matrix2[0] * values[0] + matrix2[1] * values[1] + matrix2[2] * values[2]; \
+      res[1] = matrix2[3] * values[0] + matrix2[4] * values[1] + matrix2[5] * values[2]; \
+      res[2] = matrix2[6] * values[0] + matrix2[7] * values[1] + matrix2[8] * values[2]; \
+      values[0] = res[0]; \
+      values[1] = res[1]; \
+      values[2] = res[2]; \
+    } \
+  if (oetf != NONE) \
+    { \
+      values[0] = oetf (values[0]); \
+      values[1] = oetf (values[1]); \
+      values[2] = oetf (values[2]); \
+    } \
+} \
+CONVERT_FUNC (name)
+
+#define TRANSFORM_PAIR(name, func1, func2) \
+static inline void \
+name (GdkColorState *self, \
+      float          values[4]) \
+{ \
+  func1 (self, values); \
+  func2 (self, values); \
+} \
+CONVERT_FUNC (name)
+
+TRANSFORM(srgb_to_srgb_linear,           srgb_eotf, IDENTITY,        NONE, IDENTITY, NONE)
+TRANSFORM(srgb_linear_to_srgb,           NONE,      IDENTITY,        NONE, IDENTITY, srgb_oetf)
+TRANSFORM(rec2100_pq_to_rec2100_linear,  pq_eotf,   IDENTITY,        NONE, IDENTITY, NONE)
+TRANSFORM(rec2100_linear_to_rec2100_pq,  NONE,      IDENTITY,        NONE, IDENTITY, pq_oetf)
+TRANSFORM(srgb_linear_to_rec2100_linear, NONE,      srgb_to_rec2020, NONE, IDENTITY, NONE)
+TRANSFORM(rec2100_linear_to_srgb_linear, NONE,      rec2020_to_srgb, NONE, IDENTITY, NONE)
+TRANSFORM(srgb_to_rec2100_linear,        srgb_eotf, srgb_to_rec2020, NONE, IDENTITY, NONE)
+TRANSFORM(rec2100_pq_to_srgb_linear,     pq_eotf,   rec2020_to_srgb, NONE, IDENTITY, NONE)
+TRANSFORM(srgb_linear_to_rec2100_pq,     NONE,      srgb_to_rec2020, NONE, IDENTITY, pq_oetf)
+TRANSFORM(rec2100_linear_to_srgb,        NONE,      rec2020_to_srgb, NONE, IDENTITY, srgb_oetf)
+TRANSFORM(srgb_to_rec2100_pq,            srgb_eotf, srgb_to_rec2020, NONE, IDENTITY, pq_oetf)
+TRANSFORM(rec2100_pq_to_srgb,            pq_eotf,   rec2020_to_srgb, NONE, IDENTITY, srgb_oetf)
+
+TRANSFORM(oklab_to_srgb_linear,          NONE,      oklab_to_lms,    from_oklab_nl, lms_to_srgb,    NONE)
+TRANSFORM(oklab_to_srgb,                 NONE,      oklab_to_lms,    from_oklab_nl, lms_to_srgb,    srgb_oetf)
+TRANSFORM(oklab_to_rec2100_linear,       NONE,      oklab_to_lms,    from_oklab_nl, lms_to_rec2020, NONE)
+TRANSFORM(oklab_to_rec2100_pq,           NONE,      oklab_to_lms,    from_oklab_nl, lms_to_rec2020, pq_oetf)
+TRANSFORM(srgb_linear_to_oklab,          NONE,      srgb_to_lms,     to_oklab_nl,   lms_to_oklab,   NONE)
+TRANSFORM(srgb_to_oklab,                 srgb_eotf, srgb_to_lms,     to_oklab_nl,   lms_to_oklab,   NONE)
+TRANSFORM(rec2100_linear_to_oklab,       NONE,      rec2020_to_lms,  to_oklab_nl,   lms_to_oklab,   NONE)
+TRANSFORM(rec2100_pq_to_oklab,           pq_eotf,   rec2020_to_lms,  to_oklab_nl,   lms_to_oklab,   NONE)
+
+#define DEG_TO_RAD(x) ((x) * G_PI / 180)
+#define RAD_TO_DEG(x) ((x) * 180 / G_PI)
+
+static inline void
+_sincosf (float  angle,
+          float *out_s,
+          float *out_c)
+{
+#ifdef HAVE_SINCOSF
+  sincosf (angle, out_s, out_c);
+#else
+  *out_s = sinf (angle);
+  *out_c = cosf (angle);
+#endif
+}
+
+static void
+oklch_to_oklab (GdkColorState *self,
+                float          values[4])
+{
+  float L, C, H, a, b;
+
+  L = values[0];
+  C = values[1];
+  H = values[2];
+
+  _sincosf (DEG_TO_RAD (H), &b, &a);
+  a *= C;
+  b *= C;
+
+  values[0] = L;
+  values[1] = a;
+  values[2] = b;
+}
+
+static void
+oklab_to_oklch (GdkColorState *self,
+                float          values[4])
+{
+  float L, a, b, C, H;
+
+  L = values[0];
+  a = values[1];
+  b = values[2];
+
+  C = hypotf (a, b);
+  H = RAD_TO_DEG (atan2 (b, a));
+
+  H = fmod (H, 360);
+  if (H < 0)
+    H += 360;
+
+  values[0] = L;
+  values[1] = C;
+  values[2] = H;
+}
+
+CONVERT_FUNC (oklch_to_oklab)
+CONVERT_FUNC (oklab_to_oklch)
+
+TRANSFORM_PAIR (srgb_to_oklch,           srgb_to_oklab,           oklab_to_oklch)
+TRANSFORM_PAIR (srgb_linear_to_oklch,    srgb_linear_to_oklab,    oklab_to_oklch)
+TRANSFORM_PAIR (rec2100_pq_to_oklch,     rec2100_pq_to_oklab,     oklab_to_oklch)
+TRANSFORM_PAIR (rec2100_linear_to_oklch, rec2100_linear_to_oklab, oklab_to_oklch)
+TRANSFORM_PAIR (oklch_to_srgb,           oklch_to_oklab,          oklab_to_srgb)
+TRANSFORM_PAIR (oklch_to_srgb_linear,    oklch_to_oklab,          oklab_to_srgb_linear)
+TRANSFORM_PAIR (oklch_to_rec2100_pq,     oklch_to_oklab,          oklab_to_rec2100_pq)
+TRANSFORM_PAIR (oklch_to_rec2100_linear, oklch_to_oklab,          oklab_to_rec2100_pq)

 /* }}} */
 /* {{{ Default implementation */
@@ -329,9 +455,74 @@ gdk_default_color_state_get_cicp (GdkColorState *color_state)
 {
  GdkDefaultColorState *self = (GdkDefaultColorState *) color_state;

+  if (self->cicp.color_primaries == 0)
+    return NULL;
+
  return &self->cicp;
 }

+static gboolean
+gdk_color_state_check_inf_nan (const float src[4],
+                               float       dest[4])
+{
+  if (isnan (src[0]) ||
+      isnan (src[1]) ||
+      isnan (src[2]) ||
+      isnan (src[3]))
+    {
+      dest = (float[4]) { 1.0, 0.0, 0.8, 1.0 };
+      return TRUE;
+    }
+  if (isinf (src[0]) ||
+      isinf (src[1]) ||
+      isinf (src[2]) ||
+      isinf (src[3]))
+    {
+      dest = (float[4]) { 0.0, 0.8, 1.0, 1.0 };
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+static void
+gdk_color_state_clamp_0_1 (GdkColorState *self,
+                           const float    src[4],
+                           float          dest[4])
+{
+  if (gdk_color_state_check_inf_nan (src, dest))
+    return;
+
+  dest[0] = CLAMP (src[0], 0.0f, 1.0f);
+  dest[1] = CLAMP (src[1], 0.0f, 1.0f);
+  dest[2] = CLAMP (src[2], 0.0f, 1.0f);
+  dest[3] = CLAMP (src[3], 0.0f, 1.0f);
+}
+
+static void
+gdk_color_state_clamp_unbounded (GdkColorState *self,
+                                 const float    src[4],
+                                 float          dest[4])
+{
+  if (gdk_color_state_check_inf_nan (src, dest))
+    return;
+
+  dest[0] = src[0];
+  dest[1] = src[1];
+  dest[2] = src[2];
+  dest[3] = CLAMP (src[3], 0.0f, 1.0f);
+}
+
+static void
+gdk_default_color_state_clamp (GdkColorState *color_state,
+                               const float    in[4],
+                               float          out[4])
+{
+  GdkDefaultColorState *self = (GdkDefaultColorState *) color_state;
+
+  self->clamp (color_state, in, out);
+}
+
 /* }}} */

 static const
@@ -343,6 +534,7 @@ GdkColorStateClass GDK_DEFAULT_COLOR_STATE_CLASS = {
  .get_convert_to = gdk_default_color_state_get_convert_to,
  .get_convert_from = gdk_default_color_state_get_convert_from,
  .get_cicp = gdk_default_color_state_get_cicp,
+  .clamp = gdk_default_color_state_clamp,
 };

 GdkDefaultColorState gdk_default_color_states[] = {
@@ -351,15 +543,19 @@ GdkDefaultColorState gdk_default_color_states[] = {
      .klass = &GDK_DEFAULT_COLOR_STATE_CLASS,
      .ref_count = 0,
      .depth = GDK_MEMORY_U8_SRGB,
-      .rendering_color_state = GDK_COLOR_STATE_SRGB_LINEAR,
+      .rendering_color_state = GDK_COLOR_STATE_SRGB,
+      .rendering_color_state_linear = GDK_COLOR_STATE_SRGB_LINEAR,
    },
    .name = "srgb",
    .no_srgb = GDK_COLOR_STATE_SRGB_LINEAR,
    .convert_to = {
-      [GDK_COLOR_STATE_ID_SRGB_LINEAR] = gdk_default_srgb_to_srgb_linear,
-      [GDK_COLOR_STATE_ID_REC2100_PQ] = gdk_default_srgb_to_rec2100_pq,
-      [GDK_COLOR_STATE_ID_REC2100_LINEAR] = gdk_default_srgb_to_rec2100_linear,
+      [GDK_COLOR_STATE_ID_SRGB_LINEAR] = gdk_convert_srgb_to_srgb_linear,
+      [GDK_COLOR_STATE_ID_REC2100_PQ] = gdk_convert_srgb_to_rec2100_pq,
+      [GDK_COLOR_STATE_ID_REC2100_LINEAR] = gdk_convert_srgb_to_rec2100_linear,
+      [GDK_COLOR_STATE_ID_OKLAB] = gdk_convert_srgb_to_oklab,
+      [GDK_COLOR_STATE_ID_OKLCH] = gdk_convert_srgb_to_oklch,
    },
+    .clamp = gdk_color_state_clamp_0_1,
    .cicp = { 1, 13, 0, 1 },
  },
  [GDK_COLOR_STATE_ID_SRGB_LINEAR] = {
@@ -368,14 +564,18 @@ GdkDefaultColorState gdk_default_color_states[] = {
      .ref_count = 0,
      .depth = GDK_MEMORY_U8,
      .rendering_color_state = GDK_COLOR_STATE_SRGB_LINEAR,
+      .rendering_color_state_linear = GDK_COLOR_STATE_SRGB_LINEAR,
    },
    .name = "srgb-linear",
    .no_srgb = NULL,
    .convert_to = {
-      [GDK_COLOR_STATE_ID_SRGB] = gdk_default_srgb_linear_to_srgb,
-      [GDK_COLOR_STATE_ID_REC2100_PQ] = gdk_default_srgb_linear_to_rec2100_pq,
-      [GDK_COLOR_STATE_ID_REC2100_LINEAR] = gdk_default_srgb_linear_to_rec2100_linear,
+      [GDK_COLOR_STATE_ID_SRGB] = gdk_convert_srgb_linear_to_srgb,
+      [GDK_COLOR_STATE_ID_REC2100_PQ] = gdk_convert_srgb_linear_to_rec2100_pq,
+      [GDK_COLOR_STATE_ID_REC2100_LINEAR] = gdk_convert_srgb_linear_to_rec2100_linear,
+      [GDK_COLOR_STATE_ID_OKLAB] = gdk_convert_srgb_linear_to_oklab,
+      [GDK_COLOR_STATE_ID_OKLCH] = gdk_convert_srgb_linear_to_oklch,
    },
+    .clamp = gdk_color_state_clamp_0_1,
    .cicp = { 1, 8, 0, 1 },
  },
  [GDK_COLOR_STATE_ID_REC2100_PQ] = {
@@ -383,15 +583,19 @@ GdkDefaultColorState gdk_default_color_states[] = {
      .klass = &GDK_DEFAULT_COLOR_STATE_CLASS,
      .ref_count = 0,
      .depth = GDK_MEMORY_FLOAT16,
-      .rendering_color_state = GDK_COLOR_STATE_REC2100_LINEAR,
+      .rendering_color_state = GDK_COLOR_STATE_REC2100_PQ,
+      .rendering_color_state_linear = GDK_COLOR_STATE_REC2100_LINEAR,
    },
    .name = "rec2100-pq",
    .no_srgb = NULL,
    .convert_to = {
-      [GDK_COLOR_STATE_ID_SRGB] = gdk_default_rec2100_pq_to_srgb,
-      [GDK_COLOR_STATE_ID_SRGB_LINEAR] = gdk_default_rec2100_pq_to_srgb_linear,
-      [GDK_COLOR_STATE_ID_REC2100_LINEAR] = gdk_default_rec2100_pq_to_rec2100_linear,
+      [GDK_COLOR_STATE_ID_SRGB] = gdk_convert_rec2100_pq_to_srgb,
+      [GDK_COLOR_STATE_ID_SRGB_LINEAR] = gdk_convert_rec2100_pq_to_srgb_linear,
+      [GDK_COLOR_STATE_ID_REC2100_LINEAR] = gdk_convert_rec2100_pq_to_rec2100_linear,
+      [GDK_COLOR_STATE_ID_OKLAB] = gdk_convert_rec2100_pq_to_oklab,
+      [GDK_COLOR_STATE_ID_OKLCH] = gdk_convert_rec2100_pq_to_oklch,
    },
+    .clamp = gdk_color_state_clamp_0_1,
    .cicp = { 9, 16, 0, 1 },
  },
  [GDK_COLOR_STATE_ID_REC2100_LINEAR] = {
@@ -400,16 +604,56 @@ GdkDefaultColorState gdk_default_color_states[] = {
      .ref_count = 0,
      .depth = GDK_MEMORY_FLOAT16,
      .rendering_color_state = GDK_COLOR_STATE_REC2100_LINEAR,
+      .rendering_color_state_linear = GDK_COLOR_STATE_REC2100_LINEAR,
    },
    .name = "rec2100-linear",
    .no_srgb = NULL,
    .convert_to = {
-      [GDK_COLOR_STATE_ID_SRGB] = gdk_default_rec2100_linear_to_srgb,
-      [GDK_COLOR_STATE_ID_SRGB_LINEAR] = gdk_default_rec2100_linear_to_srgb_linear,
-      [GDK_COLOR_STATE_ID_REC2100_PQ] = gdk_default_rec2100_linear_to_rec2100_pq,
+      [GDK_COLOR_STATE_ID_SRGB] = gdk_convert_rec2100_linear_to_srgb,
+      [GDK_COLOR_STATE_ID_SRGB_LINEAR] = gdk_convert_rec2100_linear_to_srgb_linear,
+      [GDK_COLOR_STATE_ID_REC2100_PQ] = gdk_convert_rec2100_linear_to_rec2100_pq,
+      [GDK_COLOR_STATE_ID_OKLAB] = gdk_convert_rec2100_linear_to_oklab,
+      [GDK_COLOR_STATE_ID_OKLCH] = gdk_convert_rec2100_linear_to_oklch,
    },
+    .clamp = gdk_color_state_clamp_unbounded,
    .cicp = { 9, 8, 0, 1 },
  },
+  [GDK_COLOR_STATE_ID_OKLAB] = {
+    .parent = {
+      .klass = &GDK_DEFAULT_COLOR_STATE_CLASS,
+      .ref_count = 0,
+      .depth = GDK_MEMORY_FLOAT16,
+      .rendering_color_state = GDK_COLOR_STATE_SRGB,
+    },
+    .name = "oklab",
+    .no_srgb = NULL,
+    .convert_to = {
+      [GDK_COLOR_STATE_ID_SRGB] = gdk_convert_oklab_to_srgb,
+      [GDK_COLOR_STATE_ID_SRGB_LINEAR] = gdk_convert_oklab_to_srgb_linear,
+      [GDK_COLOR_STATE_ID_REC2100_PQ] = gdk_convert_oklab_to_rec2100_pq,
+      [GDK_COLOR_STATE_ID_REC2100_LINEAR] = gdk_convert_oklab_to_rec2100_linear,
+      [GDK_COLOR_STATE_ID_OKLCH] = gdk_convert_oklab_to_oklch,
+    },
+    .cicp = { 0, 0, 0, 0 },
+  },
+  [GDK_COLOR_STATE_ID_OKLCH] = {
+    .parent = {
+      .klass = &GDK_DEFAULT_COLOR_STATE_CLASS,
+      .ref_count = 0,
+      .depth = GDK_MEMORY_FLOAT16,
+      .rendering_color_state = GDK_COLOR_STATE_SRGB,
+    },
+    .name = "oklch",
+    .no_srgb = NULL,
+    .convert_to = {
+      [GDK_COLOR_STATE_ID_SRGB] = gdk_convert_oklch_to_srgb,
+      [GDK_COLOR_STATE_ID_SRGB_LINEAR] = gdk_convert_oklch_to_srgb_linear,
+      [GDK_COLOR_STATE_ID_REC2100_PQ] = gdk_convert_oklch_to_rec2100_pq,
+      [GDK_COLOR_STATE_ID_REC2100_LINEAR] = gdk_convert_oklch_to_rec2100_linear,
+      [GDK_COLOR_STATE_ID_OKLAB] = gdk_convert_oklch_to_oklab,
+    },
+    .cicp = { 0, 0, 0, 0 },
+  },
 };

 /* }}} */
@@ -422,137 +666,38 @@ struct _GdkCicpColorState

  GdkColorState *no_srgb;

-  const char *name;
+  char *name;

  GdkTransferFunc eotf;
  GdkTransferFunc oetf;

-  float *to_srgb;
-  float *to_rec2020;
-  float *from_srgb;
-  float *from_rec2020;
-
-  const float *from_yuv;
-  const float *to_yuv;
+  float to_srgb[9];
+  float to_rec2020[9];
+  float from_srgb[9];
+  float from_rec2020[9];

  GdkCicp cicp;
 };

 /* {{{ Conversion functions */

-#define TRANSFORM_FROM_CICP(name, matrix, oetf) \
-static void \
-name (GdkColorState  *color_state, \
-      float         (*values)[4], \
-      gsize           n_values) \
-{ \
-  GdkCicpColorState *self = (GdkCicpColorState *) color_state; \
-\
-  for (gsize i = 0; i < n_values; i++) \
-    { \
-      if (self->cicp.range == GDK_CICP_RANGE_NARROW) \
-        { \
-          values[i][0] = CLAMP ((values[i][0] - 16.0/255.0) * 255.0 / 219.0, -10, 10); \
-          values[i][1] = CLAMP ((values[i][1] - 16.0/255.0) * 255.0 / 224.0, -10, 10); \
-          values[i][2] = CLAMP ((values[i][2] - 16.0/255.0) * 255.0 / 224.0, -10, 10); \
-        } \
-      if (self->from_yuv) \
-        { \
-          float res[3]; \
-          values[i][1] -= 0.5; \
-          values[i][2] -= 0.5; \
-          res[0] = self->from_yuv[0] * values[i][0] + self->from_yuv[1] * values[i][1] + self->from_yuv[2] * values[i][2]; \
-          res[1] = self->from_yuv[3] * values[i][0] + self->from_yuv[4] * values[i][1] + self->from_yuv[5] * values[i][2]; \
-          res[2] = self->from_yuv[6] * values[i][0] + self->from_yuv[7] * values[i][1] + self->from_yuv[8] * values[i][2]; \
-          values[i][0] = res[0]; \
-          values[i][1] = res[1]; \
-          values[i][2] = res[2]; \
-        } \
-      if (self->eotf != NONE) \
-        { \
-          values[i][0] = self->eotf (values[i][0]); \
-          values[i][1] = self->eotf (values[i][1]); \
-          values[i][2] = self->eotf (values[i][2]); \
-        } \
-      if (self->matrix != IDENTITY) \
-        { \
-          float res[3]; \
-          res[0] = self->matrix[0] * values[i][0] + self->matrix[1] * values[i][1] + self->matrix[2] * values[i][2]; \
-          res[1] = self->matrix[3] * values[i][0] + self->matrix[4] * values[i][1] + self->matrix[5] * values[i][2]; \
-          res[2] = self->matrix[6] * values[i][0] + self->matrix[7] * values[i][1] + self->matrix[8] * values[i][2]; \
-          values[i][0] = res[0]; \
-          values[i][1] = res[1]; \
-          values[i][2] = res[2]; \
-        } \
-      if (oetf != NONE) \
-        { \
-          values[i][0] = oetf (values[i][0]); \
-          values[i][1] = oetf (values[i][1]); \
-          values[i][2] = oetf (values[i][2]); \
-        } \
-    } \
-}
+#define cicp ((GdkCicpColorState *)self)

-#define TRANSFORM_TO_CICP(name, eotf, matrix) \
-static void \
-name (GdkColorState  *color_state, \
-      float         (*values)[4], \
-      gsize           n_values) \
-{ \
-  GdkCicpColorState *self = (GdkCicpColorState *) color_state; \
-\
-  for (gsize i = 0; i < n_values; i++) \
-    { \
-      if (eotf != NONE) \
-        { \
-          values[i][0] = eotf (values[i][0]); \
-          values[i][1] = eotf (values[i][1]); \
-          values[i][2] = eotf (values[i][2]); \
-        } \
-      if (self->matrix != IDENTITY) \
-        { \
-          float res[3]; \
-          res[0] = self->matrix[0] * values[i][0] + self->matrix[1] * values[i][1] + self->matrix[2] * values[i][2]; \
-          res[1] = self->matrix[3] * values[i][0] + self->matrix[4] * values[i][1] + self->matrix[5] * values[i][2]; \
-          res[2] = self->matrix[6] * values[i][0] + self->matrix[7] * values[i][1] + self->matrix[8] * values[i][2]; \
-          values[i][0] = res[0]; \
-          values[i][1] = res[1]; \
-          values[i][2] = res[2]; \
-        } \
-      if (self->oetf != NONE) \
-        { \
-          values[i][0] = self->oetf (values[i][0]); \
-          values[i][1] = self->oetf (values[i][1]); \
-          values[i][2] = self->oetf (values[i][2]); \
-        } \
-      if (self->to_yuv) \
-        { \
-          float res[3]; \
-          res[0] = self->to_yuv[0] * values[i][0] + self->to_yuv[1] * values[i][1] + self->to_yuv[2] * values[i][2]; \
-          res[1] = self->to_yuv[3] * values[i][0] + self->to_yuv[4] * values[i][1] + self->to_yuv[5] * values[i][2]; \
-          res[2] = self->to_yuv[6] * values[i][0] + self->to_yuv[7] * values[i][1] + self->to_yuv[8] * values[i][2]; \
-          values[i][0] = res[0]; \
-          values[i][1] = res[1] + 0.5; \
-          values[i][2] = res[2] + 0.5; \
-        } \
-      if (self->cicp.range == GDK_CICP_RANGE_NARROW) \
-        { \
-          values[i][0] = values[i][0] * 219.0 / 255.0 + 16.0 / 255.0; \
-          values[i][1] = values[i][1] * 224.0 / 255.0 + 16.0 / 255.0; \
-          values[i][2] = values[i][2] * 224.0 / 255.0 + 16.0 / 255.0; \
-        } \
-    } \
-}
+TRANSFORM(cicp_to_srgb,             cicp->eotf,  cicp->to_srgb,      NONE, IDENTITY, srgb_oetf)
+TRANSFORM(cicp_to_srgb_linear,      cicp->eotf,  cicp->to_srgb,      NONE, IDENTITY, NONE)
+TRANSFORM(cicp_to_rec2100_pq,       cicp->eotf,  cicp->to_rec2020,   NONE, IDENTITY, pq_oetf)
+TRANSFORM(cicp_to_rec2100_linear,   cicp->eotf,  cicp->to_rec2020,   NONE, IDENTITY, NONE)
+TRANSFORM(cicp_from_srgb,           srgb_eotf,   cicp->from_srgb,    NONE, IDENTITY, cicp->oetf)
+TRANSFORM(cicp_from_srgb_linear,    NONE,        cicp->from_srgb,    NONE, IDENTITY, cicp->oetf)
+TRANSFORM(cicp_from_rec2100_pq,     pq_eotf,     cicp->from_rec2020, NONE, IDENTITY, cicp->oetf)
+TRANSFORM(cicp_from_rec2100_linear, NONE,        cicp->from_rec2020, NONE, IDENTITY, cicp->oetf)

-TRANSFORM_FROM_CICP(gdk_cicp_to_srgb,           to_srgb,      srgb_oetf)
-TRANSFORM_FROM_CICP(gdk_cicp_to_srgb_linear,    to_srgb,      NONE)
-TRANSFORM_FROM_CICP(gdk_cicp_to_rec2100_pq,     to_rec2020,   pq_oetf)
-TRANSFORM_FROM_CICP(gdk_cicp_to_rec2100_linear, to_rec2020,   NONE)
+#undef cicp

-TRANSFORM_TO_CICP(gdk_cicp_from_srgb,           srgb_eotf,   from_srgb)
-TRANSFORM_TO_CICP(gdk_cicp_from_srgb_linear,    NONE,        from_srgb)
-TRANSFORM_TO_CICP(gdk_cicp_from_rec2100_pq,     pq_eotf,     from_rec2020)
-TRANSFORM_TO_CICP(gdk_cicp_from_rec2100_linear, NONE,        from_rec2020)
+TRANSFORM_PAIR (cicp_to_oklab,   cicp_to_srgb_linear,  srgb_linear_to_oklab)
+TRANSFORM_PAIR (cicp_from_oklab, oklab_to_srgb_linear, cicp_from_srgb_linear)
+TRANSFORM_PAIR (cicp_to_oklch,   cicp_to_srgb_linear,  srgb_linear_to_oklch)
+TRANSFORM_PAIR (cicp_from_oklch, oklch_to_srgb_linear, cicp_from_srgb_linear)

 /* }}} */
 /* {{{ Vfuncs */
@@ -562,14 +707,11 @@ gdk_cicp_color_state_free (GdkColorState *cs)
 {
  GdkCicpColorState *self = (GdkCicpColorState *) cs;

+  g_free (self->name);
+
  if (self->no_srgb)
    gdk_color_state_unref (self->no_srgb);

-  g_free (self->to_srgb);
-  g_free (self->to_rec2020);
-  g_free (self->from_srgb);
-  g_free (self->from_rec2020);
-
  g_free (self);
 }

@@ -609,13 +751,17 @@ gdk_cicp_color_state_get_convert_to (GdkColorState *self,
  switch (GDK_DEFAULT_COLOR_STATE_ID (target))
    {
    case GDK_COLOR_STATE_ID_SRGB:
-      return gdk_cicp_to_srgb;
+      return gdk_convert_cicp_to_srgb;
    case GDK_COLOR_STATE_ID_SRGB_LINEAR:
-      return gdk_cicp_to_srgb_linear;
+      return gdk_convert_cicp_to_srgb_linear;
    case GDK_COLOR_STATE_ID_REC2100_PQ:
-      return gdk_cicp_to_rec2100_pq;
+      return gdk_convert_cicp_to_rec2100_pq;
    case GDK_COLOR_STATE_ID_REC2100_LINEAR:
-      return gdk_cicp_to_rec2100_linear;
+      return gdk_convert_cicp_to_rec2100_linear;
+    case GDK_COLOR_STATE_ID_OKLAB:
+      return gdk_convert_cicp_to_oklab;
+    case GDK_COLOR_STATE_ID_OKLCH:
+      return gdk_convert_cicp_to_oklch;

    case GDK_COLOR_STATE_N_IDS:
    default:
@@ -635,13 +781,17 @@ gdk_cicp_color_state_get_convert_from (GdkColorState *self,
  switch (GDK_DEFAULT_COLOR_STATE_ID (source))
    {
    case GDK_COLOR_STATE_ID_SRGB:
-      return gdk_cicp_from_srgb;
+      return gdk_convert_cicp_from_srgb;
    case GDK_COLOR_STATE_ID_SRGB_LINEAR:
-      return gdk_cicp_from_srgb_linear;
+      return gdk_convert_cicp_from_srgb_linear;
    case GDK_COLOR_STATE_ID_REC2100_PQ:
-      return gdk_cicp_from_rec2100_pq;
+      return gdk_convert_cicp_from_rec2100_pq;
    case GDK_COLOR_STATE_ID_REC2100_LINEAR:
-      return gdk_cicp_from_rec2100_linear;
+      return gdk_convert_cicp_from_rec2100_linear;
+    case GDK_COLOR_STATE_ID_OKLAB:
+      return gdk_convert_cicp_from_oklab;
+    case GDK_COLOR_STATE_ID_OKLCH:
+      return gdk_convert_cicp_from_oklch;

    case GDK_COLOR_STATE_N_IDS:
    default:
@@ -670,46 +820,7 @@ GdkColorStateClass GDK_CICP_COLOR_STATE_CLASS = {
  .get_convert_to = gdk_cicp_color_state_get_convert_to,
  .get_convert_from = gdk_cicp_color_state_get_convert_from,
  .get_cicp = gdk_cicp_color_state_get_cicp,
-};
-
-GdkCicpColorState gdk_color_state_bt601_narrow = {
-  .parent = {
-    .klass = &GDK_CICP_COLOR_STATE_CLASS,
-    .ref_count = 1,
-    .depth = GDK_MEMORY_FLOAT16,
-    .rendering_color_state = GDK_COLOR_STATE_REC2100_LINEAR,
-  },
-  .name = "cicp-1/13/6/0",
-  .no_srgb = NULL,
-  .cicp = { 1, 13, 6, 0 },
-  .eotf = srgb_eotf,
-  .oetf = srgb_oetf,
-  .to_yuv = rgb_to_bt601,
-  .from_yuv = bt601_to_rgb,
-  .to_srgb = IDENTITY,
-  .to_rec2020 = (float *) srgb_to_rec2020,
-  .from_srgb = IDENTITY,
-  .from_rec2020 = (float *) rec2020_to_srgb,
-};
-
-GdkCicpColorState gdk_color_state_bt601_full = {
-  .parent = {
-    .klass = &GDK_CICP_COLOR_STATE_CLASS,
-    .ref_count = 1,
-    .depth = GDK_MEMORY_FLOAT16,
-    .rendering_color_state = GDK_COLOR_STATE_REC2100_LINEAR,
-  },
-  .name = "cicp-1/13/6/1",
-  .no_srgb = NULL,
-  .cicp = { 1, 13, 6, 1 },
-  .eotf = srgb_eotf,
-  .oetf = srgb_oetf,
-  .to_yuv = rgb_to_bt601,
-  .from_yuv = bt601_to_rgb,
-  .to_srgb = IDENTITY,
-  .to_rec2020 = (float *) srgb_to_rec2020,
-  .from_srgb = IDENTITY,
-  .from_rec2020 = (float *) rec2020_to_srgb,
+  .clamp = gdk_color_state_clamp_0_1,
 };

 static inline float *
@@ -736,8 +847,14 @@ gdk_color_state_new_for_cicp (const GdkCicp  *cicp,
  GdkTransferFunc oetf;
  gconstpointer to_xyz;
  gconstpointer from_xyz;
-  gconstpointer to_yuv = NULL;
-  gconstpointer from_yuv = NULL;
+
+  if (cicp->range == GDK_CICP_RANGE_NARROW || cicp->matrix_coefficients != 0)
+    {
+      g_set_error (error,
+                   G_IO_ERROR, G_IO_ERROR_FAILED,
+                   _("cicp: Narrow range or YUV not supported"));
+      return NULL;
+    }

  if (cicp->color_primaries == 2 ||
      cicp->transfer_function == 2 ||
@@ -751,16 +868,10 @@ gdk_color_state_new_for_cicp (const GdkCicp  *cicp,

  for (guint i = 0; i < GDK_COLOR_STATE_N_IDS; i++)
    {
-      if (gdk_cicp_equal (cicp, &gdk_default_color_states[i].cicp))
+      if (gdk_cicp_equivalent (cicp, &gdk_default_color_states[i].cicp))
        return (GdkColorState *) &gdk_default_color_states[i];
    }

-  if (gdk_cicp_equal (cicp, &gdk_color_state_bt601_narrow.cicp))
-    return gdk_color_state_ref ((GdkColorState *) &gdk_color_state_bt601_narrow);
-
-  if (gdk_cicp_equal (cicp, &gdk_color_state_bt601_full.cicp))
-    return gdk_color_state_ref ((GdkColorState *) &gdk_color_state_bt601_full);
-
  switch (cicp->transfer_function)
    {
    case 1:
@@ -813,7 +924,6 @@ gdk_color_state_new_for_cicp (const GdkCicp  *cicp,
      from_xyz = xyz_to_pal;
      break;
    case 6:
-    case 7:
      to_xyz = ntsc_to_xyz;
      from_xyz = xyz_to_ntsc;
      break;
@@ -833,56 +943,26 @@ gdk_color_state_new_for_cicp (const GdkCicp  *cicp,
      return NULL;
    }

-  switch (cicp->matrix_coefficients)
-    {
-    case 0:
-      to_yuv = IDENTITY;
-      from_yuv = IDENTITY;
-      break;
-    case 1:
-      to_yuv = rgb_to_bt709;
-      from_yuv = bt709_to_rgb;
-      break;
-    case 5:
-    case 6:
-      to_yuv = rgb_to_bt601;
-      from_yuv = bt601_to_rgb;
-      break;
-    case 9:
-      to_yuv = rgb_to_bt2020;
-      from_yuv = bt2020_to_rgb;
-      break;
-    default:
-      g_set_error (error,
-                   G_IO_ERROR, G_IO_ERROR_FAILED,
-                   _("cicp: Matrix coefficients %u, %s not supported"),
-                   cicp->matrix_coefficients,
-                   cicp->range == GDK_CICP_RANGE_NARROW ? "narrow" : "full");
-      return NULL;
-    }
-
  self = g_new0 (GdkCicpColorState, 1);

  self->parent.klass = &GDK_CICP_COLOR_STATE_CLASS;
  self->parent.ref_count = 1;

  /* sRGB is special-cased by being a default colorstate */
-  self->parent.rendering_color_state = GDK_COLOR_STATE_REC2100_LINEAR;
+  self->parent.rendering_color_state = GDK_COLOR_STATE_REC2100_PQ;
+  self->parent.rendering_color_state_linear = GDK_COLOR_STATE_REC2100_LINEAR;

  self->parent.depth = GDK_MEMORY_FLOAT16;

  memcpy (&self->cicp, cicp, sizeof (GdkCicp));

-  self->to_yuv = to_yuv;
-  self->from_yuv = from_yuv;
-
  self->eotf = eotf;
  self->oetf = oetf;

-  self->to_srgb = multiply (g_new (float, 9), xyz_to_srgb, to_xyz);
-  self->to_rec2020 = multiply (g_new (float, 9), xyz_to_rec2020, to_xyz);
-  self->from_srgb = multiply (g_new (float, 9), from_xyz, srgb_to_xyz);
-  self->from_rec2020 = multiply (g_new (float, 9), from_xyz, rec2020_to_xyz);
+  multiply (self->to_srgb, xyz_to_srgb, to_xyz);
+  multiply (self->to_rec2020, xyz_to_rec2020, to_xyz);
+  multiply (self->from_srgb, from_xyz, srgb_to_xyz);
+  multiply (self->from_rec2020, from_xyz, rec2020_to_xyz);

  self->name = g_strdup_printf ("cicp-%u/%u/%u/%u",
                                cicp->color_primaries,
@@ -892,12 +972,12 @@ gdk_color_state_new_for_cicp (const GdkCicp  *cicp,

  if (cicp->transfer_function == 13)
    {
-      GdkCicp no_srgb;
-
-      memcpy (&no_srgb, cicp, sizeof (GdkCicp));
-      no_srgb.transfer_function = 8;
-
-      self->no_srgb = gdk_color_state_new_for_cicp (&no_srgb, NULL);
+      self->no_srgb = gdk_color_state_new_for_cicp (&(GdkCicp) {
+                                                      cicp->color_primaries,
+                                                      8,
+                                                      cicp->matrix_coefficients,
+                                                      cicp->range },
+                                                    NULL);
    }

  return (GdkColorState *) self;
@@ -945,6 +1025,24 @@ gdk_color_state_get_no_srgb_tf (GdkColorState *self)
  return self->klass->get_no_srgb_tf (self);
 }

+/*< private >
+ * gdk_color_state_clamp:
+ * @self: a `GdkColorState`
+ * @src: the values to clamp
+ * @dest: (out): location to store the result, may be identical to
+ *   the src argument
+ *
+ * Clamps the values to be within the allowed ranges for the given
+ * color state.
+ */
+void
+gdk_color_state_clamp (GdkColorState *self,
+                       const float    src[4],
+                       float          dest[4])
+{
+  self->klass->clamp (self, src, dest);
+}
+
 /* }}} */

 /* vim:set foldmethod=marker expandtab: */
@@ -49,6 +49,12 @@ GdkColorState * gdk_color_state_get_rec2100_pq          (void);
 GDK_AVAILABLE_IN_4_16
 GdkColorState * gdk_color_state_get_rec2100_linear      (void);

+GDK_AVAILABLE_IN_4_16
+GdkColorState * gdk_color_state_get_oklab               (void);
+
+GDK_AVAILABLE_IN_4_16
+GdkColorState * gdk_color_state_get_oklch               (void);
+
 GDK_AVAILABLE_IN_4_16
 gboolean        gdk_color_state_equal                   (GdkColorState  *self,
                                                         GdkColorState  *other);
@@ -13,6 +13,8 @@ typedef enum
  GDK_COLOR_STATE_ID_SRGB_LINEAR,
  GDK_COLOR_STATE_ID_REC2100_PQ,
  GDK_COLOR_STATE_ID_REC2100_LINEAR,
+  GDK_COLOR_STATE_ID_OKLAB,
+  GDK_COLOR_STATE_ID_OKLCH,

  GDK_COLOR_STATE_N_IDS
 } GdkColorStateId;
@@ -26,6 +28,7 @@ struct _GdkColorState

  GdkMemoryDepth depth;
  GdkColorState *rendering_color_state;
+  GdkColorState *rendering_color_state_linear;
 };

 /* Note: self may be the source or the target colorstate */
@@ -45,6 +48,9 @@ struct _GdkColorStateClass
  GdkFloatColorConvert  (* get_convert_from)    (GdkColorState  *self,
                                                 GdkColorState  *source);
  const GdkCicp *       (* get_cicp)            (GdkColorState  *self);
+  void                  (* clamp)               (GdkColorState  *self,
+                                                 const float     src[4],
+                                                 float           dest[4]);
 };

 typedef struct _GdkDefaultColorState GdkDefaultColorState;
@@ -56,6 +62,9 @@ struct _GdkDefaultColorState
  const char *name;
  GdkColorState *no_srgb;
  GdkFloatColorConvert convert_to[GDK_COLOR_STATE_N_IDS];
+  void (* clamp) (GdkColorState  *self,
+                  const float     src[4],
+                  float           dest[4]);

  GdkCicp cicp;
 };
@@ -66,17 +75,23 @@ extern GdkDefaultColorState gdk_default_color_states[GDK_COLOR_STATE_N_IDS];
 #define GDK_COLOR_STATE_SRGB_LINEAR    ((GdkColorState *) &gdk_default_color_states[GDK_COLOR_STATE_ID_SRGB_LINEAR])
 #define GDK_COLOR_STATE_REC2100_PQ     ((GdkColorState *) &gdk_default_color_states[GDK_COLOR_STATE_ID_REC2100_PQ])
 #define GDK_COLOR_STATE_REC2100_LINEAR ((GdkColorState *) &gdk_default_color_states[GDK_COLOR_STATE_ID_REC2100_LINEAR])
+#define GDK_COLOR_STATE_OKLAB          ((GdkColorState *) &gdk_default_color_states[GDK_COLOR_STATE_ID_OKLAB])
+#define GDK_COLOR_STATE_OKLCH          ((GdkColorState *) &gdk_default_color_states[GDK_COLOR_STATE_ID_OKLCH])

 #define GDK_IS_DEFAULT_COLOR_STATE(c) ((GdkDefaultColorState *) (c) >= &gdk_default_color_states[0] && \
                                       (GdkDefaultColorState *) (c) < &gdk_default_color_states[GDK_COLOR_STATE_N_IDS])
 #define GDK_DEFAULT_COLOR_STATE_ID(c) ((GdkColorStateId) (((GdkDefaultColorState *) c) - gdk_default_color_states))

-const char *    gdk_color_state_get_name                (GdkColorState          *color_state);
+const char *    gdk_color_state_get_name                (GdkColorState          *self);
 GdkColorState * gdk_color_state_get_no_srgb_tf          (GdkColorState          *self);

 GdkColorState * gdk_color_state_new_for_cicp            (const GdkCicp          *cicp,
                                                         GError                **error);

+void            gdk_color_state_clamp                   (GdkColorState          *self,
+                                                         const float             src[4],
+                                                         float                   dest[4]);
+
 static inline GdkColorState *
 gdk_color_state_get_rendering_color_state (GdkColorState *self)
 {
@@ -84,9 +99,9 @@ gdk_color_state_get_rendering_color_state (GdkColorState *self)
    self = GDK_COLOR_STATE_REC2100_PQ;

  if (!GDK_DEBUG_CHECK (LINEAR))
-    return self;
+    return self->rendering_color_state;

-  return self->rendering_color_state;
+  return self->rendering_color_state_linear;
 }

 static inline GdkMemoryDepth
@@ -176,7 +191,10 @@ gdk_color_state_convert_color (GdkColorState *src_cs,
  GdkFloatColorConvert convert = NULL;
  GdkFloatColorConvert convert2 = NULL;

-  memcpy (dest, src, sizeof (float) * 4);
+  dest[0] = src[0];
+  dest[1] = src[1];
+  dest[2] = src[2];
+  dest[3] = src[3];

  if (gdk_color_state_equal (src_cs, dest_cs))
    return;
@@ -210,11 +228,3 @@ gdk_color_state_from_rgba (GdkColorState *self,
                                 self,
                                 out_color);
 }
-
-#ifndef GDK_COLOR_STATE_IMPL
-extern GdkColorState gdk_color_state_bt601_narrow;
-extern GdkColorState gdk_color_state_bt601_full;
-#endif
-
-#define GDK_COLOR_STATE_YUV  ((GdkColorState *) &gdk_color_state_bt601_narrow)
-#define GDK_COLOR_STATE_JPEG ((GdkColorState *) &gdk_color_state_bt601_full)
@@ -169,7 +169,7 @@ gdk_content_provider_class_init (GdkContentProviderClass *class)
  class->get_value = gdk_content_provider_real_get_value;

  /**
-   * GdkContentProvider:formats: (attributes org.gtk.Property.get=gdk_content_provider_ref_formats)
+   * GdkContentProvider:formats: (getter ref_formats)
   *
   * The possible formats that the provider can provide its data in.
   */
@@ -181,7 +181,7 @@ gdk_content_provider_class_init (GdkContentProviderClass *class)
                        G_PARAM_EXPLICIT_NOTIFY);

  /**
-   * GdkContentProvider:storable-formats: (attributes org.gtk.Property.get=gdk_content_provider_ref_storable_formats)
+   * GdkContentProvider:storable-formats: (getter ref_storable_formats)
   *
   * The subset of formats that clipboard managers should store this provider's data in.
   */
@@ -214,7 +214,7 @@ gdk_content_provider_init (GdkContentProvider *provider)
 }

 /**
- * gdk_content_provider_ref_formats: (attributes org.gtk.Method.get_property=formats)
+ * gdk_content_provider_ref_formats: (get-property formats)
 * @provider: a `GdkContentProvider`
 *
 * Gets the formats that the provider can provide its current contents in.
@@ -230,7 +230,7 @@ gdk_content_provider_ref_formats (GdkContentProvider *provider)
 }

 /**
- * gdk_content_provider_ref_storable_formats: (attributes org.gtk.Method.get_property=storable-formats)
+ * gdk_content_provider_ref_storable_formats: (get-property storable-formats)
 * @provider: a `GdkContentProvider`
 *
 * Gets the formats that the provider suggests other applications to store
@@ -172,7 +172,7 @@ gdk_cursor_class_init (GdkCursorClass *cursor_class)
  object_class->finalize = gdk_cursor_finalize;

  /**
-   * GdkCursor:fallback: (attributes org.gtk.Property.get=gdk_cursor_get_fallback)
+   * GdkCursor:fallback:
   *
   * Cursor to fall back to if this cursor cannot be displayed.
   */
@@ -184,7 +184,7 @@ gdk_cursor_class_init (GdkCursorClass *cursor_class)
                                                        G_PARAM_STATIC_STRINGS));

  /**
-   * GdkCursor:hotspot-x: (attributes org.gtk.Property.get=gdk_cursor_get_hotspot_x)
+   * GdkCursor:hotspot-x:
   *
   * X position of the cursor hotspot in the cursor image.
   */
@@ -196,7 +196,7 @@ gdk_cursor_class_init (GdkCursorClass *cursor_class)
                                                     G_PARAM_STATIC_STRINGS));

  /**
-   * GdkCursor:hotspot-y: (attributes org.gtk.Property.get=gdk_cursor_get_hotspot_y)
+   * GdkCursor:hotspot-y:
   *
   * Y position of the cursor hotspot in the cursor image.
   */
@@ -208,7 +208,7 @@ gdk_cursor_class_init (GdkCursorClass *cursor_class)
                                                     G_PARAM_STATIC_STRINGS));

  /**
-   * GdkCursor:name: (attributes org.gtk.Property.get=gdk_cursor_get_name)
+   * GdkCursor:name:
   *
   * Name of this this cursor.
   *
@@ -407,7 +407,7 @@ gdk_cursor_new_from_callback (GdkCursorGetTextureCallback  callback,
 }

 /**
- * gdk_cursor_get_fallback: (attributes org.gtk.Method.get_property=fallback)
+ * gdk_cursor_get_fallback:
 * @cursor: a `GdkCursor`
 *
 * Returns the fallback for this @cursor.
@@ -430,7 +430,7 @@ gdk_cursor_get_fallback (GdkCursor *cursor)
 }

 /**
- * gdk_cursor_get_name: (attributes org.gtk.Method.get_property=name)
+ * gdk_cursor_get_name:
 * @cursor: a `GdkCursor`
 *
 * Returns the name of the cursor.
@@ -468,7 +468,7 @@ gdk_cursor_get_texture (GdkCursor *cursor)
 }

 /**
- * gdk_cursor_get_hotspot_x: (attributes org.gtk.Method.get_property=hotspot-x)
+ * gdk_cursor_get_hotspot_x:
 * @cursor: a `GdkCursor`
 *
 * Returns the horizontal offset of the hotspot.
@@ -490,7 +490,7 @@ gdk_cursor_get_hotspot_x (GdkCursor *cursor)
 }

 /**
- * gdk_cursor_get_hotspot_y: (attributes org.gtk.Method.get_property=hotspot-y)
+ * gdk_cursor_get_hotspot_y:
 * @cursor: a `GdkCursor`
 *
 * Returns the vertical offset of the hotspot.
@@ -44,29 +44,38 @@ typedef enum {
  GDK_DEBUG_HDR             = 1 << 14,
  GDK_DEBUG_PORTALS         = 1 << 15,
  GDK_DEBUG_NO_PORTALS      = 1 << 16,
-  GDK_DEBUG_GL_DISABLE      = 1 << 17,
-  GDK_DEBUG_GL_NO_FRACTIONAL= 1 << 18,
-  GDK_DEBUG_FORCE_OFFLOAD   = 1 << 19,
-  GDK_DEBUG_GL_DISABLE_GL   = 1 << 20,
-  GDK_DEBUG_GL_DISABLE_GLES = 1 << 21,
-  GDK_DEBUG_GL_PREFER_GL    = 1 << 22,
-  GDK_DEBUG_GL_DEBUG        = 1 << 23,
-  GDK_DEBUG_GL_EGL          = 1 << 24,
-  GDK_DEBUG_GL_GLX          = 1 << 25,
-  GDK_DEBUG_GL_WGL          = 1 << 26,
-  GDK_DEBUG_VULKAN_DISABLE  = 1 << 27,
-  GDK_DEBUG_DEFAULT_SETTINGS= 1 << 28,
-  GDK_DEBUG_HIGH_DEPTH      = 1 << 29,
-  GDK_DEBUG_NO_VSYNC        = 1 << 30,
-  GDK_DEBUG_DMABUF_DISABLE  = 1 << 31,
+  GDK_DEBUG_GL_NO_FRACTIONAL= 1 << 17,
+  GDK_DEBUG_FORCE_OFFLOAD   = 1 << 18,
+  GDK_DEBUG_GL_PREFER_GL    = 1 << 19,
+  GDK_DEBUG_GL_DEBUG        = 1 << 20,
+  GDK_DEBUG_DEFAULT_SETTINGS= 1 << 21,
+  GDK_DEBUG_HIGH_DEPTH      = 1 << 22,
+  GDK_DEBUG_NO_VSYNC        = 1 << 23,
 } GdkDebugFlags;

+typedef enum {
+  GDK_FEATURE_OPENGL           = 1 << 0,
+  GDK_FEATURE_GL_API           = 1 << 1,
+  GDK_FEATURE_GLES_API         = 1 << 2,
+  GDK_FEATURE_EGL              = 1 << 3,
+  GDK_FEATURE_GLX              = 1 << 4,
+  GDK_FEATURE_WGL              = 1 << 5,
+  GDK_FEATURE_VULKAN           = 1 << 6,
+  GDK_FEATURE_DMABUF           = 1 << 7,
+  GDK_FEATURE_OFFLOAD          = 1 << 8,
+  GDK_FEATURE_COLOR_MANAGEMENT = 1 << 9,
+} GdkFeatures;
+
+#define GDK_ALL_FEATURES ((1 << 10) - 1)
+
 extern guint _gdk_debug_flags;

 GdkDebugFlags    gdk_display_get_debug_flags    (GdkDisplay       *display);
 void             gdk_display_set_debug_flags    (GdkDisplay       *display,
                                                 GdkDebugFlags     flags);

+gboolean         gdk_has_feature                (GdkFeatures       feature);
+
 static inline void
 gdk_debug_message (const char *format, ...) G_GNUC_PRINTF(1, 2);
 static inline void
@@ -106,6 +115,7 @@ typedef struct
 } GdkDebugKey;

 guint gdk_parse_debug_var (const char        *variable,
+                           const char        *docs,
                           const GdkDebugKey *keys,
                           guint              nkeys);

@@ -104,7 +104,7 @@ gdk_device_class_init (GdkDeviceClass *klass)
  object_class->get_property = gdk_device_get_property;

  /**
-   * GdkDevice:display: (attributes org.gtk.Property.get=gdk_device_get_display)
+   * GdkDevice:display:
   *
   * The `GdkDisplay` the `GdkDevice` pertains to.
   */
@@ -114,7 +114,7 @@ gdk_device_class_init (GdkDeviceClass *klass)
                           G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);

  /**
-   * GdkDevice:name: (attributes org.gtk.Property.get=gdk_device_get_name)
+   * GdkDevice:name:
   *
   * The device name.
   */
@@ -125,7 +125,7 @@ gdk_device_class_init (GdkDeviceClass *klass)
                           G_PARAM_STATIC_STRINGS);

  /**
-   * GdkDevice:source: (attributes org.gtk.Property.get=gdk_device_get_source)
+   * GdkDevice:source:
   *
   * Source type for the device.
   */
@@ -137,7 +137,7 @@ gdk_device_class_init (GdkDeviceClass *klass)
                         G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY);

  /**
-   * GdkDevice:has-cursor: (attributes org.gtk.Property.get=gdk_device_get_has_cursor)
+   * GdkDevice:has-cursor:
   *
   * Whether the device is represented by a cursor on the screen.
   */
@@ -159,7 +159,7 @@ gdk_device_class_init (GdkDeviceClass *klass)
                         G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);

  /**
-   * GdkDevice:vendor-id: (attributes org.gtk.Property.get=gdk_device_get_vendor_id)
+   * GdkDevice:vendor-id:
   *
   * Vendor ID of this device.
   *
@@ -172,7 +172,7 @@ gdk_device_class_init (GdkDeviceClass *klass)
                           G_PARAM_STATIC_STRINGS);

  /**
-   * GdkDevice:product-id: (attributes org.gtk.Property.get=gdk_device_get_product_id)
+   * GdkDevice:product-id:
   *
   * Product ID of this device.
   *
@@ -185,7 +185,7 @@ gdk_device_class_init (GdkDeviceClass *klass)
                           G_PARAM_STATIC_STRINGS);

  /**
-   * GdkDevice:seat: (attributes org.gtk.Property.get=gdk_device_get_seat)
+   * GdkDevice:seat:
   *
   * `GdkSeat` of this device.
   */
@@ -196,7 +196,7 @@ gdk_device_class_init (GdkDeviceClass *klass)
                           G_PARAM_STATIC_STRINGS);

  /**
-   * GdkDevice:num-touches: (attributes org.gtk.Property.get=gdk_device_get_num_touches)
+   * GdkDevice:num-touches:
   *
   * The maximal number of concurrent touches on a touch device.
   *
@@ -211,7 +211,7 @@ gdk_device_class_init (GdkDeviceClass *klass)
                         G_PARAM_STATIC_STRINGS);

  /**
-   * GdkDevice:tool: (attributes org.gtk.Property.get=gdk_device_get_device_tool)
+   * GdkDevice:tool: (getter get_device_tool)
   *
   * The `GdkDeviceTool` that is currently used with this device.
   */
@@ -221,7 +221,7 @@ gdk_device_class_init (GdkDeviceClass *klass)
                         G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);

  /**
-   * GdkDevice:direction: (attributes org.gtk.Property.get=gdk_device_get_direction)
+   * GdkDevice:direction:
   *
   * The direction of the current layout.
   *
@@ -233,7 +233,7 @@ gdk_device_class_init (GdkDeviceClass *klass)
                         G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);

  /**
-   * GdkDevice:has-bidi-layouts: (attributes org.gtk.Property.get=gdk_device_has_bidi_layouts)
+   * GdkDevice:has-bidi-layouts:
   *
   * Whether the device has both right-to-left and left-to-right layouts.
   *
@@ -245,7 +245,7 @@ gdk_device_class_init (GdkDeviceClass *klass)
                            G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);

  /**
-   * GdkDevice:caps-lock-state: (attributes org.gtk.Property.get=gdk_device_get_caps_lock_state)
+   * GdkDevice:caps-lock-state:
   *
   * Whether Caps Lock is on.
   *
@@ -257,7 +257,7 @@ gdk_device_class_init (GdkDeviceClass *klass)
                            G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);

  /**
-   * GdkDevice:num-lock-state: (attributes org.gtk.Property.get=gdk_device_get_num_lock_state)
+   * GdkDevice:num-lock-state:
   *
   * Whether Num Lock is on.
   *
@@ -269,7 +269,7 @@ gdk_device_class_init (GdkDeviceClass *klass)
                            G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);

  /**
-   * GdkDevice:scroll-lock-state: (attributes org.gtk.Property.get=gdk_device_get_scroll_lock_state)
+   * GdkDevice:scroll-lock-state:
   *
   * Whether Scroll Lock is on.
   *
@@ -281,7 +281,7 @@ gdk_device_class_init (GdkDeviceClass *klass)
                            G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);

  /**
-   * GdkDevice:modifier-state: (attributes org.gtk.Property.get=gdk_device_get_modifier_state)
+   * GdkDevice:modifier-state:
   *
   * The current modifier state of the device.
   *
@@ -540,7 +540,7 @@ gdk_device_get_name (GdkDevice *device)
 }

 /**
- * gdk_device_get_has_cursor: (attributes org.gtk.Method.get_property=has-cursor)
+ * gdk_device_get_has_cursor:
 * @device: a `GdkDevice`
 *
 * Determines whether the pointer follows device motion.
@@ -559,7 +559,7 @@ gdk_device_get_has_cursor (GdkDevice *device)
 }

 /**
- * gdk_device_get_source: (attributes org.gtk.Method.get_property=source)
+ * gdk_device_get_source:
 * @device: a `GdkDevice`
 *
 * Determines the type of the device.
@@ -599,7 +599,7 @@ gdk_device_get_axis_use (GdkDevice *device,
 }

 /**
- * gdk_device_get_display: (attributes org.gtk.Method.get_property=display)
+ * gdk_device_get_display:
 * @device: a `GdkDevice`
 *
 * Returns the `GdkDisplay` to which @device pertains.
@@ -1082,7 +1082,7 @@ _gdk_device_surface_at_position (GdkDevice       *device,
 }

 /**
- * gdk_device_get_vendor_id: (attributes org.gtk.Method.get_property=vendor-id)
+ * gdk_device_get_vendor_id:
 * @device: a physical `GdkDevice`
 *
 * Returns the vendor ID of this device.
@@ -1124,7 +1124,7 @@ gdk_device_get_vendor_id (GdkDevice *device)
 }

 /**
- * gdk_device_get_product_id: (attributes org.gtk.Method.get_property=product-id)
+ * gdk_device_get_product_id:
 * @device: a physical `GdkDevice`
 *
 * Returns the product ID of this device.
@@ -1157,7 +1157,7 @@ gdk_device_set_seat (GdkDevice *device,
 }

 /**
- * gdk_device_get_seat: (attributes org.gtk.Method.get_property=seat)
+ * gdk_device_get_seat:
 * @device: A `GdkDevice`
 *
 * Returns the `GdkSeat` the device belongs to.
@@ -1202,7 +1202,7 @@ gdk_device_get_num_touches (GdkDevice *device)
 }

 /**
- * gdk_device_get_device_tool: (attributes org.gtk.Method.get_property=tool)
+ * gdk_device_get_device_tool: (get-property tool)
 * @device: a `GdkDevice`
 *
 * Retrieves the current tool for @device.
@@ -1218,7 +1218,7 @@ gdk_device_get_device_tool (GdkDevice *device)
 }

 /**
- * gdk_device_get_caps_lock_state: (attributes org.gtk.Method.get_property=caps-lock-state)
+ * gdk_device_get_caps_lock_state:
 * @device: a `GdkDevice`
 *
 * Retrieves whether the Caps Lock modifier of the keyboard is locked.
@@ -1239,7 +1239,7 @@ gdk_device_get_caps_lock_state (GdkDevice *device)
 }

 /**
- * gdk_device_get_num_lock_state: (attributes org.gtk.Method.get_property=num-lock-state)
+ * gdk_device_get_num_lock_state:
 * @device: a ``GdkDevice`
 *
 * Retrieves whether the Num Lock modifier of the keyboard is locked.
@@ -1260,7 +1260,7 @@ gdk_device_get_num_lock_state (GdkDevice *device)
 }

 /**
- * gdk_device_get_scroll_lock_state: (attributes org.gtk.Method.get_property=scroll-lock-state)
+ * gdk_device_get_scroll_lock_state:
 * @device: a `GdkDevice`
 *
 * Retrieves whether the Scroll Lock modifier of the keyboard is locked.
@@ -1281,7 +1281,7 @@ gdk_device_get_scroll_lock_state (GdkDevice *device)
 }

 /**
- * gdk_device_get_modifier_state: (attributes org.gtk.Method.get_property=modifier-state)
+ * gdk_device_get_modifier_state:
 * @device: a `GdkDevice`
 *
 * Retrieves the current modifier state of the keyboard.
@@ -1302,7 +1302,7 @@ gdk_device_get_modifier_state (GdkDevice *device)
 }

 /**
- * gdk_device_get_direction: (attributes org.gtk.Method.get_property=direction)
+ * gdk_device_get_direction:
 * @device: a `GdkDevice`
 *
 * Returns the direction of effective layout of the keyboard.
@@ -1328,7 +1328,7 @@ gdk_device_get_direction (GdkDevice *device)
 }

 /**
- * gdk_device_has_bidi_layouts: (attributes org.gtk.Method.get_property=has-bidi-layouts)
+ * gdk_device_has_bidi_layouts:
 * @device: a `GdkDevice`
 *
 * Determines if layouts for both right-to-left and
@@ -117,7 +117,7 @@ struct _GdkDeviceClass
 };

 void  _gdk_device_set_associated_device (GdkDevice *device,
-                                         GdkDevice *relative);
+                                         GdkDevice *associated);

 void  _gdk_device_reset_axes (GdkDevice   *device);
 guint _gdk_device_add_axis   (GdkDevice   *device,
@@ -107,7 +107,7 @@ gdk_device_tool_class_init (GdkDeviceToolClass *klass)
  object_class->get_property = gdk_device_tool_get_property;

  /**
-   * GdkDeviceTool:serial: (attributes org.gtk.Property.get=gdk_device_tool_get_serial)
+   * GdkDeviceTool:serial:
   *
   * The serial number of the tool.
   */
@@ -118,7 +118,7 @@ gdk_device_tool_class_init (GdkDeviceToolClass *klass)
                                                      G_PARAM_STATIC_STRINGS);

  /**
-   * GdkDeviceTool:tool-type: (attributes org.gtk.Property.get=gdk_device_tool_get_tool_type)
+   * GdkDeviceTool:tool-type:
   *
   * The type of the tool.
   */
@@ -130,7 +130,7 @@ gdk_device_tool_class_init (GdkDeviceToolClass *klass)
                                                       G_PARAM_STATIC_STRINGS);

  /**
-   * GdkDeviceTool:axes: (attributes org.gtk.Property.get=gdk_device_tool_get_axes)
+   * GdkDeviceTool:axes:
   *
   * The axes of the tool.
   */
@@ -140,7 +140,7 @@ gdk_device_tool_class_init (GdkDeviceToolClass *klass)
                                                   G_PARAM_CONSTRUCT_ONLY);

  /**
-   * GdkDeviceTool:hardware-id: (attributes org.gtk.Property.get=gdk_device_tool_get_hardware_id)
+   * GdkDeviceTool:hardware-id:
   *
   * The hardware ID of the tool.
   */
@@ -173,7 +173,7 @@ gdk_device_tool_new (guint64           serial,
 }

 /**
- * gdk_device_tool_get_serial: (attributes org.gtk.Method.get_property=serial)
+ * gdk_device_tool_get_serial:
 * @tool: a `GdkDeviceTool`
 *
 * Gets the serial number of this tool.
@@ -192,7 +192,7 @@ gdk_device_tool_get_serial (GdkDeviceTool *tool)
 }

 /**
- * gdk_device_tool_get_hardware_id: (attributes org.gtk.Method.get_property=hardware-id)
+ * gdk_device_tool_get_hardware_id:
 * @tool: a `GdkDeviceTool`
 *
 * Gets the hardware ID of this tool, or 0 if it's not known.
@@ -218,7 +218,7 @@ gdk_device_tool_get_hardware_id (GdkDeviceTool *tool)
 }

 /**
- * gdk_device_tool_get_tool_type: (attributes org.gtk.Method.get_property=tool-type)
+ * gdk_device_tool_get_tool_type:
 * @tool: a `GdkDeviceTool`
 *
 * Gets the `GdkDeviceToolType` of the tool.
@@ -236,7 +236,7 @@ gdk_device_tool_get_tool_type (GdkDeviceTool *tool)
 }

 /**
- * gdk_device_tool_get_axes: (attributes org.gtk.Method.get_property=axes)
+ * gdk_device_tool_get_axes:
 * @tool: a `GdkDeviceTool`
 *
 * Gets the axes of the tool.
@@ -230,7 +230,7 @@ gdk_display_class_init (GdkDisplayClass *class)
  class->opened = gdk_display_real_opened;

  /**
-   * GdkDisplay:composited: (attributes org.gtk.Property.get=gdk_display_is_composited)
+   * GdkDisplay:composited: (getter is_composited)
   *
   * %TRUE if the display properly composites the alpha channel.
   */
@@ -240,7 +240,7 @@ gdk_display_class_init (GdkDisplayClass *class)
                          G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);

  /**
-   * GdkDisplay:rgba: (attributes org.gtk.Property.get=gdk_display_is_rgba)
+   * GdkDisplay:rgba: (getter is_rgba)
   *
   * %TRUE if the display supports an alpha channel.
   */
@@ -250,7 +250,7 @@ gdk_display_class_init (GdkDisplayClass *class)
                          G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);

  /**
-   * GdkDisplay:shadow-width: (attributes org.gtk.Property.get=gdk_display_supports_shadow_width)
+   * GdkDisplay:shadow-width: (getter supports_shadow_width)
   *
   * %TRUE if the display supports extensible frames.
   *
@@ -262,7 +262,7 @@ gdk_display_class_init (GdkDisplayClass *class)
                          G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);

  /**
-   * GdkDisplay:input-shapes: (attributes org.gtk.Property.get=gdk_display_supports_input_shapes)
+   * GdkDisplay:input-shapes: (getter supports_input_shapes)
   *
   * %TRUE if the display supports input shapes.
   */
@@ -272,7 +272,7 @@ gdk_display_class_init (GdkDisplayClass *class)
                          G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);

  /**
-   * GdkDisplay:dmabuf-formats: (attributes org.gtk.Property.get=gdk_display_get_dmabuf_formats)
+   * GdkDisplay:dmabuf-formats:
   *
   * The dma-buf formats that are supported on this display
   *
@@ -418,15 +418,17 @@ gdk_display_dispose (GObject *object)
 {
  GdkDisplay *display = GDK_DISPLAY (object);
  GdkDisplayPrivate *priv = gdk_display_get_instance_private (display);
-  gsize i;

-  for (i = 0; i < G_N_ELEMENTS (display->dmabuf_downloaders); i++)
+  if (display->vk_downloader)
    {
-      if (display->dmabuf_downloaders[i] == NULL)
-        continue;
+      gdk_dmabuf_downloader_close (display->vk_downloader);
+      g_clear_object (&display->vk_downloader);
+    }

-      gdk_dmabuf_downloader_close (display->dmabuf_downloaders[i]);
-      g_clear_object (&display->dmabuf_downloaders[i]);
+  if (display->egl_downloader)
+    {
+      gdk_dmabuf_downloader_close (display->egl_downloader);
+      g_clear_object (&display->egl_downloader);
    }

  _gdk_display_manager_remove_display (gdk_display_manager_get (), display);
@@ -434,7 +436,7 @@ gdk_display_dispose (GObject *object)
  g_queue_clear (&display->queued_events);

  g_clear_pointer (&display->egl_dmabuf_formats, gdk_dmabuf_formats_unref);
-  g_clear_pointer (&display->egl_external_formats, gdk_dmabuf_formats_unref);
+  g_clear_pointer (&display->egl_internal_formats, gdk_dmabuf_formats_unref);
 #ifdef GDK_RENDERING_VULKAN
  if (display->vk_dmabuf_formats)
    {
@@ -1116,7 +1118,7 @@ gdk_display_get_primary_clipboard (GdkDisplay *display)
 }

 /**
- * gdk_display_supports_input_shapes: (attributes org.gtk.Method.get_property=input-shapes)
+ * gdk_display_supports_input_shapes: (get-property input-shapes)
 * @display: a `GdkDisplay`
 *
 * Returns %TRUE if the display supports input shapes.
@@ -1309,10 +1311,10 @@ gdk_display_create_vulkan_context (GdkDisplay  *self,
  g_return_val_if_fail (surface == NULL || GDK_IS_SURFACE (surface), NULL);
  g_return_val_if_fail (error == NULL || *error == NULL, NULL);

-  if (gdk_display_get_debug_flags (self) & GDK_DEBUG_VULKAN_DISABLE)
+  if (!gdk_has_feature (GDK_FEATURE_VULKAN))
    {
      g_set_error_literal (error, GDK_VULKAN_ERROR, GDK_VULKAN_ERROR_NOT_AVAILABLE,
-                           _("Vulkan support disabled via GDK_DEBUG"));
+                           _("Vulkan support disabled via GDK_DISABLE"));
      return NULL;
    }

@@ -1362,11 +1364,11 @@ gdk_display_init_gl (GdkDisplay *self)

  before = GDK_PROFILER_CURRENT_TIME;

-  if (gdk_display_get_debug_flags (self) & GDK_DEBUG_GL_DISABLE)
+  if (!gdk_has_feature (GDK_FEATURE_OPENGL))
    {
      g_set_error_literal (&priv->gl_error, GDK_GL_ERROR,
                           GDK_GL_ERROR_NOT_AVAILABLE,
-                           _("GL support disabled via GDK_DEBUG"));
+                           _("OpenGL support disabled via GDK_DISABLE"));
      return;
    }

@@ -1965,33 +1967,6 @@ gdk_display_get_egl_display (GdkDisplay *self)
 #endif
 }

-#ifdef HAVE_DMABUF
-static void
-gdk_display_add_dmabuf_downloader (GdkDisplay          *display,
-                                   GdkDmabufDownloader *downloader)
-{
-  gsize i;
-
-  if (downloader == NULL)
-    return;
-
-  /* dmabuf_downloaders is NULL-terminated */
-  for (i = 0; i < G_N_ELEMENTS (display->dmabuf_downloaders) - 1; i++)
-    {
-      if (display->dmabuf_downloaders[i] == NULL)
-        break;
-    }
-
-  g_assert (i < G_N_ELEMENTS (display->dmabuf_downloaders) - 1);
-
-  display->dmabuf_downloaders[i] = downloader;
-}
-#endif
-
-/* To support a drm format, we must be able to import it into GL
- * using the relevant EGL extensions, and download it into a memory
- * texture, possibly doing format conversion with shaders (in GSK).
- */
 void
 gdk_display_init_dmabuf (GdkDisplay *self)
 {
@@ -2006,25 +1981,28 @@ gdk_display_init_dmabuf (GdkDisplay *self)
  builder = gdk_dmabuf_formats_builder_new ();

 #ifdef HAVE_DMABUF
-  if (!GDK_DISPLAY_DEBUG_CHECK (self, DMABUF_DISABLE))
+  if (gdk_has_feature (GDK_FEATURE_DMABUF))
    {
 #ifdef GDK_RENDERING_VULKAN
-      gdk_display_add_dmabuf_downloader (self, gdk_vulkan_get_dmabuf_downloader (self, builder));
+      gdk_vulkan_init_dmabuf (self);
+      if (self->vk_dmabuf_formats)
+        gdk_dmabuf_formats_builder_add_formats (builder, self->vk_dmabuf_formats);
 #endif

 #ifdef HAVE_EGL
-      gdk_display_add_dmabuf_downloader (self, gdk_dmabuf_get_egl_downloader (self, builder));
+      gdk_dmabuf_egl_init (self);
+      if (self->egl_dmabuf_formats)
+        gdk_dmabuf_formats_builder_add_formats (builder, self->egl_dmabuf_formats);
 #endif

-      gdk_dmabuf_formats_builder_add_formats (builder,
-                                              gdk_dmabuf_get_mmap_formats ());
+      gdk_dmabuf_formats_builder_add_formats (builder, gdk_dmabuf_get_mmap_formats ());
    }
 #endif

  self->dmabuf_formats = gdk_dmabuf_formats_builder_free_to_formats (builder);

  GDK_DISPLAY_DEBUG (self, DMABUF,
-                     "Initialized support for %zu dmabuf formats",
+                     "Initialization finished. Advertising %zu dmabuf formats",
                     gdk_dmabuf_formats_get_n_formats (self->dmabuf_formats));
 }

@@ -2075,7 +2053,7 @@ gdk_display_set_debug_flags (GdkDisplay    *display,
 }

 /**
- * gdk_display_is_composited: (attributes org.gtk.Method.get_property=composited)
+ * gdk_display_is_composited: (get-property composited)
 * @display: a `GdkDisplay`
 *
 * Returns whether surfaces can reasonably be expected to have
@@ -2120,7 +2098,7 @@ gdk_display_set_composited (GdkDisplay *display,
 }

 /**
- * gdk_display_is_rgba: (attributes org.gtk.Method.get_property=rgba)
+ * gdk_display_is_rgba: (get-property rgba)
 * @display: a `GdkDisplay`
 *
 * Returns whether surfaces on this @display are created with an
@@ -2165,7 +2143,7 @@ gdk_display_set_rgba (GdkDisplay *display,
 }

 /**
- * gdk_display_supports_shadow_width: (attributes org.gtk.Method.get_property=shadow-width)
+ * gdk_display_supports_shadow_width: (get-property shadow-width)
 * @display: a `GdkDisplay`
 *
 * Returns whether it's possible for a surface to draw outside of the window area.
@@ -149,7 +149,7 @@ gdk_display_manager_class_init (GdkDisplayManagerClass *klass)
                  GDK_TYPE_DISPLAY);

  /**
-   * GdkDisplayManager:default-display: (attributes org.gtk.Property.get=gdk_display_manager_get_default_display)
+   * GdkDisplayManager:default-display:
   *
   * The default display.
   */
@@ -301,7 +301,7 @@ gdk_display_manager_get (void)
 }

 /**
- * gdk_display_manager_get_default_display: (attributes org.gtk.Method.get_property=default-display)
+ * gdk_display_manager_get_default_display:
 * @manager: a `GdkDisplayManager`
 *
 * Gets the default `GdkDisplay`.
@@ -48,6 +48,7 @@ typedef enum {
  GDK_VULKAN_FEATURE_SEMAPHORE_EXPORT           = 1 << 2,
  GDK_VULKAN_FEATURE_SEMAPHORE_IMPORT           = 1 << 3,
  GDK_VULKAN_FEATURE_INCREMENTAL_PRESENT        = 1 << 4,
+  GDK_VULKAN_FEATURE_SWAPCHAIN_MAINTENANCE      = 1 << 5,
 } GdkVulkanFeatures;

 /* Tracks information about the device grab on this display */
@@ -131,11 +132,12 @@ struct _GdkDisplay
  guint have_egl_gl_colorspace : 1;

  GdkDmabufFormats *dmabuf_formats;
-  GdkDmabufDownloader *dmabuf_downloaders[4];
+  GdkDmabufDownloader *egl_downloader;
+  GdkDmabufDownloader *vk_downloader;

   /* Cached data the EGL dmabuf downloader */
  GdkDmabufFormats *egl_dmabuf_formats;
-  GdkDmabufFormats *egl_external_formats;
+  GdkDmabufFormats *egl_internal_formats;
 };

 struct _GdkDisplayClass
@@ -238,15 +240,15 @@ GdkVulkanContext *  gdk_display_create_vulkan_context (GdkDisplay       *self,
                                                       GdkSurface       *surface,
                                                       GError          **error);

-GdkGLContext *      gdk_display_get_gl_context        (GdkDisplay       *display);
+GdkGLContext *      gdk_display_get_gl_context        (GdkDisplay       *self);

-gboolean            gdk_display_init_egl              (GdkDisplay       *display,
+gboolean            gdk_display_init_egl              (GdkDisplay       *self,
                                                       int /*EGLenum*/   platform,
                                                       gpointer          native_display,
                                                       gboolean          allow_any,
                                                       GError          **error);
-gpointer            gdk_display_get_egl_display       (GdkDisplay       *display);
-gpointer            gdk_display_get_egl_config        (GdkDisplay       *display,
+gpointer            gdk_display_get_egl_display       (GdkDisplay       *self);
+gpointer            gdk_display_get_egl_config        (GdkDisplay       *self,
                                                       GdkMemoryDepth    depth);

 void                gdk_display_set_rgba              (GdkDisplay       *display,
@@ -287,7 +289,7 @@ void gdk_display_set_double_click_time     (GdkDisplay   *display,
 void gdk_display_set_double_click_distance (GdkDisplay   *display,
                                            guint         distance);
 void gdk_display_set_cursor_theme          (GdkDisplay   *display,
-                                            const char   *theme,
+                                            const char   *name,
                                            int           size);

 G_END_DECLS
@@ -24,7 +24,6 @@
 #include "gdkdmabuffourccprivate.h"
 #include "gdkdmabuftextureprivate.h"
 #include "gdkmemoryformatprivate.h"
-#include "gdkcolorstate.h"

 #ifdef HAVE_DMABUF
 #include <sys/mman.h>
@@ -134,6 +133,49 @@ download_memcpy_3_1 (guchar          *dst_data,
    }
 }

+typedef struct _YUVCoefficients YUVCoefficients;
+
+struct _YUVCoefficients
+{
+  int v_to_r;
+  int u_to_g;
+  int v_to_g;
+  int u_to_b;
+};
+
+/* multiplied by 65536 */
+static const YUVCoefficients itu601_narrow = { 104597, -25675, -53279, 132201 };
+//static const YUVCoefficients itu601_wide = { 74711, -25864, -38050, 133176 };
+
+static inline void
+get_uv_values (const YUVCoefficients *coeffs,
+               guint8                 u,
+               guint8                 v,
+               int                   *out_r,
+               int                   *out_g,
+               int                   *out_b)
+{
+  int u2 = (int) u - 127;
+  int v2 = (int) v - 127;
+  *out_r = coeffs->v_to_r * v2;
+  *out_g = coeffs->u_to_g * u2 + coeffs->v_to_g * v2;
+  *out_b = coeffs->u_to_b * u2;
+}
+
+static inline void
+set_rgb_values (guint8 rgb[3],
+                guint8 y,
+                int    r,
+                int    g,
+                int    b)
+{
+  int y2 = y * 65536;
+
+  rgb[0] = CLAMP ((y2 + r) >> 16, 0, 255);
+  rgb[1] = CLAMP ((y2 + g) >> 16, 0, 255);
+  rgb[2] = CLAMP ((y2 + b) >> 16, 0, 255);
+}
+
 static void
 download_nv12 (guchar          *dst_data,
               gsize            dst_stride,
@@ -184,21 +226,14 @@ download_nv12 (guchar          *dst_data,
    {
      for (x = 0; x < width; x += X_SUB)
        {
-          int u_, v_;
+          int r, g, b;
          gsize xs, ys;

-          u_ = uv_data[x / X_SUB * 2 + U];
-          v_ = uv_data[x / X_SUB * 2 + V];
+          get_uv_values (&itu601_narrow, uv_data[x / X_SUB * 2 + U], uv_data[x / X_SUB * 2 + V], &r, &g, &b);

          for (ys = 0; ys < Y_SUB && y + ys < height; ys++)
            for (xs = 0; xs < X_SUB && x + xs < width; xs++)
-              {
-                guint8 *rgb = &dst_data[3 * (x + xs) + dst_stride * ys];
-
-                rgb[0] = y_data[x + xs + y_stride * ys];
-                rgb[1] = u_;
-                rgb[2] = v_;
-              }
+              set_rgb_values (&dst_data[3 * (x + xs) + dst_stride * ys], y_data[x + xs + y_stride * ys], r, g, b);
        }
      dst_data += Y_SUB * dst_stride;
      y_data += Y_SUB * y_stride;
@@ -206,6 +241,35 @@ download_nv12 (guchar          *dst_data,
    }
 }

+static inline void
+get_uv_values16 (const YUVCoefficients *coeffs,
+                 guint16                u,
+                 guint16                v,
+                 gint64                *out_r,
+                 gint64                *out_g,
+                 gint64                *out_b)
+{
+  gint64 u2 = (gint64) u - 32767;
+  gint64 v2 = (gint64) v - 32767;
+  *out_r = coeffs->v_to_r * v2;
+  *out_g = coeffs->u_to_g * u2 + coeffs->v_to_g * v2;
+  *out_b = coeffs->u_to_b * u2;
+}
+
+static inline void
+set_rgb_values16 (guint16 rgb[3],
+                  guint16 y,
+                  gint64  r,
+                  gint64  g,
+                  gint64  b)
+{
+  gint64 y2 = (gint64) y * 65536;
+
+  rgb[0] = CLAMP ((y2 + r) >> 16, 0, 65535);
+  rgb[1] = CLAMP ((y2 + g) >> 16, 0, 65535);
+  rgb[2] = CLAMP ((y2 + b) >> 16, 0, 65535);
+}
+
 static void
 download_p010 (guchar          *dst,
               gsize            dst_stride,
@@ -220,7 +284,7 @@ download_p010 (guchar          *dst,
  guint16 *dst_data;
  gsize x, y, y_stride, uv_stride;
  gsize U, V, X_SUB, Y_SUB;
-  guint16 SIZE;
+  guint16 SIZE, MASK;

  switch (dmabuf->fourcc)
    {
@@ -240,6 +304,7 @@ download_p010 (guchar          *dst,
      g_assert_not_reached ();
      return;
    }
+  MASK = 0xFFFF << (16 - SIZE);

  y_stride = dmabuf->planes[0].stride / 2;
  y_data = (const guint16 *) (src_data[0] + dmabuf->planes[0].offset);
@@ -254,24 +319,22 @@ download_p010 (guchar          *dst,
    {
      for (x = 0; x < width; x += X_SUB)
        {
+          gint64 r, g, b;
          gsize xs, ys;
-          guint16 u_, v_;
+          guint16 u, v;

-          u_ = uv_data[x / X_SUB * 2 + U];
-          u_ = u_ | (u_ >> SIZE);
-          v_ = uv_data[x / X_SUB * 2 + V];
-          v_ = v_ | (v_ >> SIZE);
+          u = uv_data[x / X_SUB * 2 + U];
+          u = (u & MASK) | (u >> SIZE);
+          v = uv_data[x / X_SUB * 2 + V];
+          v = (v & MASK) | (v >> SIZE);
+          get_uv_values16 (&itu601_narrow, u, v, &r, &g, &b);

          for (ys = 0; ys < Y_SUB && y + ys < height; ys++)
            for (xs = 0; xs < X_SUB && x + xs < width; xs++)
              {
-                guint16 *rgb = &dst_data[3 * (x + xs) + dst_stride * ys];
                guint16 y_ = y_data[x + xs + y_stride * ys];
-                y_ = y_ | (y_ >> SIZE);
-
-                rgb[0] = y_;
-                rgb[1] = u_;
-                rgb[2] = v_;
+                y_ = (y_ & MASK) | (y_ >> SIZE);
+                set_rgb_values16 (&dst_data[3 * (x + xs) + dst_stride * ys], y_, r, g, b);
              }
        }
      dst_data += Y_SUB * dst_stride;
@@ -345,21 +408,14 @@ download_yuv_3 (guchar          *dst_data,
    {
      for (x = 0; x < width; x += X_SUB)
        {
-          int u_, v_;
+          int r, g, b;
          gsize xs, ys;

-          u_ = u_data[x / X_SUB];
-          v_ = v_data[x / X_SUB];
+          get_uv_values (&itu601_narrow, u_data[x / X_SUB], v_data[x / X_SUB], &r, &g, &b);

          for (ys = 0; ys < Y_SUB && y + ys < height; ys++)
            for (xs = 0; xs < X_SUB && x + xs < width; xs++)
-              {
-                guint8 *rgb = &dst_data[3 * (x + xs) + dst_stride * ys];
-
-                rgb[0] = y_data[x + xs + y_stride * ys];
-                rgb[1] = u_;
-                rgb[2] = v_;
-              }
+              set_rgb_values (&dst_data[3 * (x + xs) + dst_stride * ys], y_data[x + xs + y_stride * ys], r, g, b);
        }
      dst_data += Y_SUB * dst_stride;
      y_data += Y_SUB * y_stride;
@@ -409,23 +465,12 @@ download_yuyv (guchar          *dst_data,
    {
      for (x = 0; x < width; x += 2)
        {
-          guint8 *rgb;
-          int u_, v_;
+          int r, g, b;

-          u_ = src_data[2 * x + U];
-          v_ = src_data[2 * x + V];
-
-          rgb = &dst_data[3 * x];
-          rgb[0] = src_data[2 * x + Y1];
-          rgb[1] = u_;
-          rgb[2] = v_;
+          get_uv_values (&itu601_narrow, src_data[2 * x + U], src_data[2 * x + V], &r, &g, &b);
+          set_rgb_values (&dst_data[3 * x], src_data[2 * x + Y1], r, g, b);
          if (x + 1 < width)
-            {
-              rgb = &dst_data[3 * (x + 1)];
-              rgb[0] = src_data[2 * x + Y2];
-              rgb[1] = u_;
-              rgb[2] = v_;
-            }
+            set_rgb_values (&dst_data[3 * (x + 1)], src_data[2 * x + Y2], r, g, b);
        }
      dst_data += dst_stride;
      src_data += src_stride;
@@ -2023,7 +2068,7 @@ gdk_dmabuf_get_mmap_formats (void)
            continue;

          GDK_DEBUG (DMABUF,
-                     "mmap dmabuf format %.4s:%#0" G_GINT64_MODIFIER "x",
+                     "mmap advertises dmabuf format %.4s::%016" G_GINT64_MODIFIER "x",
                     (char *) &supported_formats[i].fourcc, (guint64) DRM_FORMAT_MOD_LINEAR);

          gdk_dmabuf_formats_builder_add_format (builder,
@@ -2037,7 +2082,7 @@ gdk_dmabuf_get_mmap_formats (void)
  return formats;
 }

-static void
+static gboolean
 gdk_dmabuf_do_download_mmap (GdkTexture *texture,
                             guchar     *data,
                             gsize       stride)
@@ -2048,16 +2093,17 @@ gdk_dmabuf_do_download_mmap (GdkTexture *texture,
  gsize sizes[GDK_DMABUF_MAX_PLANES];
  gsize needs_unmap[GDK_DMABUF_MAX_PLANES] = { FALSE, };
  gsize i, j;
+  gboolean retval = FALSE;

  dmabuf = gdk_dmabuf_texture_get_dmabuf (GDK_DMABUF_TEXTURE (texture));
+
+  if (dmabuf->modifier != DRM_FORMAT_MOD_LINEAR)
+    return FALSE;
+
  info = get_drm_format_info (dmabuf->fourcc);

-  g_return_if_fail (info && info->download);
-
-  GDK_DISPLAY_DEBUG (gdk_dmabuf_texture_get_display (GDK_DMABUF_TEXTURE (texture)), DMABUF,
-                     "Using mmap for downloading %dx%d dmabuf (format %.4s:%#" G_GINT64_MODIFIER "x)",
-                     gdk_texture_get_width (texture), gdk_texture_get_height (texture),
-                     (char *)&dmabuf->fourcc, dmabuf->modifier);
+  if (!info || !info->download)
+    return FALSE;

  for (i = 0; i < dmabuf->n_planes; i++)
    {
@@ -2103,6 +2149,13 @@ gdk_dmabuf_do_download_mmap (GdkTexture *texture,
                  src_data,
                  sizes);

+  retval = TRUE;
+
+  GDK_DISPLAY_DEBUG (gdk_dmabuf_texture_get_display (GDK_DMABUF_TEXTURE (texture)), DMABUF,
+                     "Used mmap for downloading %dx%d dmabuf (format %.4s:%#" G_GINT64_MODIFIER "x)",
+                     gdk_texture_get_width (texture), gdk_texture_get_height (texture),
+                     (char *)&dmabuf->fourcc, dmabuf->modifier);
+
 out:
  for (i = 0; i < dmabuf->n_planes; i++)
    {
@@ -2114,9 +2167,11 @@ out:
      if (gdk_dmabuf_ioctl (dmabuf->planes[i].fd, DMA_BUF_IOCTL_SYNC, &(struct dma_buf_sync) { DMA_BUF_SYNC_END|DMA_BUF_SYNC_READ }) < 0)
        g_warning ("Failed to sync dmabuf: %s", g_strerror (errno));
    }
+
+  return retval;
 }

-void
+gboolean
 gdk_dmabuf_download_mmap (GdkTexture      *texture,
                          GdkMemoryFormat  format,
                          GdkColorState   *color_state,
@@ -2125,10 +2180,11 @@ gdk_dmabuf_download_mmap (GdkTexture      *texture,
 {
  GdkMemoryFormat src_format = gdk_texture_get_format (texture);
  GdkColorState *src_color_state = gdk_texture_get_color_state (texture);
+  gboolean retval;

  if (format == src_format)
    {
-      gdk_dmabuf_do_download_mmap (texture, data, stride);
+      retval = gdk_dmabuf_do_download_mmap (texture, data, stride);
      gdk_memory_convert_color_state (data, stride, format,
                                      src_color_state, color_state,
                                      gdk_texture_get_width (texture),
@@ -2146,7 +2202,7 @@ gdk_dmabuf_download_mmap (GdkTexture      *texture,
      src_stride = width * gdk_memory_format_bytes_per_pixel (src_format);
      src_data = g_new (guchar, src_stride * height);

-      gdk_dmabuf_do_download_mmap (texture, src_data, src_stride);
+      retval = gdk_dmabuf_do_download_mmap (texture, src_data, src_stride);

      gdk_memory_convert (data, stride, format, color_state,
                          src_data, src_stride, src_format, src_color_state,
@@ -2154,6 +2210,8 @@ gdk_dmabuf_download_mmap (GdkTexture      *texture,

      g_free (src_data);
    }
+
+  return retval;
 }

 int
@@ -19,19 +19,6 @@ gdk_dmabuf_downloader_close (GdkDmabufDownloader *self)
 }

 gboolean
-gdk_dmabuf_downloader_supports (GdkDmabufDownloader  *self,
-                                GdkDmabufTexture     *texture,
-                                GError              **error)
-{
-  GdkDmabufDownloaderInterface *iface;
-
-  g_return_val_if_fail (GDK_IS_DMABUF_DOWNLOADER (self), FALSE);
-
-  iface = GDK_DMABUF_DOWNLOADER_GET_IFACE (self);
-  return iface->supports (self, texture, error);
-}
-
-void
 gdk_dmabuf_downloader_download (GdkDmabufDownloader *self,
                                GdkDmabufTexture    *texture,
                                GdkMemoryFormat      format,
@@ -41,9 +28,8 @@ gdk_dmabuf_downloader_download (GdkDmabufDownloader *self,
 {
  GdkDmabufDownloaderInterface *iface;

-  g_return_if_fail (GDK_IS_DMABUF_DOWNLOADER (self));
+  g_return_val_if_fail (GDK_IS_DMABUF_DOWNLOADER (self), FALSE);

  iface = GDK_DMABUF_DOWNLOADER_GET_IFACE (self);
-  iface->download (self, texture, format, color_state, data, stride);
+  return iface->download (self, texture, format, color_state, data, stride);
 }
-
@@ -14,10 +14,7 @@ struct _GdkDmabufDownloaderInterface
  GTypeInterface g_iface;

  void                  (* close)                               (GdkDmabufDownloader            *downloader);
-  gboolean              (* supports)                            (GdkDmabufDownloader            *downloader,
-                                                                 GdkDmabufTexture               *texture,
-                                                                 GError                        **error);
-  void                  (* download)                            (GdkDmabufDownloader            *downloader,
+  gboolean              (* download)                            (GdkDmabufDownloader            *downloader,
                                                                 GdkDmabufTexture               *texture,
                                                                 GdkMemoryFormat                 format,
                                                                 GdkColorState                  *color_state,
@@ -25,11 +22,8 @@ struct _GdkDmabufDownloaderInterface
                                                                 gsize                           stride);
 };

-void                    gdk_dmabuf_downloader_close             (GdkDmabufDownloader            *downloader);
-gboolean                gdk_dmabuf_downloader_supports          (GdkDmabufDownloader            *downloader,
-                                                                 GdkDmabufTexture               *texture,
-                                                                 GError                        **error);
-void                    gdk_dmabuf_downloader_download          (GdkDmabufDownloader            *downloader,
+void                    gdk_dmabuf_downloader_close             (GdkDmabufDownloader            *self);
+gboolean                gdk_dmabuf_downloader_download          (GdkDmabufDownloader            *downloader,
                                                                 GdkDmabufTexture               *texture,
                                                                 GdkMemoryFormat                 format,
                                                                 GdkColorState                  *color_state,
@@ -18,7 +18,6 @@

 #include "config.h"

-#if defined(HAVE_DMABUF) && defined (HAVE_EGL)
 #include "gdkdmabufeglprivate.h"

 #include "gdkdmabufformatsbuilderprivate.h"
@@ -32,6 +31,8 @@

 #include <graphene.h>

+#if defined(HAVE_DMABUF) && defined (HAVE_EGL)
+
 /* A dmabuf downloader implementation that downloads buffers via
 * gsk_renderer_render_texture + GL texture download.
 */
@@ -39,7 +40,7 @@
 static gboolean
 gdk_dmabuf_egl_downloader_collect_formats (GdkDisplay                *display,
                                           GdkDmabufFormatsBuilder   *formats,
-                                           GdkDmabufFormatsBuilder   *external)
+                                           GdkDmabufFormatsBuilder   *internal)
 {
  GdkGLContext *context = gdk_display_get_gl_context (display);
  EGLDisplay egl_display = gdk_display_get_egl_display (display);
@@ -60,8 +61,8 @@ gdk_dmabuf_egl_downloader_collect_formats (GdkDisplay                *display,
  eglQueryDmaBufFormatsEXT (egl_display, num_fourccs, fourccs, &num_fourccs);

  n_mods = 80;
-  modifiers = g_new (guint64, n_mods);
-  external_only = g_new (unsigned int, n_mods);
+  modifiers = g_new0 (guint64, n_mods);
+  external_only = g_new0 (unsigned int, n_mods);

  for (int i = 0; i < num_fourccs; i++)
    {
@@ -93,24 +94,27 @@ gdk_dmabuf_egl_downloader_collect_formats (GdkDisplay                *display,

      for (int j = 0; j < num_modifiers; j++)
        {
-          /* All linear formats we support are already added my the mmap downloader.
+          /* All linear formats we support are already advertised by the mmap downloader.
           * We don't add external formats, unless we can use them (via GLES)
           */
-          if (modifiers[j] != DRM_FORMAT_MOD_LINEAR &&
-              (!external_only[j] || gdk_gl_context_get_use_es (context)))
-            {
-              GDK_DISPLAY_DEBUG (display, DMABUF,
-                                 "%s EGL dmabuf format %.4s:%#" G_GINT64_MODIFIER "x",
-                                 external_only[j] ? "external " : "",
-                                 (char *) &fourccs[i],
-                                 modifiers[j]);
+          gboolean advertise = modifiers[j] != DRM_FORMAT_MOD_LINEAR &&
+                               (!external_only[j] || gdk_gl_context_get_use_es (context));

-              gdk_dmabuf_formats_builder_add_format (formats, fourccs[i], modifiers[j]);
+          GDK_DISPLAY_DEBUG (display, DMABUF,
+                             "EGL %s %sdmabuf format %.4s::%016" G_GINT64_MODIFIER "x",
+                             advertise ? "advertises" : "supports",
+                             external_only[j] ? "external " : "",
+                             (char *) &fourccs[i],
+                             modifiers[j]);
+
+          if (advertise)
+            gdk_dmabuf_formats_builder_add_format (formats, fourccs[i], modifiers[j]);
+
+          if (!external_only[j])
+            {
+              gdk_dmabuf_formats_builder_add_format (internal, fourccs[i], modifiers[j]);
+              all_external = FALSE;
            }
-          if (external_only[j])
-            gdk_dmabuf_formats_builder_add_format (external, fourccs[i], modifiers[j]);
-          else
-            all_external = FALSE;
        }

      /* Accept implicit modifiers as long as we accept the format at all.
@@ -122,8 +126,8 @@ gdk_dmabuf_egl_downloader_collect_formats (GdkDisplay                *display,
       */
      if (!all_external || gdk_gl_context_get_use_es (context))
        gdk_dmabuf_formats_builder_add_format (formats, fourccs[i], DRM_FORMAT_MOD_INVALID);
-      if (all_external)
-        gdk_dmabuf_formats_builder_add_format (external, fourccs[i], DRM_FORMAT_MOD_INVALID);
+      if (!all_external)
+        gdk_dmabuf_formats_builder_add_format (internal, fourccs[i], DRM_FORMAT_MOD_INVALID);
    }

  g_free (modifiers);
@@ -133,91 +137,17 @@ gdk_dmabuf_egl_downloader_collect_formats (GdkDisplay                *display,
  return TRUE;
 }

-/* Hack. We don't include gsk/gsk.h here to avoid a build order problem
- * with the generated header gskenumtypes.h, so we need to hack around
- * a bit to access the gsk api we need.
- */
-
-typedef struct _GskRenderer GskRenderer;
-
-extern GskRenderer *   gsk_gl_renderer_new                      (void);
-extern gboolean        gsk_renderer_realize_for_display         (GskRenderer  *renderer,
-                                                                 GdkDisplay   *display,
-                                                                 GError      **error);
-
-GdkDmabufDownloader *
-gdk_dmabuf_get_egl_downloader (GdkDisplay              *display,
-                               GdkDmabufFormatsBuilder *builder)
-{
-  GdkDmabufFormatsBuilder *formats;
-  GdkDmabufFormatsBuilder *external;
-  gboolean retval = FALSE;
-  GError *error = NULL;
-  GskRenderer *renderer;
-  GdkGLContext *previous;
-
-  g_assert (display->egl_dmabuf_formats == NULL);
-  g_assert (display->egl_external_formats == NULL);
-
-  if (!gdk_display_prepare_gl (display, NULL))
-    return NULL;
-
-  previous = gdk_gl_context_get_current ();
-  if (previous)
-    g_object_ref (previous);
-  formats = gdk_dmabuf_formats_builder_new ();
-  external = gdk_dmabuf_formats_builder_new ();
-
-  retval = gdk_dmabuf_egl_downloader_collect_formats (display, formats, external);
-
-  display->egl_dmabuf_formats = gdk_dmabuf_formats_builder_free_to_formats (formats);
-  display->egl_external_formats = gdk_dmabuf_formats_builder_free_to_formats (external);
-
-  gdk_dmabuf_formats_builder_add_formats (builder, display->egl_dmabuf_formats);
-
-  if (!retval)
-    {
-      if (previous)
-        gdk_gl_context_make_current (previous);
-      return NULL;
-    }
-
-  renderer = gsk_gl_renderer_new ();
-
-  if (!gsk_renderer_realize_for_display (renderer, display, &error))
-    {
-      g_warning ("Failed to realize GL renderer: %s", error->message);
-      g_error_free (error);
-      g_object_unref (renderer);
-      if (previous)
-        gdk_gl_context_make_current (previous);
-
-      return NULL;
-    }
-
-  if (previous)
-    {
-      gdk_gl_context_make_current (previous);
-      g_object_unref (previous);
-    }
-
-  return GDK_DMABUF_DOWNLOADER (renderer);
-}
-
 EGLImage
 gdk_dmabuf_egl_create_image (GdkDisplay      *display,
                             int              width,
                             int              height,
                             const GdkDmabuf *dmabuf,
-                             int              color_space_hint,
-                             int              range_hint,
                             int              target)
 {
  EGLDisplay egl_display = gdk_display_get_egl_display (display);
  EGLint attribs[64];
  int i;
  EGLImage image;
-  gboolean is_yuv;

  g_return_val_if_fail (width > 0, 0);
  g_return_val_if_fail (height > 0, 0);
@@ -231,25 +161,6 @@ gdk_dmabuf_egl_create_image (GdkDisplay      *display,
      return EGL_NO_IMAGE;
    }

-  if (gdk_dmabuf_fourcc_is_yuv (dmabuf->fourcc, &is_yuv) && is_yuv)
-    {
-      if (color_space_hint == 0 || range_hint == 0)
-        {
-          GDK_DISPLAY_DEBUG (display, DMABUF,
-                             "Can't import yuv dmabuf into GL without color space hints");
-          return EGL_NO_IMAGE;
-        }
-    }
-  else
-    {
-      if (color_space_hint != 0 || range_hint != 0)
-        {
-          GDK_DISPLAY_DEBUG (display, DMABUF,
-                             "Can't import non-yuv dmabuf into GL with color space hints");
-          return EGL_NO_IMAGE;
-        }
-    }
-
  GDK_DISPLAY_DEBUG (display, DMABUF,
                     "Importing dmabuf (format: %.4s:%#" G_GINT64_MODIFIER "x, planes: %u) into GL",
                     (char *) &dmabuf->fourcc, dmabuf->modifier, dmabuf->n_planes);
@@ -263,16 +174,10 @@ gdk_dmabuf_egl_create_image (GdkDisplay      *display,
  attribs[i++] = height;
  attribs[i++] = EGL_LINUX_DRM_FOURCC_EXT;
  attribs[i++] = dmabuf->fourcc;
-  if (color_space_hint != 0)
-    {
-      attribs[i++] = EGL_YUV_COLOR_SPACE_HINT_EXT;
-      attribs[i++] = color_space_hint;
-    }
-  if (range_hint != 0)
-    {
-      attribs[i++] = EGL_SAMPLE_RANGE_HINT_EXT;
-      attribs[i++] = range_hint;
-    }
+  attribs[i++] = EGL_YUV_COLOR_SPACE_HINT_EXT;
+  attribs[i++] = EGL_ITU_REC601_EXT;
+  attribs[i++] = EGL_SAMPLE_RANGE_HINT_EXT;
+  attribs[i++] = EGL_YUV_NARROW_RANGE_EXT;

 #define ADD_PLANE(plane) \
  { \
@@ -311,54 +216,86 @@ gdk_dmabuf_egl_create_image (GdkDisplay      *display,
      GDK_DISPLAY_DEBUG (display, DMABUF,
                         "Creating EGLImage for dmabuf failed: %#x",
                         eglGetError ());
-      return 0;
    }

  return image;
 }

+#endif  /* HAVE_DMABUF && HAVE_EGL */
+
+/* Hack. We don't include gsk/gsk.h here to avoid a build order problem
+ * with the generated header gskenumtypes.h, so we need to hack around
+ * a bit to access the gsk api we need.
+ */
+
+typedef struct _GskRenderer GskRenderer;
+
+extern GskRenderer *   gsk_gl_renderer_new                      (void);
+extern GskRenderer *   gsk_ngl_renderer_new                     (void);
+extern gboolean        gsk_renderer_realize_for_display         (GskRenderer  *renderer,
+                                                                 GdkDisplay   *display,
+                                                                 GError      **error);
+
 void
-gdk_dmabuf_get_egl_yuv_hints (const GdkDmabuf *dmabuf,
-                              GdkColorState   *color_state,
-                              int             *color_space_hint,
-                              int             *range_hint)
+gdk_dmabuf_egl_init (GdkDisplay *display)
 {
-  gboolean is_yuv;
-  const GdkCicp *cicp;
+#if defined (HAVE_DMABUF) && defined (HAVE_EGL)
+  GdkDmabufFormatsBuilder *formats;
+  GdkDmabufFormatsBuilder *internal;
+  gboolean retval = FALSE;
+  GError *error = NULL;
+  GskRenderer *renderer;
+  GdkGLContext *previous;

-  cicp = gdk_color_state_get_cicp (color_state);
+  if (display->egl_dmabuf_formats != NULL)
+    return;

-  if (cicp &&
-      gdk_dmabuf_fourcc_is_yuv (dmabuf->fourcc, &is_yuv) && is_yuv)
+  if (!gdk_has_feature (GDK_FEATURE_DMABUF) ||
+      !gdk_display_prepare_gl (display, NULL))
    {
-      if (cicp->range == GDK_CICP_RANGE_NARROW)
-        *range_hint = EGL_YUV_NARROW_RANGE_EXT;
-      else
-        *range_hint = EGL_YUV_FULL_RANGE_EXT;
+      return;
+    }

-      switch (cicp->matrix_coefficients)
-        {
-        case 1:
-          *color_space_hint = EGL_ITU_REC709_EXT;
-          break;
-        case 5:
-        case 6:
-          *color_space_hint = EGL_ITU_REC601_EXT;
-          break;
-        case 9:
-          *color_space_hint = EGL_ITU_REC2020_EXT;
-          break;
-        default:
-          *color_space_hint = 0;
-          *range_hint = 0;
-          break;
-        }
-    }
-  else
+  formats = gdk_dmabuf_formats_builder_new ();
+  internal = gdk_dmabuf_formats_builder_new ();
+
+  previous = gdk_gl_context_get_current ();
+  if (previous)
+    g_object_ref (previous);
+
+  retval = gdk_dmabuf_egl_downloader_collect_formats (display, formats, internal);
+
+  display->egl_dmabuf_formats = gdk_dmabuf_formats_builder_free_to_formats (formats);
+  display->egl_internal_formats = gdk_dmabuf_formats_builder_free_to_formats (internal);
+
+  if (!retval)
    {
-      *color_space_hint = 0;
-      *range_hint = 0;
+      if (previous)
+        gdk_gl_context_make_current (previous);
+      return;
    }
+
+  renderer = gsk_ngl_renderer_new ();
+
+  if (!gsk_renderer_realize_for_display (renderer, display, &error))
+    {
+      g_warning ("Failed to realize GL renderer: %s", error->message);
+      g_error_free (error);
+      g_object_unref (renderer);
+      if (previous)
+        gdk_gl_context_make_current (previous);
+
+      return;
+    }
+
+  if (previous)
+    {
+      gdk_gl_context_make_current (previous);
+      g_object_unref (previous);
+    }
+
+  display->egl_downloader = GDK_DMABUF_DOWNLOADER (renderer);
+
+#endif
 }

-#endif  /* HAVE_DMABUF && HAVE_EGL */
@@ -1,25 +1,18 @@
 #pragma once

+#include "gdkdisplayprivate.h"
 #if defined(HAVE_DMABUF) && defined (HAVE_EGL)

 #include "gdkdmabufprivate.h"
-#include "gdkdmabufdownloaderprivate.h"

 #include <epoxy/egl.h>

-GdkDmabufDownloader *       gdk_dmabuf_get_egl_downloader       (GdkDisplay                     *display,
-                                                                 GdkDmabufFormatsBuilder        *builder);
 EGLImage                    gdk_dmabuf_egl_create_image         (GdkDisplay                     *display,
                                                                 int                             width,
                                                                 int                             height,
                                                                 const GdkDmabuf                *dmabuf,
-                                                                 int                             color_state_hint,
-                                                                 int                             range_hint,
                                                                 int                             target);

-void                        gdk_dmabuf_get_egl_yuv_hints        (const GdkDmabuf                *dmabuf,
-                                                                 GdkColorState                  *color_state,
-                                                                 int                            *color_space_hint,
-                                                                 int                            *range_hint);
-
 #endif  /* HAVE_DMABUF && HAVE_EGL */
+
+void                        gdk_dmabuf_egl_init                 (GdkDisplay                     *display);
@@ -27,7 +27,7 @@ void                        gdk_dmabuf_close_fds                (GdkDmabuf
 #ifdef HAVE_DMABUF

 GdkDmabufFormats *          gdk_dmabuf_get_mmap_formats         (void) G_GNUC_CONST;
-void                        gdk_dmabuf_download_mmap            (GdkTexture                     *texture,
+gboolean                    gdk_dmabuf_download_mmap            (GdkTexture                     *texture,
                                                                 GdkMemoryFormat                 format,
                                                                 GdkColorState                  *color_state,
                                                                 guchar                         *data,
@@ -50,7 +50,6 @@ struct _GdkDmabufTexture
  GdkTexture parent_instance;

  GdkDisplay *display;
-  GdkDmabufDownloader *downloader;

  GdkDmabuf dmabuf;

@@ -85,7 +84,6 @@ gdk_dmabuf_texture_dispose (GObject *object)
      self->destroy = NULL;
    }

-  g_clear_object (&self->downloader);
  g_clear_object (&self->display);

  G_OBJECT_CLASS (gdk_dmabuf_texture_parent_class)->dispose (object);
@@ -107,16 +105,49 @@ static gboolean
 gdk_dmabuf_texture_invoke_callback (gpointer data)
 {
  Download *download = data;
+  GdkDisplay *display = download->texture->display;

-  gdk_dmabuf_downloader_download (download->texture->downloader,
-                                  download->texture,
-                                  download->format,
-                                  download->color_state,
-                                  download->data,
-                                  download->stride);
+  if (display->egl_downloader &&
+      gdk_dmabuf_downloader_download (display->egl_downloader,
+                                      download->texture,
+                                      download->format,
+                                      download->color_state,
+                                      download->data,
+                                      download->stride))
+    {
+      /* Successfully downloaded using EGL */
+    }
+  else if (display->vk_downloader &&
+           gdk_dmabuf_downloader_download (display->vk_downloader,
+                                           download->texture,
+                                           download->format,
+                                           download->color_state,
+                                           download->data,
+                                           download->stride))
+    {
+      /* Successfully downloaded using Vulkan */
+    }
+#ifdef HAVE_DMABUF
+  else if (gdk_dmabuf_download_mmap (GDK_TEXTURE (download->texture),
+                                     download->format,
+                                     download->color_state,
+                                     download->data,
+                                     download->stride))
+    {
+      /* Successfully downloaded using mmap */
+    }
+#endif
+  else
+    {
+      const GdkDmabuf *dmabuf = gdk_dmabuf_texture_get_dmabuf (download->texture);
+
+      g_critical ("Failed to download %dx%d dmabuf texture (format %.4s:%#" G_GINT64_MODIFIER "x)",
+                  gdk_texture_get_width (GDK_TEXTURE (download->texture)),
+                  gdk_texture_get_height (GDK_TEXTURE (download->texture)),
+                  (char *)&(dmabuf->fourcc), dmabuf->modifier);
+    }

  g_atomic_int_set (&download->spinlock, 1);
-
  return FALSE;
 }

@@ -130,14 +161,6 @@ gdk_dmabuf_texture_download (GdkTexture      *texture,
  GdkDmabufTexture *self = GDK_DMABUF_TEXTURE (texture);
  Download download = { self, format, color_state, data, stride, 0 };

-  if (self->downloader == NULL)
-    {
-#ifdef HAVE_DMABUF
-      gdk_dmabuf_download_mmap (texture, format, color_state, data, stride);
-#endif
-      return;
-    }
-
  g_main_context_invoke (NULL, gdk_dmabuf_texture_invoke_callback, &download);

  while (g_atomic_int_get (&download.spinlock) == 0);
@@ -183,10 +206,8 @@ gdk_dmabuf_texture_new_from_builder (GdkDmabufTextureBuilder *builder,
  GdkDisplay *display;
  GdkDmabuf dmabuf;
  GdkColorState *color_state;
-  GError *local_error = NULL;
  int width, height;
  gboolean premultiplied;
-  gsize i;

  display = gdk_dmabuf_texture_builder_get_display (builder);
  width = gdk_dmabuf_texture_builder_get_width (builder);
@@ -208,9 +229,12 @@ gdk_dmabuf_texture_new_from_builder (GdkDmabufTextureBuilder *builder,
      gboolean is_yuv;

      if (gdk_dmabuf_fourcc_is_yuv (dmabuf.fourcc, &is_yuv) && is_yuv)
-        color_state = GDK_COLOR_STATE_YUV;
+        {
+          g_warning_once ("FIXME: Implement the proper colorstate for YUV dmabufs");
+          color_state = gdk_color_state_get_srgb ();
+        }
      else
-        color_state = GDK_COLOR_STATE_SRGB;
+        color_state = gdk_color_state_get_srgb ();
    }

  self = g_object_new (GDK_TYPE_DMABUF_TEXTURE,
@@ -231,37 +255,22 @@ gdk_dmabuf_texture_new_from_builder (GdkDmabufTextureBuilder *builder,
                                                 : GDK_MEMORY_R8G8B8A8;
    }

-  if (!gdk_dmabuf_formats_contains (gdk_dmabuf_get_mmap_formats (), dmabuf.fourcc, dmabuf.modifier))
+  if (!gdk_dmabuf_formats_contains (display->dmabuf_formats, dmabuf.fourcc, dmabuf.modifier))
    {
-      for (i = 0; display->dmabuf_downloaders[i] != NULL; i++)
-        {
-          if (local_error && g_error_matches (local_error, GDK_DMABUF_ERROR, GDK_DMABUF_ERROR_UNSUPPORTED_FORMAT))
-            g_clear_error (&local_error);
-
-          if (gdk_dmabuf_downloader_supports (display->dmabuf_downloaders[i],
-                                              self,
-                                              local_error ? NULL : &local_error))
-            {
-              self->downloader = g_object_ref (display->dmabuf_downloaders[i]);
-              break;
-            }
-        }
-
-      if (self->downloader == NULL)
-        {
-          g_propagate_error (error, local_error);
-          g_object_unref (self);
-          return NULL;
-        }
+      g_set_error (error,
+                   GDK_DMABUF_ERROR, GDK_DMABUF_ERROR_UNSUPPORTED_FORMAT,
+                   "Unsupported dmabuf format: %.4s:%#" G_GINT64_MODIFIER "x",
+                   (char *) &dmabuf.fourcc, dmabuf.modifier);
+      g_object_unref (self);
+      return NULL;
    }

  GDK_DISPLAY_DEBUG (display, DMABUF,
-                     "Creating dmabuf texture, format %.4s:%#" G_GINT64_MODIFIER "x, %s%u planes, memory format %u, downloader %s",
+                     "Creating dmabuf texture, format %.4s:%#" G_GINT64_MODIFIER "x, %s%u planes, memory format %u",
                     (char *) &dmabuf.fourcc, dmabuf.modifier,
                     gdk_dmabuf_texture_builder_get_premultiplied (builder) ? " premultiplied, " : "",
                     dmabuf.n_planes,
-                     GDK_TEXTURE (self)->format,
-                     self->downloader ? G_OBJECT_TYPE_NAME (self->downloader) : "none");
+                     GDK_TEXTURE (self)->format);

  /* Set this only once we know that the texture will be created.
   * Otherwise dispose() will run the callback */
@@ -272,7 +272,7 @@ gdk_dmabuf_texture_builder_class_init (GdkDmabufTextureBuilderClass *klass)
  gobject_class->set_property = gdk_dmabuf_texture_builder_set_property;

  /**
-   * GdkDmabufTextureBuilder:display: (attributes org.gtk.Property.get=gdk_dmabuf_texture_builder_get_display org.gtk.Property.set=gdk_dmabuf_texture_builder_set_display)
+   * GdkDmabufTextureBuilder:display:
   *
   * The display that this texture will be used on.
   *
@@ -284,7 +284,7 @@ gdk_dmabuf_texture_builder_class_init (GdkDmabufTextureBuilderClass *klass)
                         G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);

  /**
-   * GdkDmabufTextureBuilder:width: (attributes org.gtk.Property.get=gdk_dmabuf_texture_builder_get_width org.gtk.Property.set=gdk_dmabuf_texture_builder_set_width)
+   * GdkDmabufTextureBuilder:width:
   *
   * The width of the texture.
   *
@@ -296,7 +296,7 @@ gdk_dmabuf_texture_builder_class_init (GdkDmabufTextureBuilderClass *klass)
                       G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);

  /**
-   * GdkDmabufTextureBuilder:height: (attributes org.gtk.Property.get=gdk_dmabuf_texture_builder_get_height org.gtk.Property.set=gdk_dmabuf_texture_builder_set_height)
+   * GdkDmabufTextureBuilder:height:
   *
   * The height of the texture.
   *
@@ -308,7 +308,7 @@ gdk_dmabuf_texture_builder_class_init (GdkDmabufTextureBuilderClass *klass)
                       G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);

  /**
-   * GdkDmabufTextureBuilder:fourcc: (attributes org.gtk.Property.get=gdk_dmabuf_texture_builder_get_fourcc org.gtk.Property.set=gdk_dmabuf_texture_builder_set_fourcc)
+   * GdkDmabufTextureBuilder:fourcc:
   *
   * The format of the texture, as a fourcc value.
   *
@@ -346,7 +346,7 @@ gdk_dmabuf_texture_builder_class_init (GdkDmabufTextureBuilderClass *klass)
                          G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);

  /**
-   * GdkDmabufTextureBuilder:n-planes: (attributes org.gtk.Property.get=gdk_dmabuf_texture_builder_get_n_planes org.gtk.Property.set=gdk_dmabuf_texture_builder_set_n_planes)
+   * GdkDmabufTextureBuilder:n-planes:
   *
   * The number of planes of the texture.
   *
@@ -373,7 +373,7 @@ gdk_dmabuf_texture_builder_class_init (GdkDmabufTextureBuilderClass *klass)
                        G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);

  /**
-   * GdkDmabufTextureBuilder:update-region: (attributes org.gtk.Property.get=gdk_dmabuf_texture_builder_get_update_region org.gtk.Property.set=gdk_dmabuf_texture_builder_set_update_region)
+   * GdkDmabufTextureBuilder:update-region:
   *
   * The update region for [property@Gdk.GLTextureBuilder:update-texture].
   *
@@ -385,7 +385,7 @@ gdk_dmabuf_texture_builder_class_init (GdkDmabufTextureBuilderClass *klass)
                        G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);

  /**
-   * GdkDmabufTextureBuilder:update-texture: (attributes org.gtk.Property.get=gdk_dmabuf_texture_builder_get_update_texture org.gtk.Property.set=gdk_dmabuf_texture_builder_set_update_texture)
+   * GdkDmabufTextureBuilder:update-texture:
   *
   * The texture [property@Gdk.DmabufTextureBuilder:update-region] is an update for.
   *
@@ -471,7 +471,7 @@ gdk_dmabuf_texture_builder_set_display (GdkDmabufTextureBuilder *self,
 }

 /**
- * gdk_dmabuf_texture_builder_get_width: (attributes org.gtk.Method.get_property=width)
+ * gdk_dmabuf_texture_builder_get_width:
 * @self: a `GdkDmabufTextureBuilder`
 *
 * Gets the width previously set via gdk_dmabuf_texture_builder_set_width() or
@@ -490,7 +490,7 @@ gdk_dmabuf_texture_builder_get_width (GdkDmabufTextureBuilder *self)
 }

 /**
- * gdk_dmabuf_texture_builder_set_width: (attributes org.gtk.Method.set_property=width)
+ * gdk_dmabuf_texture_builder_set_width:
 * @self: a `GdkDmabufTextureBuilder`
 * @width: The texture's width or 0 to unset
 *
@@ -515,7 +515,7 @@ gdk_dmabuf_texture_builder_set_width (GdkDmabufTextureBuilder *self,
 }

 /**
- * gdk_dmabuf_texture_builder_get_height: (attributes org.gtk.Method.get_property=height)
+ * gdk_dmabuf_texture_builder_get_height:
 * @self: a `GdkDmabufTextureBuilder`
 *
 * Gets the height previously set via gdk_dmabuf_texture_builder_set_height() or
@@ -534,7 +534,7 @@ gdk_dmabuf_texture_builder_get_height (GdkDmabufTextureBuilder *self)
 }

 /**
- * gdk_dmabuf_texture_builder_set_height: (attributes org.gtk.Method.set_property=height)
+ * gdk_dmabuf_texture_builder_set_height:
 * @self: a `GdkDmabufTextureBuilder`
 * @height: the texture's height or 0 to unset
 *
@@ -559,7 +559,7 @@ gdk_dmabuf_texture_builder_set_height (GdkDmabufTextureBuilder *self,
 }

 /**
- * gdk_dmabuf_texture_builder_get_fourcc: (attributes org.gtk.Method.get_property=fourcc)
+ * gdk_dmabuf_texture_builder_get_fourcc:
 * @self: a `GdkDmabufTextureBuilder`
 *
 * Gets the format previously set via gdk_dmabuf_texture_builder_set_fourcc()
@@ -580,7 +580,7 @@ gdk_dmabuf_texture_builder_get_fourcc (GdkDmabufTextureBuilder *self)
 }

 /**
- * gdk_dmabuf_texture_builder_set_fourcc: (attributes org.gtk.Method.set_property=fourcc)
+ * gdk_dmabuf_texture_builder_set_fourcc:
 * @self: a `GdkDmabufTextureBuilder`
 * @fourcc: the texture's format or 0 to unset
 *
@@ -648,7 +648,7 @@ gdk_dmabuf_texture_builder_set_modifier (GdkDmabufTextureBuilder *self,
 }

 /**
- * gdk_dmabuf_texture_builder_get_n_planes: (attributes org.gtk.Method.get_property=n-planes)
+ * gdk_dmabuf_texture_builder_get_n_planes:
 * @self: a `GdkDmabufTextureBuilder`
 *
 * Gets the number of planes.
@@ -710,7 +710,7 @@ gdk_dmabuf_texture_builder_set_premultiplied (GdkDmabufTextureBuilder *self,
 }

 /**
- * gdk_dmabuf_texture_builder_set_n_planes: (attributes org.gtk.Method.set_property=n-planes)
+ * gdk_dmabuf_texture_builder_set_n_planes:
 * @self: a `GdkDmabufTextureBuilder`
 * @n_planes: the number of planes
 *
@@ -871,7 +871,7 @@ gdk_dmabuf_texture_builder_set_offset (GdkDmabufTextureBuilder *self,
 }

 /**
- * gdk_dmabuf_texture_builder_get_color_state: (attributes org.gtk.Method.get_property=color-state)
+ * gdk_dmabuf_texture_builder_get_color_state:
 * @self: a `GdkDmabufTextureBuilder`
 *
 * Gets the color state previously set via gdk_dmabuf_texture_builder_set_color_state().
@@ -889,7 +889,7 @@ gdk_dmabuf_texture_builder_get_color_state (GdkDmabufTextureBuilder *self)
 }

 /**
- * gdk_dmabuf_texture_builder_set_color_state: (attributes org.gtk.Method.set_property=color-state)
+ * gdk_dmabuf_texture_builder_set_color_state:
 * @self: a `GdkDmabufTextureBuilder`
 * @color_state: (nullable): a `GdkColorState` or `NULL` to unset the colorstate.
 *
@@ -920,7 +920,7 @@ gdk_dmabuf_texture_builder_set_color_state (GdkDmabufTextureBuilder *self,
 }

 /**
- * gdk_dmabuf_texture_builder_get_update_texture: (attributes org.gtk.Method.get_property=update-texture)
+ * gdk_dmabuf_texture_builder_get_update_texture:
 * @self: a `GdkDmabufTextureBuilder`
 *
 * Gets the texture previously set via gdk_dmabuf_texture_builder_set_update_texture() or
@@ -939,7 +939,7 @@ gdk_dmabuf_texture_builder_get_update_texture (GdkDmabufTextureBuilder *self)
 }

 /**
- * gdk_dmabuf_texture_builder_set_update_texture: (attributes org.gtk.Method.set_property=update-texture)
+ * gdk_dmabuf_texture_builder_set_update_texture:
 * @self: a `GdkDmabufTextureBuilder`
 * @texture: (nullable): the texture to update
 *
@@ -962,7 +962,7 @@ gdk_dmabuf_texture_builder_set_update_texture (GdkDmabufTextureBuilder *self,
 }

 /**
- * gdk_dmabuf_texture_builder_get_update_region: (attributes org.gtk.Method.get_property=update-region)
+ * gdk_dmabuf_texture_builder_get_update_region:
 * @self: a `GdkDmabufTextureBuilder`
 *
 * Gets the region previously set via gdk_dmabuf_texture_builder_set_update_region() or
@@ -981,7 +981,7 @@ gdk_dmabuf_texture_builder_get_update_region (GdkDmabufTextureBuilder *self)
 }

 /**
- * gdk_dmabuf_texture_builder_set_update_region: (attributes org.gtk.Method.set_property=update-region)
+ * gdk_dmabuf_texture_builder_set_update_region:
 * @self: a `GdkDmabufTextureBuilder`
 * @region: (nullable): the region to update
 *
@@ -1063,11 +1063,11 @@ gdk_dmabuf_texture_builder_build (GdkDmabufTextureBuilder *self,
  for (i = 0; i < self->dmabuf.n_planes; i++)
    g_return_val_if_fail (self->dmabuf.planes[i].fd != -1, NULL);

-  if (GDK_DISPLAY_DEBUG_CHECK (self->display, DMABUF_DISABLE))
+  if (!gdk_has_feature (GDK_FEATURE_DMABUF))
    {
      g_set_error_literal (error,
                           GDK_DMABUF_ERROR, GDK_DMABUF_ERROR_NOT_AVAILABLE,
-                           "dmabuf support disabled via GDK_DEBUG environment variable");
+                           "dmabuf support disabled via GDK_DISABLE environment variable");
      return NULL;
    }

@@ -5,9 +5,9 @@

 G_BEGIN_DECLS

-const GdkDmabuf *       gdk_dmabuf_texture_builder_get_dmabuf   (GdkDmabufTextureBuilder *builder);
+const GdkDmabuf *       gdk_dmabuf_texture_builder_get_dmabuf   (GdkDmabufTextureBuilder *self);

-void                    gdk_dmabuf_texture_builder_set_dmabuf   (GdkDmabufTextureBuilder *builder,
+void                    gdk_dmabuf_texture_builder_set_dmabuf   (GdkDmabufTextureBuilder *self,
                                                                 const GdkDmabuf         *dmabuf);

 G_END_DECLS
--- a/Show More
+++ b/Show More