trashmonitor: Replace internal 1-bit fields with bool

Single bit fields cannot be used by address, and will overflow when set to values that are bigger than one bit; the behaviour (if not the size) of the C99 bool type is better defined.
calendar: Replace internal 1-bit fields with bool
2023-06-28 15:28:38 +01:00 · 2023-06-28 15:28:22 +01:00 · 2023-06-28 15:27:10 +01:00 · 2023-06-28 15:26:45 +01:00 · 2023-06-28 15:26:18 +01:00 · 2023-06-28 15:25:59 +01:00
431 changed files with 11692 additions and 6212 deletions
@@ -222,7 +222,7 @@ macos:
            -Dcpp_std=c++11
            -Dpixman:tests=disabled
            -Dlibjpeg-turbo:simd=disabled
-            -Ddemos=false
+            -Dbuild-demos=false
            -Dbuild-tests=false
            -Dbuild-examples=false
            -Dbuild-testsuite=false
@@ -385,17 +385,27 @@ asan-build:
  tags: [ asan ]
  stage: analysis
  needs: []
-  when: manual
  variables:
  script:
    - export PATH="$HOME/.local/bin:$PATH"
-    - CC=clang meson setup --buildtype=debugoptimized -Db_sanitize=address -Db_lundef=false -Dintrospection=disabled -Df16c=disabled _build
+    - CC=clang meson setup
+            --buildtype=debugoptimized
+            -Db_sanitize=address
+            -Db_lundef=false
+            -Dbuild-demos=false
+            -Dbuild-tests=false
+            -Dbuild-examples=false
+            -Dintrospection=disabled
+            -Df16c=disabled
+            _build
    - ninja -C _build
    - .gitlab-ci/run-tests.sh _build wayland
+    - .gitlab-ci/run-tests.sh _build wayland_gles
+    - .gitlab-ci/run-tests.sh _build x11
  artifacts:
+    when: always
    paths:
-      - _build/meson-logs
-  allow_failure: true
+      - "${CI_PROJECT_DIR}/_build/meson-logs"

 reference:
  image: $FEDORA_IMAGE
@@ -23,8 +23,8 @@ flatpak build ${builddir} meson \
                -Dbuild-testsuite=false \
                -Dbuild-examples=false \
                -Dintrospection=disabled \
-                -Ddemos=true \
-                -Dprofile=devel \
+                -Dbuild-demos=true \
+                -Ddemo-profile=devel \
                _flatpak_build

 flatpak build ${builddir} ninja -C _flatpak_build install
@@ -9,7 +9,7 @@ backend=$2
 multiplier=${MESON_TEST_TIMEOUT_MULTIPLIER:-1}

 # Ignore memory leaks lower in dependencies
-export LSAN_OPTIONS=suppressions=$srcdir/lsan.supp:print_suppressions=0:verbosity=1:log_threads=1
+export LSAN_OPTIONS=suppressions=$srcdir/lsan.supp:print_suppressions=0:detect_leaks=0:allocator_may_return_null=1
 export G_SLICE=always-malloc

 case "${backend}" in
@@ -1,4 +1,63 @@
-Overview of Changes in 4.11.3, xx-xx-xxxx
+Overview of Changes in 4.11.4, xx-xx-xxxx
+=========================================
+
+* GtkFileChooser:
+ - Default to sorting folders first
+ - Fix a crash when visiting recent files
+
+* GtkTextView:
+ - Fix corner cases in word navigation
+
+* GtkMenuButton:
+ - Normalize label layout
+
+* GtkDropDown:
+ - Add support for sections
+
+* GtkVideo:
+ - Make the overlay icon clickable
+
+* GtkWindow:
+ - Clear the resize cursors to avoid artifacts
+
+* Accessibility:
+ - Improvements all over the place: GtkButton, GtkPasswordEntry,
+   GtkFontChooserDialog, GtkColorChooserDialog, GtkShortcutsWindow,
+   GtkMenuButton, GtkAboutDialog, GtkFileChooserDialog, GtkStackSidebar,
+   GtkMediaControls, GtkColorDialogButton, GtkDropDown, GtkInfoBar,
+   GtkNotebook, GtkPrintUnixDialog, GtkModelButton
+ - Make name computation follow the ARIA spec more closely
+ - Change many containers to use `generic` instead of `group`
+ - Use `generic` as the default role
+ - Use `application` instead of `window` for windows
+
+* X11:
+ - Fix regressions in GLX setup
+
+* Windows:
+ - Center newly created transient windows
+
+* Vulkan:
+ - Add antialising for gradients
+ - Do less work on clipped away nodes
+ - Redo image uploading
+ - Support different image depths and formats
+
+* Demos:
+ - gtk4-demo: Improve window sizing
+ - gtk4-demo: Improve focus behavior
+ - gtk4-demo: Add many missing a11y properties
+`
+* Inspector:
+ - Show more information in the a11y tab
+ - Add an accessibility overlay with warnings and recommendations
+ - Limit the width of the a11y tab
+
+* Translation updates:
+ Czech
+
+
+Overview of Changes in 4.11.3, 05-06-2023
 =========================================

 * GtkGridView:
@@ -20,22 +79,41 @@ Overview of Changes in 4.11.3, xx-xx-xxxx
 * GtkPopoverMenu:
 - Avoid unnecessary left padding

-* Css:
- - Add new binding-friendly css provider apis
+* GtkSearchEntry:
+ - Improve size allocation for the clear icon

-* GDK:
- - Support grayscale texture and alpha texture formats
-   for loading and saving to png and tiff, and in GL
+* GtkBoxLayout:
+ - Fix a regression from recent baseline work
+
+* CSS:
+ - Add new binding-friendly css provider apis

 * Theme:
 - Show focus in the shortcuts window

-* Tests:
- - Improve test coverage
+* GDK:
+ - Support grayscale and alpha texture formats for loading
+   and saving to png and tiff, and in GL
+ - Fix some regressions in GL context initialization
+
+* GSK:
+ - Support grayscale and alpha texture formats in the GL renderer
+ - Support straight alpha textures in the GL renderer
+ - Many improvements to the experimental Vulkan renderer

 * Wayland:
 - Make exporting surface handles more flexible

+* X11:
+ - Trap XRandr errors
+ - Stop using passive grabs during DND
+
+* Windows:
+ - Many cleanups and simplifications
+
+* Tests:
+ - Improve test coverage
+
 * Build:
 - Some build options have been renamed:
     demos -> build-demos
@@ -55,6 +133,7 @@ Overview of Changes in 4.11.3, xx-xx-xxxx
 * Translation updates:
 Basque
 Catalan
+ Georgian
 Russian
 Turkish

@@ -162,6 +162,10 @@ create_page4 (GtkWidget *assistant)
  gtk_assistant_set_page_type (GTK_ASSISTANT (assistant), progress_bar, GTK_ASSISTANT_PAGE_PROGRESS);
  gtk_assistant_set_page_title (GTK_ASSISTANT (assistant), progress_bar, "Applying changes");

+  gtk_accessible_update_property (GTK_ACCESSIBLE (progress_bar),
+                                  GTK_ACCESSIBLE_PROPERTY_LABEL, "Applying changes",
+                                  -1);
+
  /* This prevents the assistant window from being
   * closed while we're "busy" applying changes.
   */
@@ -4,6 +4,9 @@
  <object class="GtkWindow" id="window">
    <property name="resizable">1</property>
    <property name="title">Clipboard</property>
+    <accessibility>
+      <relation name="described-by">label</relation>
+    </accessibility>
    <child>
      <object class="GtkBox">
        <property name="orientation">vertical</property>
@@ -13,7 +16,7 @@
        <property name="margin-bottom">12</property>
        <property name="spacing">12</property>
        <child>
-          <object class="GtkLabel">
+          <object class="GtkLabel" id="label">
            <property name="label">“Copy” will copy the selected data the clipboard, “Paste” will show the current clipboard contents. You can also drag the data to the bottom.</property>
            <property name="wrap">1</property>
            <property name="max-width-chars">40</property>
@@ -24,6 +27,9 @@
            <property name="spacing">12</property>
            <child>
              <object class="GtkDropDown" id="source_chooser">
+                <accessibility>
+                  <property name="label">Source Type</property>
+                </accessibility>
                <property name="valign">center</property>
                <property name="model">
                  <object class="GtkStringList">
@@ -54,6 +60,9 @@
                    <property name="name">Text</property>
                    <property name="child">
                      <object class="GtkEntry" id="source_text">
+                        <accessibility>
+                          <property name="label">Text Drag Source</property>
+                        </accessibility>
                        <property name="valign">center</property>
                        <signal name="notify::text" handler="text_changed_cb" object="copy_button"/>
                        <property name="text">Copy this!</property>
@@ -66,6 +75,9 @@
                    <property name="name">Color</property>
                    <property name="child">
                      <object class="GtkColorDialogButton" id="source_color">
+                        <accessibility>
+                          <property name="label">Color Drag Source</property>
+                        </accessibility>
                        <property name="dialog">
                          <object class="GtkColorDialog">
                          </object>
@@ -87,14 +99,17 @@
                        </style>
                        <child>
                          <object class="GtkToggleButton" id="image_rose">
+                            <accessibility>
+                              <property name="label">Photo Drag Source</property>
+                            </accessibility>
                            <property name="active">1</property>
                            <child>
-                              <object class="GtkDragSource">
-                                <signal name="prepare" handler="drag_prepare"/>
-                              </object>
                            </child>
                            <child>
                              <object class="GtkImage">
+                                <accessibility>
+                                  <property name="label">Portland Rose Photo</property>
+                                </accessibility>
                                <style>
                                  <class name="large-icons"/>
                                </style>
@@ -105,6 +120,9 @@
                        </child>
                        <child>
                          <object class="GtkToggleButton" id="image_floppy">
+                            <accessibility>
+                              <property name="label">Icon Drag Source</property>
+                            </accessibility>
                            <property name="group">image_rose</property>
                            <child>
                              <object class="GtkDragSource">
@@ -113,6 +131,9 @@
                            </child>
                            <child>
                              <object class="GtkImage">
+                                <accessibility>
+                                  <property name="label">Floppy Buddy Icon</property>
+                                </accessibility>
                                <style>
                                  <class name="large-icons"/>
                                </style>
@@ -123,6 +144,9 @@
                        </child>
                        <child>
                          <object class="GtkToggleButton" id="image_logo">
+                            <accessibility>
+                              <property name="label">SVG Drag Source</property>
+                            </accessibility>
                            <property name="group">image_floppy</property>
                            <child>
                              <object class="GtkDragSource">
@@ -131,6 +155,9 @@
                            </child>
                            <child>
                              <object class="GtkImage">
+                                <accessibility>
+                                  <property name="label">gtk-demo logo</property>
+                                </accessibility>
                                <style>
                                  <class name="large-icons"/>
                                </style>
@@ -148,6 +175,9 @@
                    <property name="name">File</property>
                    <property name="child">
                      <object class="GtkButton" id="source_file">
+                        <accessibility>
+                          <property name="label">File Drag Source</property>
+                        </accessibility>
                        <child>
                          <object class="GtkDragSource">
                            <property name="propagation-phase">capture</property>
@@ -172,6 +202,9 @@
                    <property name="name">Folder</property>
                    <property name="child">
                      <object class="GtkButton" id="source_folder">
+                        <accessibility>
+                          <property name="label">Folder Drag Source</property>
+                        </accessibility>
                        <child>
                          <object class="GtkDragSource">
                            <property name="propagation-phase">capture</property>
@@ -225,7 +258,7 @@
              </object>
            </child>
            <child>
-              <object class="GtkLabel">
+              <object class="GtkLabel" id="paste_label">
                <property name="xalign">0</property>
                <binding name="label">
                  <lookup name="visible-child-name" type="GtkStack">
@@ -252,6 +285,9 @@
                    <property name="name">Text</property>
                    <property name="child">
                      <object class="GtkLabel">
+                        <accessibility>
+                          <relation name="labelled-by">paste_label</relation>
+                        </accessibility>
                        <property name="halign">end</property>
                        <property name="valign">center</property>
                        <property name="xalign">0</property>
@@ -265,6 +301,9 @@
                    <property name="name">Image</property>
                    <property name="child">
                      <object class="GtkImage">
+                        <accessibility>
+                          <relation name="labelled-by">paste_label</relation>
+                        </accessibility>
                        <property name="halign">end</property>
                        <property name="valign">center</property>
                        <style>
@@ -283,6 +322,9 @@
                        <property name="valign">center</property>
                        <child>
                          <object class="GtkColorSwatch">
+                            <accessibility>
+                              <relation name="labelled-by">paste_label</relation>
+                            </accessibility>
                            <property name="accessible-role">img</property>
                            <property name="can-focus">0</property>
                            <property name="selectable">0</property>
@@ -298,6 +340,9 @@
                    <property name="name">File</property>
                    <property name="child">
                      <object class="GtkLabel">
+                        <accessibility>
+                          <relation name="labelled-by">paste_label</relation>
+                        </accessibility>
                        <property name="halign">end</property>
                        <property name="valign">center</property>
                        <property name="xalign">0</property>
@@ -387,6 +387,8 @@ demo3_widget_class_init (Demo3WidgetClass *class)
  gtk_widget_class_set_template_from_resource (widget_class, "/menu/demo3widget.ui");
  gtk_widget_class_bind_template_child (widget_class, Demo3Widget, menu);
  gtk_widget_class_bind_template_callback (widget_class, pressed_cb);
+
+  gtk_widget_class_set_accessible_role (widget_class, GTK_ACCESSIBLE_ROLE_IMG);
 }

 GtkWidget *
@@ -19,8 +19,14 @@
    </item>
  </menu>
  <template class="Demo3Widget">
+    <accessibility>
+      <property name="label">Demo image</property>
+    </accessibility>
    <child>
      <object class="GtkPopoverMenu" id="menu">
+        <accessibility>
+          <property name="label">Context menu</property>
+        </accessibility>
        <property name="has-arrow">0</property>
        <property name="menu-model">model</property>
      </object>
@@ -334,11 +334,17 @@ do_drawingarea (GtkWidget *do_widget)
      gtk_widget_set_vexpand (frame, TRUE);
      gtk_box_append (GTK_BOX (vbox), frame);

-      da = gtk_drawing_area_new ();
+      da = g_object_new (GTK_TYPE_DRAWING_AREA,
+                         "accessible-role", GTK_ACCESSIBLE_ROLE_IMG,
+                         NULL);
+      gtk_frame_set_child (GTK_FRAME (frame), da);
+      gtk_accessible_update_relation (GTK_ACCESSIBLE (da),
+                                      GTK_ACCESSIBLE_RELATION_LABELLED_BY, label, NULL,
+                                      -1);
+
      gtk_drawing_area_set_content_width (GTK_DRAWING_AREA (da), 100);
      gtk_drawing_area_set_content_height (GTK_DRAWING_AREA (da), 100);
      gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (da), groups_draw, NULL, NULL);
-      gtk_frame_set_child (GTK_FRAME (frame), da);

      /*
       * Create the scribble area
@@ -352,11 +358,17 @@ do_drawingarea (GtkWidget *do_widget)
      gtk_widget_set_vexpand (frame, TRUE);
      gtk_box_append (GTK_BOX (vbox), frame);

-      da = gtk_drawing_area_new ();
+      da = g_object_new (GTK_TYPE_DRAWING_AREA,
+                         "accessible-role", GTK_ACCESSIBLE_ROLE_IMG,
+                         NULL);
+      gtk_frame_set_child (GTK_FRAME (frame), da);
+      gtk_accessible_update_relation (GTK_ACCESSIBLE (da),
+                                      GTK_ACCESSIBLE_RELATION_LABELLED_BY, label, NULL,
+                                      -1);
+
      gtk_drawing_area_set_content_width (GTK_DRAWING_AREA (da), 100);
      gtk_drawing_area_set_content_height (GTK_DRAWING_AREA (da), 100);
      gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (da), scribble_draw, NULL, NULL);
-      gtk_frame_set_child (GTK_FRAME (frame), da);

      g_signal_connect (da, "resize",
                        G_CALLBACK (scribble_resize), NULL);
@@ -372,7 +384,7 @@ do_drawingarea (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-      gtk_widget_set_visible (window, TRUE);
+      gtk_window_present (GTK_WINDOW (window));
  else
      gtk_window_destroy (GTK_WINDOW (window));

@@ -95,6 +95,13 @@ do_entry_completion (GtkWidget *do_widget)
      entry = gtk_entry_new ();
      gtk_box_append (GTK_BOX (vbox), entry);

+      gtk_accessible_update_relation (GTK_ACCESSIBLE (entry),
+                                      GTK_ACCESSIBLE_RELATION_LABELLED_BY, label, NULL,
+                                      -1);
+      gtk_accessible_update_property (GTK_ACCESSIBLE (entry),
+                                      GTK_ACCESSIBLE_PROPERTY_AUTOCOMPLETE, GTK_ACCESSIBLE_AUTOCOMPLETE_LIST,
+                                      -1);
+
      /* Create the completion object */
      completion = gtk_entry_completion_new ();

@@ -43,6 +43,10 @@ do_entry_undo (GtkWidget *do_widget)
      entry = gtk_entry_new ();
      gtk_editable_set_enable_undo (GTK_EDITABLE (entry), TRUE);
      gtk_box_append (GTK_BOX (vbox), entry);
+
+      gtk_accessible_update_relation (GTK_ACCESSIBLE (entry),
+                                      GTK_ACCESSIBLE_RELATION_LABELLED_BY, label, NULL,
+                                      -1);
    }

  if (!gtk_widget_get_visible (window))
@@ -22,11 +22,15 @@ validate_more_details (GtkEntry   *entry,
    {
      gtk_widget_set_tooltip_text (GTK_WIDGET (entry), "Must have details first");
      gtk_widget_add_css_class (GTK_WIDGET (entry), "error");
+      gtk_accessible_update_state (GTK_ACCESSIBLE (entry),
+                                   GTK_ACCESSIBLE_STATE_INVALID, GTK_ACCESSIBLE_INVALID_TRUE,
+                                   -1);
    }
  else
    {
      gtk_widget_set_tooltip_text (GTK_WIDGET (entry), "");
      gtk_widget_remove_css_class (GTK_WIDGET (entry), "error");
+      gtk_accessible_reset_state (GTK_ACCESSIBLE (entry), GTK_ACCESSIBLE_STATE_INVALID);
    }
 }

@@ -44,10 +48,18 @@ mode_switch_state_set (GtkSwitch *sw,
    {
      gtk_widget_set_visible (label, FALSE);
      gtk_switch_set_state (sw, state);
+      gtk_accessible_reset_relation (GTK_ACCESSIBLE (sw), GTK_ACCESSIBLE_RELATION_ERROR_MESSAGE);
+      gtk_accessible_reset_state (GTK_ACCESSIBLE (sw), GTK_ACCESSIBLE_STATE_INVALID);
    }
  else
    {
      gtk_widget_set_visible (label, TRUE);
+      gtk_accessible_update_relation (GTK_ACCESSIBLE (sw),
+                                      GTK_ACCESSIBLE_RELATION_ERROR_MESSAGE, label,
+                                      -1);
+      gtk_accessible_update_state (GTK_ACCESSIBLE (sw),
+                                   GTK_ACCESSIBLE_STATE_INVALID, GTK_ACCESSIBLE_INVALID_TRUE,
+                                   -1);
    }

  return TRUE;
@@ -73,6 +85,9 @@ level_scale_value_changed (GtkRange *range,
    {
      gtk_switch_set_state (GTK_SWITCH (sw), FALSE);
    }
+
+  gtk_accessible_reset_relation (GTK_ACCESSIBLE (sw), GTK_ACCESSIBLE_RELATION_ERROR_MESSAGE);
+  gtk_accessible_reset_state (GTK_ACCESSIBLE (sw), GTK_ACCESSIBLE_STATE_INVALID);
 }

 GtkWidget *
@@ -59,6 +59,9 @@
                    <property name="spacing">6</property>
                    <child>
                      <object class="GtkFontDialogButton" id="font">
+                        <accessibility>
+                          <property name="label">Font</property>
+                        </accessibility>
                        <property name="dialog">
                          <object class="GtkFontDialog">
                          </object>
@@ -73,7 +76,7 @@
                        <property name="column-spacing">10</property>
                        <property name="row-spacing">10</property>
                        <child>
-                          <object class="GtkLabel">
+                          <object class="GtkLabel" id="size_label">
                            <property name="label">Size</property>
                            <property name="xalign">0</property>
                            <property name="valign">baseline</property>
@@ -89,6 +92,9 @@
                            <property name="width-request">100</property>
                            <property name="valign">baseline</property>
                            <property name="adjustment">size_adjustment</property>
+                            <accessibility>
+                              <relation name="labelled-by">size_label</relation>
+                            </accessibility>
                            <layout>
                              <property name="column">1</property>
                              <property name="row">0</property>
@@ -101,6 +107,9 @@
                            <property name="max-width-chars">4</property>
                            <property name="hexpand">0</property>
                            <property name="valign">baseline</property>
+                            <accessibility>
+                              <relation name="labelled-by">size_label</relation>
+                            </accessibility>
                            <signal name="activate" handler="basic_entry_activated"
                                    object="size_adjustment" swapped="false"/>
                            <layout>
@@ -110,7 +119,7 @@
                          </object>
                        </child>
                        <child>
-                          <object class="GtkLabel">
+                          <object class="GtkLabel" id="letterspacing_label">
                            <property name="label">Letterspacing</property>
                            <property name="xalign">0</property>
                            <property name="valign">baseline</property>
@@ -126,6 +135,9 @@
                            <property name="width-request">100</property>
                            <property name="valign">baseline</property>
                            <property name="adjustment">letterspacing_adjustment</property>
+                            <accessibility>
+                              <relation name="labelled-by">letterspacing_label</relation>
+                            </accessibility>
                            <layout>
                              <property name="column">1</property>
                              <property name="row">1</property>
@@ -138,6 +150,9 @@
                            <property name="max-width-chars">4</property>
                            <property name="hexpand">0</property>
                            <property name="valign">baseline</property>
+                            <accessibility>
+                              <relation name="labelled-by">letterspacing_label</relation>
+                            </accessibility>
                            <signal name="activate" handler="basic_entry_activated"
                                    object="letterspacing_adjustment" swapped="false"/>
                            <layout>
@@ -147,7 +162,7 @@
                          </object>
                        </child>
                        <child>
-                          <object class="GtkLabel">
+                          <object class="GtkLabel" id="line_height_label">
                            <property name="label">Line Height</property>
                            <property name="xalign">0</property>
                            <property name="valign">baseline</property>
@@ -163,6 +178,9 @@
                            <property name="width-request">100</property>
                            <property name="valign">baseline</property>
                            <property name="adjustment">line_height_adjustment</property>
+                            <accessibility>
+                              <relation name="labelled-by">line_height_label</relation>
+                            </accessibility>
                            <layout>
                              <property name="column">1</property>
                              <property name="row">2</property>
@@ -175,6 +193,9 @@
                            <property name="max-width-chars">4</property>
                            <property name="hexpand">0</property>
                            <property name="valign">baseline</property>
+                            <accessibility>
+                              <relation name="labelled-by">line_height_label</relation>
+                            </accessibility>
                            <signal name="activate" handler="basic_entry_activated"
                                    object="line_height_adjustment" swapped="false"/>
                            <layout>
@@ -184,7 +205,7 @@
                          </object>
                        </child>
                        <child>
-                          <object class="GtkLabel">
+                          <object class="GtkLabel" id="foreground_label">
                            <property name="label">Foreground</property>
                            <property name="xalign">0</property>
                            <property name="valign">baseline</property>
@@ -202,6 +223,9 @@
                            </property>
                            <property name="valign">baseline</property>
                            <property name="rgba">black</property>
+                            <accessibility>
+                              <relation name="labelled-by">foreground_label</relation>
+                            </accessibility>
                            <signal name="notify::rgba" handler="color_set_cb"/>
                            <layout>
                              <property name="column">1</property>
@@ -210,7 +234,7 @@
                          </object>
                        </child>
                        <child>
-                          <object class="GtkLabel">
+                          <object class="GtkLabel" id="background_label">
                            <property name="label">Background</property>
                            <property name="xalign">0</property>
                            <property name="valign">baseline</property>
@@ -228,6 +252,9 @@
                            </property>
                            <property name="valign">baseline</property>
                            <property name="rgba">white</property>
+                            <accessibility>
+                              <relation name="labelled-by">background_label</relation>
+                            </accessibility>
                            <signal name="notify::rgba" handler="color_set_cb"/>
                            <layout>
                              <property name="column">1</property>
@@ -240,6 +267,9 @@
                            <property name="icon-name">object-flip-vertical-symbolic</property>
                            <property name="halign">start</property>
                            <property name="valign">center</property>
+                            <accessibility>
+                              <property name="label">Swap colors</property>
+                            </accessibility>
                            <style>
                              <class name="circular"/>
                            </style>
@@ -341,6 +371,9 @@
                            <property name="yalign">0</property>
                            <property name="valign">start</property>
                            <property name="selectable">1</property>
+                            <accessibility>
+                              <property name="label">Font example</property>
+                            </accessibility>
                          </object>
                        </property>
                      </object>
@@ -350,6 +383,9 @@
                        <property name="name">entry</property>
                        <property name="child">
                          <object class="GtkTextView" id="entry">
+                            <accessibility>
+                              <property name="label">Example text</property>
+                            </accessibility>
                            <property name="buffer">
                              <object class="GtkTextBuffer">
                                <property name="text">Grumpy wizards make toxic brew for the evil Queen and Jack. A quick movement of the enemy will jeopardize six gunboats. The job of waxing linoleum frequently peeves chintzy kids. My girl wove six dozen plaid jackets before she quit. Twelve ziggurats quickly jumped a finch box.
@@ -446,6 +482,9 @@
                    <property name="icon-name">document-edit-symbolic</property>
                    <property name="halign">end</property>
                    <property name="valign">end</property>
+                    <accessibility>
+                      <property name="label">Edit text</property>
+                    </accessibility>
                    <signal name="clicked" handler="font_features_toggle_edit"/>
                  </object>
                </child>
@@ -306,7 +306,7 @@ retry:
  texture = gdk_texture_new_for_pixbuf (pixbuf2);
  gtk_picture_set_paintable (GTK_PICTURE (image), GDK_PAINTABLE (texture));
  g_object_unref (pixbuf2);
-  g_object_unref (pixbuf2);
+  g_object_unref (texture);
 }

 static gboolean fading = FALSE;
@@ -39,7 +39,7 @@
            <property name="row-spacing">10</property>
            <property name="column-spacing">10</property>
            <child>
-              <object class="GtkLabel">
+              <object class="GtkLabel" id="text_label">
                <property name="margin-start">10</property>
                <property name="label">Text</property>
                <property name="xalign">1</property>
@@ -57,10 +57,13 @@
                <layout>
                  <property name="column">2</property>
                </layout>
+                <accessibility>
+                  <relation name="labelled-by">text_label</relation>
+                </accessibility>
              </object>
            </child>
            <child>
-              <object class="GtkLabel">
+              <object class="GtkLabel" id="font_label">
                <property name="margin-start">10</property>
                <property name="label">Font</property>
                <property name="xalign">1</property>
@@ -75,6 +78,9 @@
            </child>
            <child>
              <object class="GtkFontDialogButton" id="font_button">
+                <accessibility>
+                  <relation name="labelled-by">font_label</relation>
+                </accessibility>
                <property name="dialog">
                  <object class="GtkFontDialog">
                  </object>
@@ -186,6 +192,9 @@
                <property name="icon-name">list-add-symbolic</property>
                <property name="halign">center</property>
                <property name="valign">center</property>
+                <accessibility>
+                  <property name="label">Zoom in</property>
+                </accessibility>
                <style>
                  <class name="circular"/>
                </style>
@@ -211,6 +220,9 @@
                <property name="icon-name">list-remove-symbolic</property>
                <property name="halign">center</property>
                <property name="valign">center</property>
+                <accessibility>
+                  <property name="label">Zoom out</property>
+                </accessibility>
                <style>
                  <class name="circular"/>
                </style>
@@ -251,6 +263,9 @@
            <property name="vexpand">1</property>
            <child>
              <object class="GtkPicture" id="image">
+                <accessibility>
+                  <property name="label">Font rendering example</property>
+                </accessibility>
                <property name="halign">center</property>
                <property name="valign">center</property>
                <property name="can-shrink">0</property>
@@ -18,6 +18,7 @@ do_headerbar (GtkWidget *do_widget)
  GtkWidget *header;
  GtkWidget *button;
  GtkWidget *box;
+  GtkWidget *content;

  if (!window)
    {
@@ -37,16 +38,26 @@ do_headerbar (GtkWidget *do_widget)
      box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
      gtk_widget_add_css_class (box, "linked");
      button = gtk_button_new_from_icon_name ("go-previous-symbolic");
+      gtk_widget_set_tooltip_text (button, "Back");
      gtk_box_append (GTK_BOX (box), button);
      button = gtk_button_new_from_icon_name ("go-next-symbolic");
+      gtk_widget_set_tooltip_text (button, "Forward");
      gtk_box_append (GTK_BOX (box), button);

      gtk_header_bar_pack_start (GTK_HEADER_BAR (header), box);
-      gtk_header_bar_pack_start (GTK_HEADER_BAR (header), gtk_switch_new ());
+      button = gtk_switch_new ();
+      gtk_accessible_update_property (GTK_ACCESSIBLE (button),
+                                      GTK_ACCESSIBLE_PROPERTY_LABEL, "Change something",
+                                      -1);
+      gtk_header_bar_pack_start (GTK_HEADER_BAR (header), button);

      gtk_window_set_titlebar (GTK_WINDOW (window), header);

-      gtk_window_set_child (GTK_WINDOW (window), gtk_text_view_new ());
+      content = gtk_text_view_new ();
+      gtk_accessible_update_property (GTK_ACCESSIBLE (content),
+                                      GTK_ACCESSIBLE_PROPERTY_LABEL, "Content",
+                                      -1);
+      gtk_window_set_child (GTK_WINDOW (window), content);
    }

  if (!gtk_widget_get_visible (window))
@@ -164,12 +164,18 @@ do_image_scaling (GtkWidget *do_widget)
      scale = gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, -10., 10., 0.1);
      gtk_scale_add_mark (GTK_SCALE (scale), 0., GTK_POS_TOP, NULL);
      gtk_widget_set_tooltip_text (scale, "Zoom");
+      gtk_accessible_update_property (GTK_ACCESSIBLE (scale),
+                                      GTK_ACCESSIBLE_PROPERTY_LABEL, "Zoom",
+                                      -1);
      gtk_range_set_value (GTK_RANGE (scale), 0.);
      gtk_widget_set_hexpand (scale, TRUE);
      gtk_box_append (GTK_BOX (box2), scale);

      dropdown = gtk_drop_down_new (G_LIST_MODEL (gtk_string_list_new ((const char *[]){ "Linear", "Nearest", "Trilinear", NULL })), NULL);
      gtk_widget_set_tooltip_text (dropdown, "Filter");
+      gtk_accessible_update_property (GTK_ACCESSIBLE (dropdown),
+                                      GTK_ACCESSIBLE_PROPERTY_LABEL, "Filter",
+                                      -1);
      gtk_box_append (GTK_BOX (box2), dropdown);

      g_object_bind_property (dropdown, "selected", widget, "filter", G_BINDING_DEFAULT);
@@ -49,6 +49,7 @@
                                <property name="halign">start</property>
                                <property name="valign">center</property>
                                <property name="hexpand">1</property>
+                                <property name="mnemonic-widget">switch</property>
                              </object>
                            </child>
                            <child>
@@ -73,6 +74,7 @@
                                <property name="halign">start</property>
                                <property name="valign">center</property>
                                <property name="hexpand">1</property>
+                                <property name="mnemonic-widget">check</property>
                              </object>
                            </child>
                            <child>
@@ -110,6 +112,7 @@
                                <property name="margin-start">10</property>
                                <property name="margin-end">10</property>
                                <property name="opacity">0</property>
+                                <property name="accessible-role">status</property>
                              </object>
                            </child>
                          </object>
@@ -150,10 +153,11 @@
                                  <property name="halign">start</property>
                                  <property name="valign">center</property>
                                  <property name="hexpand">1</property>
+                                  <property name="mnemonic-widget">scale</property>
                                </object>
                              </child>
                              <child>
-                                <object class="GtkScale">
+                                <object class="GtkScale" id="scale">
                                  <property name="halign">end</property>
                                  <property name="valign">center</property>
                                  <property name="draw-value">0</property>
@@ -185,10 +189,11 @@
                                  <property name="halign">start</property>
                                  <property name="valign">center</property>
                                  <property name="hexpand">1</property>
+                                  <property name="mnemonic-widget">spin</property>
                                </object>
                              </child>
                              <child>
-                                <object class="GtkSpinButton">
+                                <object class="GtkSpinButton" id="spin">
                                  <property name="halign">end</property>
                                  <property name="valign">center</property>
                                  <property name="adjustment">
@@ -217,10 +222,11 @@
                                  <property name="halign">start</property>
                                  <property name="valign">center</property>
                                  <property name="hexpand">1</property>
+                                  <property name="mnemonic-widget">dropdown</property>
                                </object>
                              </child>
                              <child>
-                                <object class="GtkDropDown">
+                                <object class="GtkDropDown" id="dropdown">
                                  <property name="halign">end</property>
                                  <property name="valign">center</property>
                                  <property name="model">
@@ -252,10 +258,11 @@
                                  <property name="halign">start</property>
                                  <property name="valign">center</property>
                                  <property name="hexpand">1</property>
+                                  <property name="mnemonic-widget">entry</property>
                                </object>
                              </child>
                              <child>
-                                <object class="GtkEntry">
+                                <object class="GtkEntry" id="entry">
                                  <property name="halign">end</property>
                                  <property name="valign">center</property>
                                  <property name="placeholder-text">Type here…</property>
@@ -52,6 +52,10 @@ setup_listitem_cb (GtkListItemFactory *factory,

  box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
  image = gtk_image_new ();
+  gtk_accessible_update_property (GTK_ACCESSIBLE (image),
+                                  GTK_ACCESSIBLE_PROPERTY_LABEL,
+                                  "App icon",
+                                  -1);
  gtk_image_set_icon_size (GTK_IMAGE (image), GTK_ICON_SIZE_LARGE);
  gtk_box_append (GTK_BOX (box), image);
  label = gtk_label_new ("");
@@ -79,6 +83,7 @@ bind_listitem_cb (GtkListItemFactory *factory,

  gtk_image_set_from_gicon (GTK_IMAGE (image), g_app_info_get_icon (app_info));
  gtk_label_set_label (GTK_LABEL (label), g_app_info_get_display_name (app_info));
+  gtk_list_item_set_accessible_label (list_item, g_app_info_get_display_name (app_info));
 }

 /* In more complex code, we would also need functions to unbind and teardown
@@ -431,6 +431,9 @@ setup_listitem_cb (GtkListItemFactory *factory,
  picture = gtk_picture_new ();
  gtk_expression_bind (expression, picture, "paintable", picture);
  gtk_box_append (GTK_BOX (box), picture);
+  gtk_accessible_update_relation (GTK_ACCESSIBLE (picture),
+                                  GTK_ACCESSIBLE_RELATION_LABELLED_BY, location_label, NULL,
+                                  -1);


  /* And finally, everything comes together.
@@ -487,6 +490,9 @@ do_listview_clocks (GtkWidget *do_widget)

      model = GTK_SELECTION_MODEL (gtk_no_selection_new (create_clocks_model ()));
      gridview = gtk_grid_view_new (model, factory);
+      gtk_accessible_update_property (GTK_ACCESSIBLE (gridview),
+                                      GTK_ACCESSIBLE_PROPERTY_LABEL, "Clocks",
+                                      -1);
      gtk_scrollable_set_hscroll_policy (GTK_SCROLLABLE (gridview), GTK_SCROLL_NATURAL);
      gtk_scrollable_set_vscroll_policy (GTK_SCROLLABLE (gridview), GTK_SCROLL_NATURAL);

@@ -368,6 +368,38 @@ match_func (MatchObject *obj,
  g_free (tmp2);
 }

+static void
+setup_header (GtkSignalListItemFactory *factory,
+              GObject                  *list_item,
+              gpointer                  data)
+{
+  GtkListHeader *self = GTK_LIST_HEADER (list_item);
+  GtkWidget *child;
+
+  child = gtk_label_new ("");
+  gtk_label_set_xalign (GTK_LABEL (child), 0);
+  gtk_label_set_use_markup (GTK_LABEL (child), TRUE);
+  gtk_widget_set_margin_top (child, 10);
+  gtk_widget_set_margin_bottom (child, 10);
+
+  gtk_list_header_set_child (self, child);
+}
+
+static void
+bind_header (GtkSignalListItemFactory *factory,
+             GObject                  *list_item,
+             gpointer                  data)
+{
+  GtkListHeader *self = GTK_LIST_HEADER (list_item);
+  GtkWidget *child = gtk_list_header_get_child (self);
+  GObject *item = gtk_list_header_get_item (self);
+
+  if (strstr (gtk_string_object_get_string (GTK_STRING_OBJECT (item)), "hour"))
+    gtk_label_set_label (GTK_LABEL (child), "<big><b>Hours</b></big>");
+  else
+    gtk_label_set_label (GTK_LABEL (child), "<big><b>Minutes</b></big>");
+}
+
 GtkWidget *
 do_listview_selections (GtkWidget *do_widget)
 {
@@ -377,10 +409,12 @@ do_listview_selections (GtkWidget *do_widget)
  GtkExpression *expression;
  GtkListItemFactory *factory;
  const char * const times[] = { "1 minute", "2 minutes", "5 minutes", "20 minutes", NULL };
-  const char * const many_times[] = {
+  const char * const minutes[] = {
    "1 minute", "2 minutes", "5 minutes", "10 minutes", "15 minutes", "20 minutes",
    "25 minutes", "30 minutes", "35 minutes", "40 minutes", "45 minutes", "50 minutes",
-    "55 minutes", "1 hour", "2 hours", "3 hours", "5 hours", "6 hours", "7 hours",
+    "55 minutes", NULL
+  };
+  const char * const hours[] = { "1 hour", "2 hours", "3 hours", "5 hours", "6 hours", "7 hours",
    "8 hours", "9 hours", "10 hours", "11 hours", "12 hours", NULL
  };
  const char * const device_titles[] = { "Digital Output", "Headphones", "Digital Output", "Analog Output", NULL };
@@ -395,6 +429,10 @@ do_listview_selections (GtkWidget *do_widget)

  if (!window)
    {
+      GtkStringList *minutes_model, *hours_model;
+      GListStore *store;
+      GtkFlattenListModel *flat;
+
      window = gtk_window_new ();
      gtk_window_set_display (GTK_WINDOW (window),
                              gtk_widget_get_display (do_widget));
@@ -422,14 +460,25 @@ do_listview_selections (GtkWidget *do_widget)
      gtk_box_append (GTK_BOX (box), button);

      /* A dropdown using an expression to obtain strings */
-      button = drop_down_new_from_strings (many_times, NULL, NULL);
-      gtk_drop_down_set_enable_search (GTK_DROP_DOWN (button), TRUE);
+      minutes_model = gtk_string_list_new (minutes);
+      hours_model = gtk_string_list_new (hours);
+      store = g_list_store_new (G_TYPE_LIST_MODEL);
+      g_list_store_append (store, minutes_model);
+      g_list_store_append (store, hours_model);
+      g_object_unref (minutes_model);
+      g_object_unref (hours_model);
+      flat = gtk_flatten_list_model_new (G_LIST_MODEL (store));
      expression = gtk_cclosure_expression_new (G_TYPE_STRING, NULL,
                                                0, NULL,
                                                (GCallback)get_title,
                                                NULL, NULL);
-      gtk_drop_down_set_expression (GTK_DROP_DOWN (button), expression);
-      gtk_expression_unref (expression);
+      button = gtk_drop_down_new (G_LIST_MODEL (flat), expression);
+      gtk_drop_down_set_enable_search (GTK_DROP_DOWN (button), TRUE);
+      factory = gtk_signal_list_item_factory_new ();
+      g_signal_connect (factory, "setup", G_CALLBACK (setup_header), NULL);
+      g_signal_connect (factory, "bind", G_CALLBACK (bind_header), NULL);
+      gtk_drop_down_set_header_factory (GTK_DROP_DOWN (button), factory);
+      g_object_unref (factory);
      gtk_box_append (GTK_BOX (box), button);

      button = gtk_drop_down_new (NULL, NULL);
@@ -10,6 +10,8 @@
        <property name="child">
          <object class="GtkInscription">
            <property name="hexpand">1</property>
+            <property name="nat-chars">25</property>
+            <property name="text-overflow">ellipsize-end</property>
            <binding name="text">
              <lookup name="title" type="GtkDemo">
                <lookup name="item">expander</lookup>
@@ -18,7 +18,6 @@
 #include <string.h>

 #include "config.h"
-
 #include <gtk/gtk.h>
 #include <glib/gstdio.h>

@@ -268,9 +267,9 @@ activate_run (GSimpleAction *action,
 }

 static GtkWidget *
-display_image (const char  *format,
-               const char  *resource,
-               char       **label)
+display_image (const char *format,
+               const char *resource,
+               GtkWidget  *label)
 {
  GtkWidget *sw, *image;

@@ -280,13 +279,17 @@ display_image (const char  *format,
  sw = gtk_scrolled_window_new ();
  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), image);

+  gtk_accessible_update_relation (GTK_ACCESSIBLE (image),
+                                  GTK_ACCESSIBLE_RELATION_LABELLED_BY, label, NULL,
+                                  -1);
+
  return sw;
 }

 static GtkWidget *
-display_images (const char  *format,
-                const char  *resource_dir,
-                char       **label)
+display_images (const char *format,
+                const char *resource_dir,
+                GtkWidget  *label)
 {
  char **resources;
  GtkWidget *grid;
@@ -311,13 +314,15 @@ display_images (const char  *format,
    {
      char *resource_name;
      GtkWidget *box;
+      GtkWidget *image_label;

      resource_name = g_strconcat (resource_dir, "/", resources[i], NULL);

-      widget = display_image (NULL, resource_name, NULL);
+      image_label = gtk_label_new (resources[i]);
+      widget = display_image (NULL, resource_name, image_label);
      box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
      gtk_box_append (GTK_BOX (box), widget);
-      gtk_box_append (GTK_BOX (box), gtk_label_new (resources[i]));
+      gtk_box_append (GTK_BOX (box), image_label);
      gtk_flow_box_insert (GTK_FLOW_BOX (grid), box, -1);

      g_free (resource_name);
@@ -325,15 +330,19 @@ display_images (const char  *format,

  g_strfreev (resources);

-  *label = g_strdup ("Images");
+  gtk_label_set_label (GTK_LABEL (label), "Images");
+
+  gtk_accessible_update_relation (GTK_ACCESSIBLE (grid),
+                                  GTK_ACCESSIBLE_RELATION_LABELLED_BY, label, NULL,
+                                  -1);

  return sw;
 }

 static GtkWidget *
-display_text (const char  *format,
-              const char  *resource,
-              char       **label)
+display_text (const char *format,
+              const char *resource,
+              GtkWidget  *label)
 {
  GtkTextBuffer *buffer;
  GtkWidget *textview, *sw;
@@ -368,6 +377,10 @@ display_text (const char  *format,

  gtk_text_view_set_buffer (GTK_TEXT_VIEW (textview), buffer);

+  gtk_accessible_update_relation (GTK_ACCESSIBLE (textview),
+                                  GTK_ACCESSIBLE_RELATION_LABELLED_BY, label, NULL,
+                                  -1);
+
  sw = gtk_scrolled_window_new ();
  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                  GTK_POLICY_AUTOMATIC,
@@ -378,15 +391,19 @@ display_text (const char  *format,
 }

 static GtkWidget *
-display_video (const char  *format,
-               const char  *resource,
-               char       **label)
+display_video (const char *format,
+               const char *resource,
+               GtkWidget  *label)
 {
  GtkWidget *video;

  video = gtk_video_new_for_resource (resource);
  gtk_video_set_loop (GTK_VIDEO (video), TRUE);

+  gtk_accessible_update_relation (GTK_ACCESSIBLE (video),
+                                  GTK_ACCESSIBLE_RELATION_LABELLED_BY, label, NULL,
+                                  -1);
+
  return video;
 }

@@ -408,9 +425,9 @@ display_nothing (const char *resource)
 static struct {
  const char *extension;
  const char *format;
-  GtkWidget * (* display_func) (const char  *format,
-                                const char  *resource,
-                                char       **label);
+  GtkWidget * (* display_func) (const char *format,
+                                const char *resource,
+                                GtkWidget  *label);
 } display_funcs[] = {
  { ".gif", NULL, display_image },
  { ".jpg", NULL, display_image },
@@ -433,7 +450,6 @@ add_data_tab (const char *demoname)
  char **resources;
  GtkWidget *widget, *label;
  guint i, j;
-  char *label_string;

  resource_dir = g_strconcat ("/", demoname, NULL);
  resources = g_resources_enumerate_children (resource_dir, 0, NULL);
@@ -453,23 +469,21 @@ add_data_tab (const char *demoname)
            break;
        }

-      label_string = NULL;
+      label = gtk_label_new (resources[i]);

      if (j < G_N_ELEMENTS (display_funcs))
        widget = display_funcs[j].display_func (display_funcs[j].format,
                                                resource_name,
-                                                &label_string);
+                                                label);
      else
        widget = display_nothing (resource_name);

-      label = gtk_label_new (label_string ? label_string : resources[i]);
      gtk_notebook_append_page (GTK_NOTEBOOK (notebook), widget, label);
      g_object_set (gtk_notebook_get_page (GTK_NOTEBOOK (notebook), widget),
                    "tab-expand", FALSE,
                    NULL);

      g_free (resource_name);
-      g_free (label_string);
    }

  g_strfreev (resources);
@@ -57,14 +57,17 @@
      <object class="GtkBox">
        <child>
          <object class="GtkBox">
-            <property name="width-request">220</property>
            <property name="orientation">vertical</property>
            <child>
              <object class="GtkSearchBar" id="searchbar">
+                <accessibility>
+                  <relation name="labelled-by">search-entry</relation>
+                </accessibility>
                <property name="key-capture-widget">window</property>
                <child>
                  <object class="GtkSearchEntry" id="search-entry">
                    <accessibility>
+                      <property name="label" translatable="yes">Search</property>
                      <relation name="controls">listview</relation>
                    </accessibility>
                  </object>
@@ -76,15 +79,15 @@
                <style>
                  <class name="sidebar"/>
                </style>
-                <property name="width-request">120</property>
                <property name="hscrollbar-policy">never</property>
-                <property name="min-content-width">150</property>
+                <property name="propagate-natural-width">1</property>
                <property name="vexpand">1</property>
                <child>
                  <object class="GtkListView" id="listview">
                    <style>
                      <class name="navigation-sidebar"/>
                    </style>
+                    <property name="tab-behavior">item</property>
                    <property name="factory">
                      <object class="GtkBuilderListItemFactory">
                        <property name="resource">/ui/main-listitem.ui</property>
@@ -68,6 +68,9 @@ do_password_entry (GtkWidget *do_widget)
                    "placeholder-text", "Password",
                    "activates-default", TRUE,
                    NULL);
+      gtk_accessible_update_property (GTK_ACCESSIBLE (entry),
+                                      GTK_ACCESSIBLE_PROPERTY_LABEL, "Password",
+                                      -1);
      g_signal_connect (entry, "notify::text", G_CALLBACK (update_button), NULL);
      gtk_box_append (GTK_BOX (box), entry);

@@ -77,6 +80,9 @@ do_password_entry (GtkWidget *do_widget)
                    "placeholder-text", "Confirm",
                    "activates-default", TRUE,
                    NULL);
+      gtk_accessible_update_property (GTK_ACCESSIBLE (entry2),
+                                      GTK_ACCESSIBLE_PROPERTY_LABEL, "Confirm",
+                                      -1);
      g_signal_connect (entry2, "notify::text", G_CALLBACK (update_button), NULL);
      gtk_box_append (GTK_BOX (box), entry2);

@@ -189,6 +189,7 @@ do_pickers (GtkWidget *do_widget)
    gtk_grid_attach (GTK_GRID (table), label, 0, 0, 1, 1);

    picker = gtk_color_dialog_button_new (gtk_color_dialog_new ());
+    gtk_label_set_mnemonic_widget (GTK_LABEL (label), picker);
    gtk_grid_attach (GTK_GRID (table), picker, 1, 0, 1, 1);

    label = gtk_label_new ("Font:");
@@ -198,6 +199,7 @@ do_pickers (GtkWidget *do_widget)
    gtk_grid_attach (GTK_GRID (table), label, 0, 1, 1, 1);

    picker = gtk_font_dialog_button_new (gtk_font_dialog_new ());
+    gtk_label_set_mnemonic_widget (GTK_LABEL (label), picker);
    gtk_grid_attach (GTK_GRID (table), picker, 1, 1, 1, 1);

    label = gtk_label_new ("File:");
@@ -208,6 +210,9 @@ do_pickers (GtkWidget *do_widget)

    picker = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
    button = gtk_button_new_from_icon_name ("document-open-symbolic");
+    gtk_accessible_update_property (GTK_ACCESSIBLE (button),
+                                    GTK_ACCESSIBLE_PROPERTY_LABEL, "Select File",
+                                    -1);

    label = gtk_label_new ("None");

@@ -223,6 +228,9 @@ do_pickers (GtkWidget *do_widget)
    gtk_box_append (GTK_BOX (picker), button);
    app_picker = gtk_button_new_from_icon_name ("emblem-system-symbolic");
    gtk_widget_set_halign (app_picker, GTK_ALIGN_END);
+    gtk_accessible_update_property (GTK_ACCESSIBLE (app_picker),
+                                    GTK_ACCESSIBLE_PROPERTY_LABEL, "Open File",
+                                    -1);
    gtk_widget_set_sensitive (app_picker, FALSE);
    g_signal_connect (app_picker, "clicked", G_CALLBACK (open_app), NULL);
    gtk_box_append (GTK_BOX (picker), app_picker);
@@ -241,7 +249,7 @@ do_pickers (GtkWidget *do_widget)
  }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_window_present (GTK_WINDOW (window));
  else
    gtk_window_destroy (GTK_WINDOW (window));

@@ -150,20 +150,36 @@ do_video_player (GtkWidget *do_widget)

      button = gtk_button_new ();
      image = gtk_image_new_from_resource ("/cursors/images/gtk_logo_cursor.png");
+      gtk_accessible_update_relation (GTK_ACCESSIBLE (image),
+                                      GTK_ACCESSIBLE_RELATION_LABELLED_BY, button, NULL,
+                                      -1);
      gtk_image_set_pixel_size (GTK_IMAGE (image), 24);
      gtk_button_set_child (GTK_BUTTON (button), image);
      g_signal_connect (button, "clicked", G_CALLBACK (logo_clicked_cb), video);
+      gtk_accessible_update_property (GTK_ACCESSIBLE (button),
+                                      GTK_ACCESSIBLE_PROPERTY_LABEL, "GTK Logo",
+                                      -1);
      gtk_header_bar_pack_start (GTK_HEADER_BAR (title), button);

      button = gtk_button_new ();
      image = gtk_image_new_from_resource ("/video-player/bbb.png");
+      gtk_accessible_update_relation (GTK_ACCESSIBLE (image),
+                                      GTK_ACCESSIBLE_RELATION_LABELLED_BY, button, NULL,
+                                      -1);
      gtk_image_set_pixel_size (GTK_IMAGE (image), 24);
      gtk_button_set_child (GTK_BUTTON (button), image);
      g_signal_connect (button, "clicked", G_CALLBACK (bbb_clicked_cb), video);
+      gtk_accessible_update_property (GTK_ACCESSIBLE (button),
+                                      GTK_ACCESSIBLE_PROPERTY_LABEL, "Big Buck Bunny",
+                                      -1);
      gtk_header_bar_pack_start (GTK_HEADER_BAR (title), button);

      fullscreen_button = gtk_button_new_from_icon_name ("view-fullscreen-symbolic");
      g_signal_connect (fullscreen_button, "clicked", G_CALLBACK (fullscreen_clicked_cb), NULL);
+      gtk_accessible_update_property (GTK_ACCESSIBLE (fullscreen_button),
+                                      GTK_ACCESSIBLE_PROPERTY_LABEL, "Fullscreen",
+                                      -1);
+
      gtk_header_bar_pack_end (GTK_HEADER_BAR (title), fullscreen_button);

      controller = gtk_shortcut_controller_new ();
@@ -1572,6 +1572,9 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                    <property name="valign">3</property>
                                    <child>
                                      <object class="GtkVolumeButton">
+                                        <accessibility>
+                                          <property name="label" translatable="1">Volume</property>
+                                        </accessibility>
                                        <property name="orientation">1</property>
                                        <property name="valign">3</property>
                                        <property name="value">.5</property>
@@ -1584,6 +1587,9 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                    </child>
                                    <child>
                                      <object class="GtkScaleButton" id="mic-button">
+                                        <accessibility>
+                                          <property name="label" translatable="1">Microphone gain</property>
+                                        </accessibility>
                                        <property name="has-tooltip">1</property>
                                        <property name="icons">microphone-sensitivity-muted-symbolic
 microphone-sensitivity-high-symbolic
@@ -23,7 +23,7 @@ When it comes to rendering, GTK follows the CSS box model as far as practical.

 The CSS stylesheet that is in use determines the sizes (and appearance) of the
 margin, border and padding areas for each widget. The size of the content area
-is determined by GTKs layout algorithm using each widgets [vfunc@Gtk.Widget.measure]
+is determined by GTKs layout algorithm using each widget’s [vfunc@Gtk.Widget.measure]
 and [vfunc@Gtk.Widget.size_allocate] vfuncs.

 You can learn more about the CSS box model by reading the
@@ -37,11 +37,11 @@ To learn more about where GTK CSS differs from CSS on the web, see the

 The content area in the CSS box model is the region that the widget considers its own.

-The origin of the widgets coordinate system is the top left corner of the content area,
-and its size is the widgets size. The size can be queried with [method@Gtk.Widget.get_width]
+The origin of the widget’s coordinate system is the top left corner of the content area,
+and its size is the widget’s size. The size can be queried with [method@Gtk.Widget.get_width]
 and [method@Gtk.Widget.get_height]. GTK allows general 3D transformations to position
 widgets (although most of the time, the transformation will be a simple 2D translation).
-The transform to go from one widgets coordinate system to another one can be obtained
+The transform to go from one widget’s coordinate system to another one can be obtained
 with [method@Gtk.Widget.compute_transform].

 In addition to a size, widgets can optionally have a **_baseline_** to position text on.
@@ -55,8 +55,8 @@ or [method@Gtk.Widget.compute_bounds]. These methods can fail (either because th
 don't share a common ancestor, or because of a singular transformation), and callers need
 to handle this eventuality.

-Another area that is occasionally relevant are the widgets **_bounds_**, which is the area
-that a widgets rendering is typically confined to (technically, widgets can draw outside
+Another area that is occasionally relevant are the widget’s **_bounds_**, which is the area
+that a widget’s rendering is typically confined to (technically, widgets can draw outside
 of this area, unless clipping is enforced via the [property@Gtk.Widget:overflow] property).
 In CSS terms, the bounds of a widget correspond to the border area.

@@ -208,6 +208,12 @@ A number of options affect behavior instead of logging:
 `nograbs`
 : Turn off all pointer and keyboard grabs

+`portals`
+: Force the use of [portals](https://docs.flatpak.org/en/latest/portals.html)
+
+`no-portals`
+: Disable use of [portals](https://docs.flatpak.org/en/latest/portals.html)
+
 `gl-disable`
 : Disable OpenGL support

@@ -31,7 +31,7 @@ described by a set of *attributes*.
 Roles define the taxonomy and semantics of a UI control to any assistive
 technology application; for instance, a button will have a role of
 `GTK_ACCESSIBLE_ROLE_BUTTON`; an entry will have a role of
-`GTK_ACCESSIBLE_ROLE_TEXTBOX`; a toggle button will have a role of
+`GTK_ACCESSIBLE_ROLE_TEXTBOX`; a check button will have a role of
 `GTK_ACCESSIBLE_ROLE_CHECKBOX`; etc.

 Each role is part of the widget's instance, and **cannot** be changed over
@@ -46,6 +46,7 @@ Each role name is part of the #GtkAccessibleRole enumeration.

 | Role name | Description | Related GTK widget |
 |-----------|-------------|--------------------|
+| `APPLICATION` | An application window | [class@Gtk.Window] |
 | `BUTTON` | A control that performs an action when pressed | [class@Gtk.Button], [class@Gtk.LinkButton], [class@Gtk.Expander] |
 | `CHECKBOX` | A control that has three possible value: `true`, `false`, or `undefined` | [class@Gtk.CheckButton] |
 | `COMBOBOX` | A control that can be expanded to show a list of possible values to select | [class@Gtk.ComboBox] |
@@ -78,7 +79,6 @@ Each role name is part of the #GtkAccessibleRole enumeration.
 | `TAB_PANEL` | A page in a notebook or stack | [class@Gtk.Stack] |
 | `TEXT_BOX` | A type of input that allows free-form text as its value. | [class@Gtk.Entry], [class@Gtk.PasswordEntry], [class@Gtk.TextView] |
 | `TREE_GRID` | A treeview-like columned list | [class@Gtk.ColumnView] |
-| `WINDOW` | An application window | [class@Gtk.Window] |
 | `...` | … |

 See the [WAI-ARIA](https://www.w3.org/WAI/PF/aria/appendices#quickref) list
@@ -204,19 +204,27 @@ you should ensure that:
   readable and localised action performed when pressed; for instance "Copy",
   "Paste", "Add layer", or "Remove"

-GTK will try to fill in some information by using ancillary UI control
-properties, for instance the accessible label will be taken from the label or
-placeholder text used by the UI control, or from its tooltip, if the
-`GTK_ACCESSIBLE_PROPERTY_LABEL` property or the `GTK_ACCESSIBLE_RELATION_LABELLED_BY`
-relation are unset. Nevertheless, it is good practice and project hygiene
-to explicitly specify the accessible properties, just like it's good practice
-to specify tooltips and style classes.
+GTK will try to fill in some information by using ancillary UI control properties,
+for instance the accessible name will be taken from the label used by the UI control,
+or from its tooltip, if the `GTK_ACCESSIBLE_PROPERTY_LABEL` property or the
+`GTK_ACCESSIBLE_RELATION_LABELLED_BY` relation are unset. Similary for the accessible
+description. Nevertheless, it is good practice and project hygiene to explicitly specify
+the accessible properties, just like it's good practice to specify tooltips and style classes.

 Application developers using GTK **should** ensure that their UI controls
-are accessible as part of the development process. When using `GtkBuilder`
-templates and UI definition files, GTK provides a validation tool that
-verifies that each UI element has a valid role and properties; this tool can
-be used as part of the application's test suite to avoid regressions.
+are accessible as part of the development process. The GTK Inspector shows
+the accessible attributes of each widget, and also provides an overlay that
+can highlight accessibility issues.
+
+It is possible to set accessible attributes in UI files as well:
+```xml
+<object class="GtkButton" id="button1">
+  <accessibility>
+    <property name="label">Download</property>
+    <relation name="labelled-by">label1</relation>
+  /accessibility>
+</object>
+```

 ## Implementations

@@ -259,6 +267,13 @@ turn automatically any widget into a `GtkButton`; but if your widget behaves
 like a button, using the %GTK_ACCESSIBLE_ROLE_BUTTON will allow any
 assistive technology to handle it like they would a `GtkButton`.

+For widgets that act as containers of other widgets, you should use
+%GTK_ACCESSIBLE_ROLE_GROUP if the grouping of the children is semantic
+in nature; for instance, the children of a [class@Gtk.HeaderBar] are
+grouped together on the header of a window. For generic containers that
+only impose a layout on their children, you should use
+%GTK_ACCESSIBLE_ROLE_GENERIC instead.
+
 ### Attributes can both hide and enhance

 Accessible attributes can be used to override the content of a UI element,
@@ -367,3 +382,6 @@ To allow changing the value via accessible technologies, you can export
 actions.  Since the accessibility interfaces only support actions
 without parameters, you should provide actions such as `increase-value`
 and `decrease-value`.
+
+Since GTK 4.10, the best way to suppose changing the value is by implementing
+the [iface@Gtk.AccessibleRange] interface.
@@ -34,7 +34,7 @@ gdk_broadway_cairo_context_dispose (GObject *object)

 static void
 gdk_broadway_cairo_context_begin_frame (GdkDrawContext *draw_context,
-                                        gboolean        prefers_high_depth,
+                                        GdkMemoryDepth  depth,
                                        cairo_region_t *region)
 {
  GdkBroadwayCairoContext *self = GDK_BROADWAY_CAIRO_CONTEXT (draw_context);
@@ -34,7 +34,7 @@ gdk_broadway_draw_context_dispose (GObject *object)

 static void
 gdk_broadway_draw_context_begin_frame (GdkDrawContext *draw_context,
-                                       gboolean        prefers_high_depth,
+                                       GdkMemoryDepth  depth,
                                       cairo_region_t *region)
 {
  GdkBroadwayDrawContext *self = GDK_BROADWAY_DRAW_CONTEXT (draw_context);
@@ -645,6 +645,9 @@ gdk_content_formats_builder_clear (GdkContentFormatsBuilder *builder)
 {
  g_clear_pointer (&builder->gtypes, g_slist_free);
  g_clear_pointer (&builder->mime_types, g_slist_free);
+
+  builder->n_gtypes = 0;
+  builder->n_mime_types = 0;
 }

 /**
@@ -36,6 +36,7 @@
 #include "gdkglcontextprivate.h"
 #include "gdkmonitorprivate.h"
 #include "gdkrectangle.h"
+#include "gdkvulkancontext.h"

 #ifdef HAVE_EGL
 #include <epoxy/egl.h>
@@ -383,6 +384,9 @@ gdk_display_dispose (GObject *object)
 #endif
  g_clear_error (&priv->gl_error);

+  for (GList *l = display->seats; l; l = l->next)
+    g_object_run_dispose (G_OBJECT (l->data));
+
  G_OBJECT_CLASS (gdk_display_parent_class)->dispose (object);
 }

@@ -1213,6 +1217,49 @@ gdk_display_get_keymap (GdkDisplay *display)
  return GDK_DISPLAY_GET_CLASS (display)->get_keymap (display);
 }

+/*<private>
+ * gdk_display_create_vulkan_context:
+ * @self: a `GdkDisplay`
+ * @error: return location for an error
+ *
+ * Creates a new `GdkVulkanContext` for use with @display.
+ *
+ * The context can not be used to draw to surfaces, it can only be
+ * used for custom rendering or compute.
+ *
+ * If the creation of the `GdkVulkanContext` failed, @error will be set.
+ *
+ * Returns: (transfer full): the newly created `GdkVulkanContext`, or
+ *   %NULL on error
+ */
+GdkVulkanContext *
+gdk_display_create_vulkan_context (GdkDisplay  *self,
+                                   GError     **error)
+{
+  g_return_val_if_fail (GDK_IS_DISPLAY (self), NULL);
+  g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+  if (gdk_display_get_debug_flags (self) & GDK_DEBUG_VULKAN_DISABLE)
+    {
+      g_set_error_literal (error, GDK_VULKAN_ERROR, GDK_VULKAN_ERROR_NOT_AVAILABLE,
+                           _("Vulkan support disabled via GDK_DEBUG"));
+      return NULL;
+    }
+
+  if (GDK_DISPLAY_GET_CLASS (self)->vk_extension_name == NULL)
+    {
+      g_set_error (error, GDK_VULKAN_ERROR, GDK_VULKAN_ERROR_UNSUPPORTED,
+                   "The %s backend has no Vulkan support.", G_OBJECT_TYPE_NAME (self));
+      return FALSE;
+    }
+
+  return g_initable_new (GDK_DISPLAY_GET_CLASS (self)->vk_context_type,
+                         NULL,
+                         error,
+                         "display", self,
+                         NULL);
+}
+
 static void
 gdk_display_init_gl (GdkDisplay *self)
 {
@@ -202,6 +202,9 @@ gulong              _gdk_display_get_next_serial      (GdkDisplay       *display
 void                _gdk_display_pause_events         (GdkDisplay       *display);
 void                _gdk_display_unpause_events       (GdkDisplay       *display);

+GdkVulkanContext *  gdk_display_create_vulkan_context (GdkDisplay       *self,
+                                                       GError          **error);
+
 GdkGLContext *      gdk_display_get_gl_context        (GdkDisplay       *display);

 gboolean            gdk_display_init_egl              (GdkDisplay       *display,
@@ -311,19 +311,20 @@ gdk_draw_context_begin_frame (GdkDrawContext       *context,
  g_return_if_fail (priv->surface != NULL);
  g_return_if_fail (region != NULL);

-  gdk_draw_context_begin_frame_full (context, FALSE, region);
+  gdk_draw_context_begin_frame_full (context, GDK_MEMORY_U8, region);
 }

 /*
- * @prefers_high_depth: %TRUE to request a higher bit depth
+ * @depth: best depth to render in
 *
- * If high depth is preferred, GDK will see about providing a rendering target
- * that supports higher bit depth than 8 bits per channel. Typically this means
- * a target supporting 16bit floating point pixels, but that is not guaranteed.
+ * If the given depth is not `GDK_MEMORY_U8`, GDK will see about providing a
+ * rendering target that supports a higher bit depth than 8 bits per channel.
+ * Typically this means a target supporting 16bit floating point pixels, but
+ * that is not guaranteed.
 *
 * This is only a request and if the GDK backend does not support HDR rendering
 * or does not consider it worthwhile, it may choose to not honor the request.
- * It may also choose to provide high depth even if it was not requested.
+ * It may also choose to provide a differnet depth even if it was not requested.
 * Typically the steps undertaken by a backend are:
 * 1. Check if high depth is supported by this drawing backend.
 * 2. Check if the compositor supports high depth.
@@ -333,12 +334,12 @@ gdk_draw_context_begin_frame (GdkDrawContext       *context,
 * In either of those cases, the context will usually choose to not honor the request.
 *
 * The rendering code must be able to deal with content in any bit depth, no matter
- * the preference. The prefers_high_depth argument is only a hint and GDK is free
+ * the preference. The depth argument is only a hint and GDK is free
 * to choose.
 */
 void
 gdk_draw_context_begin_frame_full (GdkDrawContext       *context,
-                                   gboolean              prefers_high_depth,
+                                   GdkMemoryDepth        depth,
                                   const cairo_region_t *region)
 {
  GdkDrawContextPrivate *priv = gdk_draw_context_get_instance_private (context);
@@ -365,12 +366,12 @@ gdk_draw_context_begin_frame_full (GdkDrawContext       *context,
    }

  if (gdk_display_get_debug_flags (priv->display) & GDK_DEBUG_HIGH_DEPTH)
-    prefers_high_depth = TRUE;
+    depth = GDK_MEMORY_FLOAT32;

  priv->frame_region = cairo_region_copy (region);
  priv->surface->paint_context = g_object_ref (context);

-  GDK_DRAW_CONTEXT_GET_CLASS (context)->begin_frame (context, prefers_high_depth, priv->frame_region);
+  GDK_DRAW_CONTEXT_GET_CLASS (context)->begin_frame (context, depth, priv->frame_region);

  cairo_region_intersect_rectangle (priv->frame_region,
                                    &(cairo_rectangle_int_t) {
@@ -22,6 +22,8 @@

 #include "gdkdrawcontext.h"

+#include "gdkmemoryformatprivate.h"
+
 G_BEGIN_DECLS

 #define GDK_DRAW_CONTEXT_CLASS(klass) 	(G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_DRAW_CONTEXT, GdkDrawContextClass))
@@ -40,7 +42,7 @@ struct _GdkDrawContextClass
  GObjectClass parent_class;

  void                  (* begin_frame)                         (GdkDrawContext         *context,
-                                                                 gboolean                prefers_high_depth,
+                                                                 GdkMemoryDepth          depth,
                                                                 cairo_region_t         *update_area);
  void                  (* end_frame)                           (GdkDrawContext         *context,
                                                                 cairo_region_t         *painted);
@@ -50,7 +52,7 @@ struct _GdkDrawContextClass
 void                    gdk_draw_context_surface_resized        (GdkDrawContext         *context);

 void                    gdk_draw_context_begin_frame_full       (GdkDrawContext         *context,
-                                                                 gboolean                prefers_high_depth,
+                                                                 GdkMemoryDepth          depth,
                                                                 const cairo_region_t   *region);
 G_END_DECLS

@@ -173,12 +173,8 @@ static GPrivate thread_current_context = G_PRIVATE_INIT (unref_unmasked);
 static void
 gdk_gl_context_clear_old_updated_area (GdkGLContext *context)
 {
-  int i;
-
-  for (i = 0; i < 2; i++)
-    {
-      g_clear_pointer (&context->old_updated_area[i], cairo_region_destroy);
-    }
+  for (unsigned int i = 0; i < GDK_GL_MAX_TRACKED_BUFFERS; i++)
+    g_clear_pointer (&context->old_updated_area[i], cairo_region_destroy);
 }

 static void
@@ -585,7 +581,7 @@ gdk_gl_context_get_scale (GdkGLContext *self)

 static void
 gdk_gl_context_real_begin_frame (GdkDrawContext *draw_context,
-                                 gboolean        prefers_high_depth,
+                                 GdkMemoryDepth  depth,
                                 cairo_region_t *region)
 {
  GdkGLContext *context = GDK_GL_CONTEXT (draw_context);
@@ -601,7 +597,7 @@ gdk_gl_context_real_begin_frame (GdkDrawContext *draw_context,

 #ifdef HAVE_EGL
  if (priv->egl_context)
-    gdk_surface_ensure_egl_surface (surface, prefers_high_depth);
+    gdk_surface_ensure_egl_surface (surface, depth != GDK_MEMORY_U8);
 #endif

  damage = GDK_GL_CONTEXT_GET_CLASS (context)->get_damage (context);
@@ -258,7 +258,7 @@ struct _GdkMemoryFormatDescription
  GdkMemoryAlpha alpha;
  gsize bytes_per_pixel;
  gsize alignment;
-  gboolean prefers_high_depth;
+  GdkMemoryDepth depth;
  struct {
    guint gl_major;
    guint gl_minor;
@@ -289,7 +289,7 @@ static const GdkMemoryFormatDescription memory_formats[GDK_MEMORY_N_FORMATS] = {
    GDK_MEMORY_ALPHA_PREMULTIPLIED,
    4,
    G_ALIGNOF (guchar),
-    FALSE,
+    GDK_MEMORY_U8,
    { 0, 0, G_MAXUINT, G_MAXUINT },
    { GL_RGBA8, GL_BGRA, GL_UNSIGNED_BYTE, { GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA } },
    b8g8r8a8_premultiplied_to_float,
@@ -299,7 +299,7 @@ static const GdkMemoryFormatDescription memory_formats[GDK_MEMORY_N_FORMATS] = {
    GDK_MEMORY_ALPHA_PREMULTIPLIED,
    4,
    G_ALIGNOF (guchar),
-    FALSE,
+    GDK_MEMORY_U8,
    { 0, 0, G_MAXUINT, G_MAXUINT },
    { GL_RGBA8, GL_BGRA, GDK_GL_UNSIGNED_BYTE_FLIPPED, { GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA } },
    a8r8g8b8_premultiplied_to_float,
@@ -309,7 +309,7 @@ static const GdkMemoryFormatDescription memory_formats[GDK_MEMORY_N_FORMATS] = {
    GDK_MEMORY_ALPHA_PREMULTIPLIED,
    4,
    G_ALIGNOF (guchar),
-    FALSE,
+    GDK_MEMORY_U8,
    { 0, 0, 0, 0 },
    { GL_RGBA8, GL_RGBA, GL_UNSIGNED_BYTE, { GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA } },
    r8g8b8a8_premultiplied_to_float,
@@ -319,7 +319,7 @@ static const GdkMemoryFormatDescription memory_formats[GDK_MEMORY_N_FORMATS] = {
    GDK_MEMORY_ALPHA_STRAIGHT,
    4,
    G_ALIGNOF (guchar),
-    FALSE,
+    GDK_MEMORY_U8,
    { 0, 0, G_MAXUINT, G_MAXUINT },
    { GL_RGBA8, GL_BGRA, GL_UNSIGNED_BYTE, { GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA } },
    b8g8r8a8_to_float,
@@ -329,7 +329,7 @@ static const GdkMemoryFormatDescription memory_formats[GDK_MEMORY_N_FORMATS] = {
    GDK_MEMORY_ALPHA_STRAIGHT,
    4,
    G_ALIGNOF (guchar),
-    FALSE,
+    GDK_MEMORY_U8,
    { 0, 0, G_MAXUINT, G_MAXUINT },
    { GL_RGBA8, GL_RGBA, GDK_GL_UNSIGNED_BYTE_FLIPPED, { GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA } },
    a8r8g8b8_to_float,
@@ -339,7 +339,7 @@ static const GdkMemoryFormatDescription memory_formats[GDK_MEMORY_N_FORMATS] = {
    GDK_MEMORY_ALPHA_STRAIGHT,
    4,
    G_ALIGNOF (guchar),
-    FALSE,
+    GDK_MEMORY_U8,
    { 0, 0, 0, 0 },
    { GL_RGBA8, GL_RGBA, GL_UNSIGNED_BYTE, { GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA } },
    r8g8b8a8_to_float,
@@ -349,7 +349,7 @@ static const GdkMemoryFormatDescription memory_formats[GDK_MEMORY_N_FORMATS] = {
    GDK_MEMORY_ALPHA_STRAIGHT,
    4,
    G_ALIGNOF (guchar),
-    FALSE,
+    GDK_MEMORY_U8,
    { 0, 0, G_MAXUINT, G_MAXUINT },
    { GL_RGBA8, GL_BGRA, GDK_GL_UNSIGNED_BYTE_FLIPPED, { GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA } },
    a8b8g8r8_to_float,
@@ -359,7 +359,7 @@ static const GdkMemoryFormatDescription memory_formats[GDK_MEMORY_N_FORMATS] = {
    GDK_MEMORY_ALPHA_OPAQUE,
    3,
    G_ALIGNOF (guchar),
-    FALSE,
+    GDK_MEMORY_U8,
    { 0, 0, 0, 0 },
    { GL_RGB8, GL_RGB, GL_UNSIGNED_BYTE, { GL_RED, GL_GREEN, GL_BLUE, GL_ONE } },
    r8g8b8_to_float,
@@ -369,7 +369,7 @@ static const GdkMemoryFormatDescription memory_formats[GDK_MEMORY_N_FORMATS] = {
    GDK_MEMORY_ALPHA_OPAQUE,
    3,
    G_ALIGNOF (guchar),
-    FALSE,
+    GDK_MEMORY_U8,
    { 0, 0, G_MAXUINT, G_MAXUINT },
    { GL_RGB8, GL_BGR, GL_UNSIGNED_BYTE, { GL_RED, GL_GREEN, GL_BLUE, GL_ONE } },
    b8g8r8_to_float,
@@ -379,7 +379,7 @@ static const GdkMemoryFormatDescription memory_formats[GDK_MEMORY_N_FORMATS] = {
    GDK_MEMORY_ALPHA_OPAQUE,
    6,
    G_ALIGNOF (guint16),
-    TRUE,
+    GDK_MEMORY_U16,
    { 0, 0, 3, 0 },
    { GL_RGB16, GL_RGB, GL_UNSIGNED_SHORT, { GL_RED, GL_GREEN, GL_BLUE, GL_ONE } },
    r16g16b16_to_float,
@@ -389,7 +389,7 @@ static const GdkMemoryFormatDescription memory_formats[GDK_MEMORY_N_FORMATS] = {
    GDK_MEMORY_ALPHA_PREMULTIPLIED,
    8,
    G_ALIGNOF (guint16),
-    TRUE,
+    GDK_MEMORY_U16,
    { 0, 0, 3, 0 },
    { GL_RGBA16, GL_RGBA, GL_UNSIGNED_SHORT, { GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA } },
    r16g16b16a16_to_float,
@@ -399,7 +399,7 @@ static const GdkMemoryFormatDescription memory_formats[GDK_MEMORY_N_FORMATS] = {
    GDK_MEMORY_ALPHA_STRAIGHT,
    8,
    G_ALIGNOF (guint16),
-    TRUE,
+    GDK_MEMORY_U16,
    { 0, 0, 3, 0 },
    { GL_RGBA16, GL_RGBA, GL_UNSIGNED_SHORT, { GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA } },
    r16g16b16a16_to_float,
@@ -409,7 +409,7 @@ static const GdkMemoryFormatDescription memory_formats[GDK_MEMORY_N_FORMATS] = {
    GDK_MEMORY_ALPHA_OPAQUE,
    6,
    G_ALIGNOF (guint16),
-    TRUE,
+    GDK_MEMORY_FLOAT16,
    { 0, 0, 3, 0 },
    { GL_RGB16F, GL_RGB, GL_HALF_FLOAT, { GL_RED, GL_GREEN, GL_BLUE, GL_ONE } },
    r16g16b16_float_to_float,
@@ -419,7 +419,7 @@ static const GdkMemoryFormatDescription memory_formats[GDK_MEMORY_N_FORMATS] = {
    GDK_MEMORY_ALPHA_PREMULTIPLIED,
    8,
    G_ALIGNOF (guint16),
-    TRUE,
+    GDK_MEMORY_FLOAT16,
    { 0, 0, 3, 0 },
    { GL_RGBA16F, GL_RGBA, GL_HALF_FLOAT, { GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA } },
    r16g16b16a16_float_to_float,
@@ -429,7 +429,7 @@ static const GdkMemoryFormatDescription memory_formats[GDK_MEMORY_N_FORMATS] = {
    GDK_MEMORY_ALPHA_STRAIGHT,
    8,
    G_ALIGNOF (guint16),
-    TRUE,
+    GDK_MEMORY_FLOAT16,
    { 0, 0, 3, 0 },
    { GL_RGBA16F, GL_RGBA, GL_HALF_FLOAT, { GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA } },
    r16g16b16a16_float_to_float,
@@ -439,7 +439,7 @@ static const GdkMemoryFormatDescription memory_formats[GDK_MEMORY_N_FORMATS] = {
    GDK_MEMORY_ALPHA_OPAQUE,
    12,
    G_ALIGNOF (float),
-    TRUE,
+    GDK_MEMORY_FLOAT32,
    { 0, 0, 3, 0 },
    { GL_RGB32F, GL_RGB, GL_FLOAT, { GL_RED, GL_GREEN, GL_BLUE, GL_ONE } },
    r32g32b32_float_to_float,
@@ -459,7 +459,7 @@ static const GdkMemoryFormatDescription memory_formats[GDK_MEMORY_N_FORMATS] = {
    GDK_MEMORY_ALPHA_STRAIGHT,
    16,
    G_ALIGNOF (float),
-    TRUE,
+    GDK_MEMORY_FLOAT32,
    { 0, 0, 3, 0 },
    { GL_RGBA32F, GL_RGBA, GL_FLOAT, { GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA } },
    r32g32b32a32_float_to_float,
@@ -469,7 +469,7 @@ static const GdkMemoryFormatDescription memory_formats[GDK_MEMORY_N_FORMATS] = {
    GDK_MEMORY_ALPHA_PREMULTIPLIED,
    2,
    G_ALIGNOF (guchar),
-    FALSE,
+    GDK_MEMORY_U8,
    { 0, 0, 3, 0 },
    { GL_RG8, GL_RG, GL_UNSIGNED_BYTE, { GL_RED, GL_RED, GL_RED, GL_GREEN } },
    g8a8_premultiplied_to_float,
@@ -479,7 +479,7 @@ static const GdkMemoryFormatDescription memory_formats[GDK_MEMORY_N_FORMATS] = {
    GDK_MEMORY_ALPHA_STRAIGHT,
    2,
    G_ALIGNOF (guchar),
-    FALSE,
+    GDK_MEMORY_U8,
    { 0, 0, 3, 0 },
    { GL_RG8, GL_RG, GL_UNSIGNED_BYTE, { GL_RED, GL_RED, GL_RED, GL_GREEN } },
    g8a8_to_float,
@@ -489,7 +489,7 @@ static const GdkMemoryFormatDescription memory_formats[GDK_MEMORY_N_FORMATS] = {
    GDK_MEMORY_ALPHA_OPAQUE,
    1,
    G_ALIGNOF (guchar),
-    FALSE,
+    GDK_MEMORY_U8,
    { 0, 0, 3, 0 },
    { GL_R8, GL_RED, GL_UNSIGNED_BYTE, { GL_RED, GL_RED, GL_RED, GL_ONE } },
    g8_to_float,
@@ -499,7 +499,7 @@ static const GdkMemoryFormatDescription memory_formats[GDK_MEMORY_N_FORMATS] = {
    GDK_MEMORY_ALPHA_PREMULTIPLIED,
    4,
    G_ALIGNOF (guint16),
-    TRUE,
+    GDK_MEMORY_U16,
    { 0, 0, 3, 0 },
    { GL_RG16, GL_RG, GL_UNSIGNED_SHORT, { GL_RED, GL_RED, GL_RED, GL_GREEN } },
    g16a16_premultiplied_to_float,
@@ -509,7 +509,7 @@ static const GdkMemoryFormatDescription memory_formats[GDK_MEMORY_N_FORMATS] = {
    GDK_MEMORY_ALPHA_STRAIGHT,
    4,
    G_ALIGNOF (guint16),
-    TRUE,
+    GDK_MEMORY_U16,
    { 0, 0, 3, 0 },
    { GL_RG16, GL_RG, GL_UNSIGNED_SHORT, { GL_RED, GL_RED, GL_RED, GL_GREEN } },
    g16a16_to_float,
@@ -519,7 +519,7 @@ static const GdkMemoryFormatDescription memory_formats[GDK_MEMORY_N_FORMATS] = {
    GDK_MEMORY_ALPHA_OPAQUE,
    2,
    G_ALIGNOF (guint16),
-    TRUE,
+    GDK_MEMORY_U16,
    { 0, 0, 3, 0 },
    { GL_R16, GL_RED, GL_UNSIGNED_SHORT, { GL_RED, GL_RED, GL_RED, GL_ONE } },
    g16_to_float,
@@ -529,7 +529,7 @@ static const GdkMemoryFormatDescription memory_formats[GDK_MEMORY_N_FORMATS] = {
    GDK_MEMORY_ALPHA_STRAIGHT,
    1,
    G_ALIGNOF (guchar),
-    FALSE,
+    GDK_MEMORY_U8,
    { 0, 0, 3, 0 },
    { GL_R8, GL_RED, GL_UNSIGNED_BYTE, { GL_ONE, GL_ONE, GL_ONE, GL_RED } },
    a8_to_float,
@@ -539,7 +539,7 @@ static const GdkMemoryFormatDescription memory_formats[GDK_MEMORY_N_FORMATS] = {
    GDK_MEMORY_ALPHA_STRAIGHT,
    2,
    G_ALIGNOF (guint16),
-    TRUE,
+    GDK_MEMORY_U16,
    { 0, 0, 3, 0 },
    { GL_R16, GL_RED, GL_UNSIGNED_SHORT, { GL_ONE, GL_ONE, GL_ONE, GL_RED } },
    a16_to_float,
@@ -566,23 +566,57 @@ gdk_memory_format_alignment (GdkMemoryFormat format)
 }

 /*<private>
- * gdk_memory_format_prefers_high_depth:
+ * gdk_memory_format_get_depth:
 * @format: a memory format
 *
- * Checks if the given format benefits from being rendered
- * in bit depths higher than 8bits per pixel. See
- * gsk_render_node_prefers_high_depth() for more information
- * on this.
- * Usually this is the case when
- * gdk_memory_format_bytes_per_pixel() is larger than 4.
+ * Gets the depth of the individual channels of the format.
+ * See gsk_render_node_prefers_high_depth() for more
+ * information on this.
 *
- * Returns: %TRUE if the format benefits from being
- *     composited in hgiher bit depths.
+ * Usually renderers want to use higher depth for render
+ * targets to match these formats.
+ *
+ * Returns: The depth of this format
 **/
-gboolean
-gdk_memory_format_prefers_high_depth (GdkMemoryFormat format)
+GdkMemoryDepth
+gdk_memory_format_get_depth (GdkMemoryFormat format)
 {
-  return memory_formats[format].prefers_high_depth;
+  return memory_formats[format].depth;
+}
+
+/*<private>
+ * gdk_memory_depth_merge:
+ * @depth1: the first depth
+ * @depth2: the second depth
+ *
+ * Returns a depth that can accomodate both given depths
+ * without any loss of precision.
+ *
+ * Returns: The merged depth
+ **/
+GdkMemoryDepth
+gdk_memory_depth_merge (GdkMemoryDepth depth1,
+                        GdkMemoryDepth depth2)
+{
+  switch (depth1)
+    {
+      case GDK_MEMORY_U8:
+        return depth2;
+
+      case GDK_MEMORY_FLOAT32:
+        return GDK_MEMORY_FLOAT32;
+
+      case GDK_MEMORY_U16:
+      case GDK_MEMORY_FLOAT16:
+        if (depth2 == depth1 || depth2 == GDK_MEMORY_U8)
+          return depth1;
+        else
+          return GDK_MEMORY_FLOAT32;
+
+      default:
+        g_assert_not_reached ();
+        return GDK_MEMORY_U8;
+    }
 }

 gboolean
@@ -31,10 +31,19 @@ typedef enum {
  GDK_MEMORY_ALPHA_OPAQUE
 } GdkMemoryAlpha;

+typedef enum {
+  GDK_MEMORY_U8,
+  GDK_MEMORY_U16,
+  GDK_MEMORY_FLOAT16,
+  GDK_MEMORY_FLOAT32
+} GdkMemoryDepth;
+
 gsize                   gdk_memory_format_alignment         (GdkMemoryFormat             format) G_GNUC_CONST;
 GdkMemoryAlpha          gdk_memory_format_alpha             (GdkMemoryFormat             format) G_GNUC_CONST;
 gsize                   gdk_memory_format_bytes_per_pixel   (GdkMemoryFormat             format) G_GNUC_CONST;
-gboolean                gdk_memory_format_prefers_high_depth(GdkMemoryFormat             format) G_GNUC_CONST;
+GdkMemoryDepth          gdk_memory_format_get_depth         (GdkMemoryFormat             format) G_GNUC_CONST;
+GdkMemoryDepth          gdk_memory_depth_merge              (GdkMemoryDepth              depth1,
+                                                             GdkMemoryDepth              depth2) G_GNUC_CONST;
 gboolean                gdk_memory_format_gl_format         (GdkMemoryFormat             format,
                                                             gboolean                    gles,
                                                             guint                       gl_major,
@@ -55,7 +55,7 @@ typedef enum {
  GDK_SEAT_CAPABILITY_KEYBOARD      = 1 << 3,
  GDK_SEAT_CAPABILITY_TABLET_PAD    = 1 << 4,
  GDK_SEAT_CAPABILITY_ALL_POINTING  = (GDK_SEAT_CAPABILITY_POINTER | GDK_SEAT_CAPABILITY_TOUCH | GDK_SEAT_CAPABILITY_TABLET_STYLUS),
-  GDK_SEAT_CAPABILITY_ALL           = (GDK_SEAT_CAPABILITY_ALL_POINTING | GDK_SEAT_CAPABILITY_KEYBOARD)
+  GDK_SEAT_CAPABILITY_ALL           = (GDK_SEAT_CAPABILITY_ALL_POINTING | GDK_SEAT_CAPABILITY_KEYBOARD | GDK_SEAT_CAPABILITY_TABLET_PAD)
 } GdkSeatCapabilities;

 struct _GdkSeat
@@ -47,7 +47,12 @@ typedef struct _GdkVulkanContextPrivate GdkVulkanContextPrivate;
 struct _GdkVulkanContextPrivate {
 #ifdef GDK_RENDERING_VULKAN
  VkSurfaceKHR surface;
-  VkSurfaceFormatKHR image_format;
+  struct {
+    VkSurfaceFormatKHR vk_format;
+    GdkMemoryFormat gdk_format;
+  } formats[4];
+  GdkMemoryDepth current_format;
+  GdkMemoryFormat offscreen_formats[4];

  VkSwapchainKHR swapchain;
  VkSemaphore draw_semaphore;
@@ -429,8 +434,8 @@ gdk_vulkan_context_check_swapchain (GdkVulkanContext  *context,
                                                .minImageCount = CLAMP (4,
                                                                        capabilities.minImageCount,
                                                                        capabilities.maxImageCount ? capabilities.maxImageCount : G_MAXUINT32),
-                                                .imageFormat = priv->image_format.format,
-                                                .imageColorSpace = priv->image_format.colorSpace,
+                                                .imageFormat = priv->formats[priv->current_format].vk_format.format,
+                                                .imageColorSpace = priv->formats[priv->current_format].vk_format.colorSpace,
                                                .imageExtent = capabilities.currentExtent,
                                                .imageArrayLayers = 1,
                                                .imageUsage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT,
@@ -499,19 +504,20 @@ gdk_vulkan_context_check_swapchain (GdkVulkanContext  *context,
 }

 static gboolean
-device_supports_incremental_present (VkPhysicalDevice device)
+physical_device_supports_extension (VkPhysicalDevice  device,
+                                    const char       *extension_name)
 {
  VkExtensionProperties *extensions;
  uint32_t n_device_extensions;

-  vkEnumerateDeviceExtensionProperties (device, NULL, &n_device_extensions, NULL);
+  GDK_VK_CHECK (vkEnumerateDeviceExtensionProperties, device, NULL, &n_device_extensions, NULL);

  extensions = g_newa (VkExtensionProperties, n_device_extensions);
-  vkEnumerateDeviceExtensionProperties (device, NULL, &n_device_extensions, extensions);
+  GDK_VK_CHECK (vkEnumerateDeviceExtensionProperties, device, NULL, &n_device_extensions, extensions);

  for (uint32_t i = 0; i < n_device_extensions; i++)
    {
-      if (g_str_equal (extensions[i].extensionName, VK_KHR_INCREMENTAL_PRESENT_EXTENSION_NAME))
+      if (g_str_equal (extensions[i].extensionName, extension_name))
        return TRUE;
    }

@@ -520,13 +526,27 @@ device_supports_incremental_present (VkPhysicalDevice device)

 static void
 gdk_vulkan_context_begin_frame (GdkDrawContext *draw_context,
-                                gboolean        prefers_high_depth,
+                                GdkMemoryDepth  depth,
                                cairo_region_t *region)
 {
  GdkVulkanContext *context = GDK_VULKAN_CONTEXT (draw_context);
  GdkVulkanContextPrivate *priv = gdk_vulkan_context_get_instance_private (context);
  guint i;

+  if (depth != priv->current_format)
+    {
+      if (priv->formats[depth].gdk_format != priv->formats[priv->current_format].gdk_format)
+        {
+          GError *error = NULL;
+          if (!gdk_vulkan_context_check_swapchain (context, &error))
+            {
+              g_warning ("%s", error->message);
+              g_error_free (error);
+              return;
+            }
+        }
+      priv->current_format = depth;
+    }
  for (i = 0; i < priv->n_images; i++)
    {
      cairo_region_union (priv->regions[i], region);
@@ -665,6 +685,7 @@ gdk_vulkan_context_real_init (GInitable     *initable,
  GdkVulkanContext *context = GDK_VULKAN_CONTEXT (initable);
  GdkVulkanContextPrivate *priv = gdk_vulkan_context_get_instance_private (context);
  GdkDisplay *display = gdk_draw_context_get_display (GDK_DRAW_CONTEXT (context));
+  GdkSurface *surface = gdk_draw_context_get_surface (GDK_DRAW_CONTEXT (context));
  VkResult res;
  VkBool32 supported;
  uint32_t i;
@@ -673,6 +694,22 @@ gdk_vulkan_context_real_init (GInitable     *initable,
  if (!priv->vulkan_ref)
    return FALSE;

+  priv->offscreen_formats[GDK_MEMORY_U8] = GDK_MEMORY_B8G8R8A8_PREMULTIPLIED;
+  priv->offscreen_formats[GDK_MEMORY_U16] = GDK_MEMORY_R16G16B16A16_PREMULTIPLIED;
+  priv->offscreen_formats[GDK_MEMORY_FLOAT16] = GDK_MEMORY_R16G16B16A16_FLOAT_PREMULTIPLIED;
+  priv->offscreen_formats[GDK_MEMORY_FLOAT32] = GDK_MEMORY_R32G32B32A32_FLOAT_PREMULTIPLIED;
+
+  if (surface == NULL)
+    {
+      for (i = 0; i < G_N_ELEMENTS (priv->formats); i++)
+        {
+          priv->formats[i].vk_format.format = VK_FORMAT_B8G8R8A8_UNORM;
+          priv->formats[i].vk_format.colorSpace = VK_COLOR_SPACE_SRGB_NONLINEAR_KHR;
+          priv->formats[i].gdk_format = GDK_MEMORY_B8G8R8A8_PREMULTIPLIED;
+        }
+      return TRUE;
+    }
+
  res = GDK_VULKAN_CONTEXT_GET_CLASS (context)->create_surface (context, &priv->surface);
  if (res != VK_SUCCESS)
    {
@@ -707,17 +744,74 @@ gdk_vulkan_context_real_init (GInitable     *initable,
                                                          &n_formats, formats);
      for (i = 0; i < n_formats; i++)
        {
-          if (formats[i].format == VK_FORMAT_B8G8R8A8_UNORM)
-            break;
+          if (formats[i].colorSpace != VK_COLOR_SPACE_SRGB_NONLINEAR_KHR)
+            continue;
+
+          switch ((int) formats[i].format)
+            {
+              case VK_FORMAT_B8G8R8A8_UNORM:
+                if (priv->formats[GDK_MEMORY_U8].vk_format.format == VK_FORMAT_UNDEFINED)
+                  {
+                    priv->formats[GDK_MEMORY_U8].vk_format = formats[i];
+                    priv->formats[GDK_MEMORY_U8].gdk_format = GDK_MEMORY_B8G8R8A8_PREMULTIPLIED;
+                    priv->offscreen_formats[GDK_MEMORY_U8] = GDK_MEMORY_B8G8R8A8_PREMULTIPLIED;
+                  };
+                break;
+
+              case VK_FORMAT_R8G8B8A8_UNORM:
+                if (priv->formats[GDK_MEMORY_U8].vk_format.format == VK_FORMAT_UNDEFINED)
+                  {
+                    priv->formats[GDK_MEMORY_U8].vk_format = formats[i];
+                    priv->formats[GDK_MEMORY_U8].gdk_format = GDK_MEMORY_R8G8B8A8_PREMULTIPLIED;
+                  }
+                break;
+
+              case VK_FORMAT_R16G16B16A16_UNORM:
+                priv->formats[GDK_MEMORY_U16].vk_format = formats[i];
+                priv->formats[GDK_MEMORY_U16].gdk_format = GDK_MEMORY_R16G16B16A16_PREMULTIPLIED;
+                break;
+
+              case VK_FORMAT_R16G16B16A16_SFLOAT:
+                priv->formats[GDK_MEMORY_FLOAT16].vk_format = formats[i];
+                priv->formats[GDK_MEMORY_FLOAT16].gdk_format = GDK_MEMORY_R16G16B16A16_FLOAT_PREMULTIPLIED;
+                break;
+
+              case VK_FORMAT_R32G32B32A32_SFLOAT:
+                priv->formats[GDK_MEMORY_FLOAT32].vk_format = formats[i];
+                priv->formats[GDK_MEMORY_FLOAT32].gdk_format = GDK_MEMORY_R32G32B32A32_FLOAT_PREMULTIPLIED;
+                break;
+
+              default:
+                break;
+            }
        }
-      if (i == n_formats)
+      if (priv->formats[GDK_MEMORY_U8].vk_format.format == VK_FORMAT_UNDEFINED)
        {
          g_set_error_literal (error, GDK_VULKAN_ERROR, GDK_VULKAN_ERROR_NOT_AVAILABLE,
                               "No supported image format found.");
          goto out_surface;
        }
-      priv->image_format = formats[i];
-      priv->has_present_region = device_supports_incremental_present (display->vk_physical_device);
+      /* Ensure all the formats exist:
+       * - If a format was found, keep that one.
+       * - FLOAT32 chooses the best format we have.
+       * - FLOAT16 and U16 pick the format FLOAT32 uses
+       */
+      if (priv->formats[GDK_MEMORY_FLOAT32].vk_format.format == VK_FORMAT_UNDEFINED)
+        {
+          if (priv->formats[GDK_MEMORY_FLOAT16].vk_format.format != VK_FORMAT_UNDEFINED)
+            priv->formats[GDK_MEMORY_FLOAT32] = priv->formats[GDK_MEMORY_FLOAT16];
+          else if (priv->formats[GDK_MEMORY_U16].vk_format.format != VK_FORMAT_UNDEFINED)
+            priv->formats[GDK_MEMORY_FLOAT32] = priv->formats[GDK_MEMORY_U16];
+          else
+            priv->formats[GDK_MEMORY_FLOAT32] = priv->formats[GDK_MEMORY_U8];
+        }
+      if (priv->formats[GDK_MEMORY_FLOAT16].vk_format.format == VK_FORMAT_UNDEFINED)
+        priv->formats[GDK_MEMORY_FLOAT16] = priv->formats[GDK_MEMORY_FLOAT32];
+      if (priv->formats[GDK_MEMORY_U16].vk_format.format == VK_FORMAT_UNDEFINED)
+        priv->formats[GDK_MEMORY_U16] = priv->formats[GDK_MEMORY_FLOAT32];
+
+      priv->has_present_region = physical_device_supports_extension (display->vk_physical_device,
+                                                                     VK_KHR_INCREMENTAL_PRESENT_EXTENSION_NAME);

      if (!gdk_vulkan_context_check_swapchain (context, error))
        goto out_surface;
@@ -740,6 +834,15 @@ out_surface:
  return FALSE;
 }

+GdkMemoryFormat
+gdk_vulkan_context_get_offscreen_format (GdkVulkanContext *context,
+                                         GdkMemoryDepth    depth)
+{
+  GdkVulkanContextPrivate *priv = gdk_vulkan_context_get_instance_private (context);
+
+  return priv->offscreen_formats[depth];
+}
+
 static void
 gdk_vulkan_context_initable_init (GInitableIface *iface)
 {
@@ -843,7 +946,7 @@ gdk_vulkan_context_get_image_format (GdkVulkanContext *context)

  g_return_val_if_fail (GDK_IS_VULKAN_CONTEXT (context), VK_FORMAT_UNDEFINED);

-  return priv->image_format.format;
+  return priv->formats[priv->current_format].vk_format.format;
 }

 /**
@@ -1039,6 +1142,10 @@ gdk_display_create_vulkan_device (GdkDisplay  *display,
  for (i = first; i < last; i++)
    {
      uint32_t n_queue_props;
+
+      if (!physical_device_supports_extension (devices[i], VK_EXT_DESCRIPTOR_INDEXING_EXTENSION_NAME))
+        continue;
+
      vkGetPhysicalDeviceQueueFamilyProperties (devices[i], &n_queue_props, NULL);
      VkQueueFamilyProperties *queue_props = g_newa (VkQueueFamilyProperties, n_queue_props);
      vkGetPhysicalDeviceQueueFamilyProperties (devices[i], &n_queue_props, queue_props);
@@ -1049,30 +1156,36 @@ gdk_display_create_vulkan_device (GdkDisplay  *display,
              GPtrArray *device_extensions;
              gboolean has_incremental_present;

-              has_incremental_present = device_supports_incremental_present (devices[i]);
+              has_incremental_present = physical_device_supports_extension (devices[i],
+                                                                            VK_KHR_INCREMENTAL_PRESENT_EXTENSION_NAME);

              device_extensions = g_ptr_array_new ();
              g_ptr_array_add (device_extensions, (gpointer) VK_KHR_SWAPCHAIN_EXTENSION_NAME);
+              g_ptr_array_add (device_extensions, (gpointer) VK_KHR_MAINTENANCE_3_EXTENSION_NAME);
+              g_ptr_array_add (device_extensions, (gpointer) VK_EXT_DESCRIPTOR_INDEXING_EXTENSION_NAME);
              if (has_incremental_present)
                g_ptr_array_add (device_extensions, (gpointer) VK_KHR_INCREMENTAL_PRESENT_EXTENSION_NAME);

              GDK_DISPLAY_DEBUG (display, VULKAN, "Using Vulkan device %u, queue %u", i, j);
              if (GDK_VK_CHECK (vkCreateDevice, devices[i],
                                                &(VkDeviceCreateInfo) {
-                                                    VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO,
-                                                    NULL,
-                                                    0,
-                                                    1,
-                                                    &(VkDeviceQueueCreateInfo) {
+                                                    .sType = VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO,
+                                                    .queueCreateInfoCount = 1,
+                                                    .pQueueCreateInfos = &(VkDeviceQueueCreateInfo) {
                                                        .sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO,
                                                        .queueFamilyIndex = j,
                                                        .queueCount = 1,
                                                        .pQueuePriorities = (float []) { 1.0f },
                                                    },
-                                                    0,
-                                                    NULL,
-                                                    device_extensions->len,
-                                                    (const char * const *) device_extensions->pdata
+                                                    .enabledExtensionCount = device_extensions->len,
+                                                    .ppEnabledExtensionNames = (const char * const *) device_extensions->pdata,
+                                                    .pNext = &(VkPhysicalDeviceDescriptorIndexingFeatures) {
+                                                      .sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_FEATURES,
+                                                      .descriptorBindingPartiallyBound = VK_TRUE,
+                                                      .descriptorBindingVariableDescriptorCount = VK_TRUE,
+                                                      .descriptorBindingSampledImageUpdateAfterBind = VK_TRUE,
+                                                      .descriptorBindingStorageBufferUpdateAfterBind = VK_TRUE,
+                                                    }
                                                },
                                                NULL,
                                                &display->vk_device) != VK_SUCCESS)
@@ -1144,6 +1257,7 @@ gdk_display_create_vulkan_instance (GdkDisplay  *display,

  used_extensions = g_ptr_array_new ();
  g_ptr_array_add (used_extensions, (gpointer) VK_KHR_SURFACE_EXTENSION_NAME);
+  g_ptr_array_add (used_extensions, (gpointer) VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME);
  g_ptr_array_add (used_extensions, (gpointer) GDK_DISPLAY_GET_CLASS (display)->vk_extension_name);

  for (i = 0; i < n_extensions; i++)
@@ -1215,7 +1329,7 @@ gdk_display_create_vulkan_instance (GdkDisplay  *display,
                                             .enabledLayerCount = used_layers->len,
                                             .ppEnabledLayerNames = (const char * const *) used_layers->pdata,
                                             .enabledExtensionCount = used_extensions->len,
-                                             .ppEnabledExtensionNames = (const char * const *) used_extensions->pdata
+                                             .ppEnabledExtensionNames = (const char * const *) used_extensions->pdata,
                                         },
                                         NULL,
                                         &display->vk_instance);
@@ -69,9 +69,12 @@ gdk_vulkan_handle_result (VkResult    res,

 #define GDK_VK_CHECK(func, ...) gdk_vulkan_handle_result (func (__VA_ARGS__), G_STRINGIFY (func))

-gboolean        gdk_display_ref_vulkan                          (GdkDisplay      *display,
-                                                                 GError         **error);
-void            gdk_display_unref_vulkan                        (GdkDisplay      *display);
+gboolean                gdk_display_ref_vulkan                          (GdkDisplay            *display,
+                                                                         GError               **error);
+void                    gdk_display_unref_vulkan                        (GdkDisplay            *display);
+
+GdkMemoryFormat         gdk_vulkan_context_get_offscreen_format         (GdkVulkanContext      *context,
+                                                                         GdkMemoryDepth         depth);

 #else /* !GDK_RENDERING_VULKAN */

@@ -190,7 +190,7 @@ copy_surface_data (GdkMacosBuffer       *from,

 static void
 _gdk_macos_cairo_context_begin_frame (GdkDrawContext *draw_context,
-                                      gboolean        prefers_high_depth,
+                                      GdkMemoryDepth  depth,
                                      cairo_region_t *region)
 {
  GdkMacosCairoContext *self = (GdkMacosCairoContext *)draw_context;
@@ -480,7 +480,7 @@ gdk_macos_gl_context_real_realize (GdkGLContext  *context,

 static void
 gdk_macos_gl_context_begin_frame (GdkDrawContext *context,
-                                  gboolean        prefers_high_depth,
+                                  GdkMemoryDepth  depth,
                                  cairo_region_t *region)
 {
  GdkMacosGLContext *self = (GdkMacosGLContext *)context;
@@ -207,7 +207,7 @@ wl_cursor_create_from_xcursor_images(struct wl_cursor_theme *theme,
 {
        char *path;
        XcursorImages *images;
-	struct cursor *cursor;
+        struct wl_cursor *cursor;
 	struct cursor_image *image;
 	int i, nbytes;
        unsigned int load_size;
@@ -240,17 +240,16 @@ wl_cursor_create_from_xcursor_images(struct wl_cursor_theme *theme,
 		return NULL;
        }

-	cursor->cursor.images =
-		malloc(images->nimage * sizeof cursor->cursor.images[0]);
-	if (!cursor->cursor.images) {
+	cursor->images =
+		malloc(images->nimage * sizeof cursor->images[0]);
+	if (!cursor->images) {
 		free(cursor);
 	        xcursor_images_destroy (images);
 		return NULL;
 	}

-	cursor->cursor.name = strdup(name);
-        cursor->cursor.size = load_size;
-	cursor->total_delay = 0;
+	cursor->name = strdup(name);
+        cursor->size = load_size;

 	for (i = 0; i < images->nimage; i++) {
 		image = malloc(sizeof *image);
@@ -291,14 +290,13 @@ wl_cursor_create_from_xcursor_images(struct wl_cursor_theme *theme,
                        }
                    }
                }
-		cursor->total_delay += image->image.delay;
-		cursor->cursor.images[i] = (struct wl_cursor_image *) image;
+		cursor->images[i] = (struct wl_cursor_image *) image;
 	}
-	cursor->cursor.image_count = i;
+	cursor->image_count = i;

-	if (cursor->cursor.image_count == 0) {
-		free(cursor->cursor.name);
-		free(cursor->cursor.images);
+	if (cursor->image_count == 0) {
+		free(cursor->name);
+		free(cursor->images);
 		free(cursor);
 	        xcursor_images_destroy (images);
 		return NULL;
@@ -306,7 +304,7 @@ wl_cursor_create_from_xcursor_images(struct wl_cursor_theme *theme,

 	xcursor_images_destroy (images);

-	return &cursor->cursor;
+	return cursor;
 }

 static void
@@ -145,7 +145,7 @@ gdk_wayland_cairo_context_create_surface (GdkWaylandCairoContext *self)

 static void
 gdk_wayland_cairo_context_begin_frame (GdkDrawContext *draw_context,
-                                       gboolean        prefers_high_depth,
+                                       GdkMemoryDepth  depth,
                                       cairo_region_t *region)
 {
  GdkWaylandCairoContext *self = GDK_WAYLAND_CAIRO_CONTEXT (draw_context);
@@ -698,7 +698,36 @@ gdk_wayland_display_dispose (GObject *object)

  g_list_free_full (display_wayland->on_has_globals_closures, g_free);

+  g_clear_pointer (&display_wayland->cursor_theme, wl_cursor_theme_destroy);
+  g_clear_pointer (&display_wayland->compositor, wl_compositor_destroy);
+  g_clear_pointer (&display_wayland->xdg_wm_base, xdg_wm_base_destroy);
+  g_clear_pointer (&display_wayland->zxdg_shell_v6, zxdg_shell_v6_destroy);
+  g_clear_pointer (&display_wayland->gtk_shell, gtk_shell1_destroy);
+  g_clear_pointer (&display_wayland->data_device_manager, wl_data_device_manager_destroy);
+  g_clear_pointer (&display_wayland->subcompositor, wl_subcompositor_destroy);
+  g_clear_pointer (&display_wayland->pointer_gestures, zwp_pointer_gestures_v1_destroy);
+  g_clear_pointer (&display_wayland->primary_selection_manager, zwp_primary_selection_device_manager_v1_destroy);
+  g_clear_pointer (&display_wayland->tablet_manager, zwp_tablet_manager_v2_destroy);
+  g_clear_pointer (&display_wayland->xdg_exporter, zxdg_exporter_v1_destroy);
+  g_clear_pointer (&display_wayland->xdg_exporter_v2, zxdg_exporter_v2_destroy);
+  g_clear_pointer (&display_wayland->xdg_importer, zxdg_importer_v1_destroy);
+  g_clear_pointer (&display_wayland->xdg_importer_v2, zxdg_importer_v2_destroy);
+  g_clear_pointer (&display_wayland->keyboard_shortcuts_inhibit, zwp_keyboard_shortcuts_inhibit_manager_v1_destroy);
+  g_clear_pointer (&display_wayland->server_decoration_manager, org_kde_kwin_server_decoration_manager_destroy);
+  g_clear_pointer (&display_wayland->xdg_output_manager, zxdg_output_manager_v1_destroy);
+  g_clear_pointer (&display_wayland->idle_inhibit_manager, zwp_idle_inhibit_manager_v1_destroy);
+  g_clear_pointer (&display_wayland->xdg_activation, xdg_activation_v1_destroy);
+  g_clear_pointer (&display_wayland->fractional_scale, wp_fractional_scale_manager_v1_destroy);
+  g_clear_pointer (&display_wayland->viewporter, wp_viewporter_destroy);
+
+  g_clear_pointer (&display_wayland->shm, wl_shm_destroy);
+  g_clear_pointer (&display_wayland->wl_registry, wl_registry_destroy);
+
+  g_list_store_remove_all (display_wayland->monitors);
+
  G_OBJECT_CLASS (gdk_wayland_display_parent_class)->dispose (object);
+
+  g_clear_pointer (&display_wayland->wl_display, wl_display_disconnect);
 }

 static void
@@ -708,22 +737,17 @@ gdk_wayland_display_finalize (GObject *object)

  _gdk_wayland_display_finalize_cursors (display_wayland);

+  g_object_unref (display_wayland->monitors);
+
  g_free (display_wayland->startup_notification_id);
  g_free (display_wayland->cursor_theme_name);
  xkb_context_unref (display_wayland->xkb_context);

-  g_clear_pointer (&display_wayland->cursor_theme, wl_cursor_theme_destroy);
-
-  g_list_store_remove_all (display_wayland->monitors);
-  g_object_unref (display_wayland->monitors);
-
  if (display_wayland->settings)
    g_hash_table_destroy (display_wayland->settings);

  g_clear_object (&display_wayland->settings_portal);

-  wl_display_disconnect (display_wayland->wl_display);
-
  G_OBJECT_CLASS (gdk_wayland_display_parent_class)->finalize (object);
 }

@@ -98,7 +98,6 @@ struct _GdkWaylandDisplay
  struct xdg_wm_base *xdg_wm_base;
  struct zxdg_shell_v6 *zxdg_shell_v6;
  struct gtk_shell1 *gtk_shell;
-  struct wl_input_device *input_device;
  struct wl_data_device_manager *data_device_manager;
  struct wl_subcompositor *subcompositor;
  struct zwp_pointer_gestures_v1 *pointer_gestures;
@@ -48,12 +48,12 @@ G_DEFINE_TYPE (GdkWaylandGLContext, gdk_wayland_gl_context, GDK_TYPE_GL_CONTEXT)

 static void
 gdk_wayland_gl_context_begin_frame (GdkDrawContext *draw_context,
-                                    gboolean        prefers_high_depth,
+                                    GdkMemoryDepth  depth,
                                    cairo_region_t *region)
 {
  gdk_wayland_surface_ensure_wl_egl_window (gdk_draw_context_get_surface (draw_context));

-  GDK_DRAW_CONTEXT_CLASS (gdk_wayland_gl_context_parent_class)->begin_frame (draw_context, prefers_high_depth, region);
+  GDK_DRAW_CONTEXT_CLASS (gdk_wayland_gl_context_parent_class)->begin_frame (draw_context, depth, region);
 }

 static void
@@ -2143,10 +2143,13 @@ _gdk_wayland_seat_remove_tablet_pad (GdkWaylandSeat          *seat,
 {
  seat->tablet_pads = g_list_remove (seat->tablet_pads, pad);

-  gdk_seat_device_removed (GDK_SEAT (seat), pad->device);
-  _gdk_device_set_associated_device (pad->device, NULL);
+  if (pad->device)
+    {
+      gdk_seat_device_removed (GDK_SEAT (seat), pad->device);
+      _gdk_device_set_associated_device (pad->device, NULL);
+      g_object_unref (pad->device);
+    }

-  g_object_unref (pad->device);
  g_free (pad);
 }

@@ -3535,21 +3538,10 @@ static void
 tablet_pad_handle_done (void                     *data,
                        struct zwp_tablet_pad_v2 *wp_tablet_pad)
 {
-  GdkWaylandTabletPadData *pad = data;
+  G_GNUC_UNUSED GdkWaylandTabletPadData *pad = data;

  GDK_SEAT_DEBUG (pad->seat, EVENTS,
                  "tablet pad handle done, pad = %p", wp_tablet_pad);
-
-  pad->device =
-    g_object_new (GDK_TYPE_WAYLAND_DEVICE_PAD,
-                  "name", "Pad device",
-                  "source", GDK_SOURCE_TABLET_PAD,
-                  "display", gdk_seat_get_display (pad->seat),
-                  "seat", pad->seat,
-                  NULL);
-
-  _gdk_device_set_associated_device (pad->device, GDK_WAYLAND_SEAT (pad->seat)->logical_keyboard);
-  gdk_seat_device_added (GDK_SEAT (pad->seat), pad->device);
 }

 static void
@@ -3606,9 +3598,44 @@ tablet_pad_handle_enter (void                     *data,
                  "tablet pad handle enter, pad = %p, tablet = %p surface = %p",
                  wp_tablet_pad, wp_tablet, surface);

+  if (pad->device && pad->current_tablet != tablet)
+    {
+      gdk_seat_device_removed (GDK_SEAT (pad->seat), pad->device);
+      _gdk_device_set_associated_device (pad->device, NULL);
+      g_clear_object (&pad->device);
+    }
+
  /* Relate pad and tablet */
  tablet->pads = g_list_prepend (tablet->pads, pad);
  pad->current_tablet = tablet;
+
+  if (!pad->device)
+    {
+      gchar *name, *vid, *pid;
+
+      name = g_strdup_printf ("%s Pad %d",
+                              tablet->name,
+                              g_list_index (tablet->pads, pad) + 1);
+      vid = g_strdup_printf ("%.4x", tablet->vid);
+      pid = g_strdup_printf ("%.4x", tablet->pid);
+
+      pad->device =
+        g_object_new (GDK_TYPE_WAYLAND_DEVICE_PAD,
+                      "name", name,
+                      "vendor-id", vid,
+                      "product-id", pid,
+                      "source", GDK_SOURCE_TABLET_PAD,
+                      "display", gdk_seat_get_display (pad->seat),
+                      "seat", pad->seat,
+                      NULL);
+
+      _gdk_device_set_associated_device (pad->device, GDK_WAYLAND_SEAT (pad->seat)->logical_keyboard);
+      gdk_seat_device_added (GDK_SEAT (pad->seat), pad->device);
+
+      g_free (name);
+      g_free (vid);
+      g_free (pid);
+    }
 }

 static void
@@ -3624,10 +3651,7 @@ tablet_pad_handle_leave (void                     *data,
                  wp_tablet_pad, surface);

  if (pad->current_tablet)
-    {
-      pad->current_tablet->pads = g_list_remove (pad->current_tablet->pads, pad);
-      pad->current_tablet = NULL;
-    }
+    pad->current_tablet->pads = g_list_remove (pad->current_tablet->pads, pad);
 }

 static void
@@ -3875,6 +3899,23 @@ gdk_wayland_pointer_data_finalize (GdkWaylandPointerData *pointer)
  g_slist_free (pointer->pointer_surface_outputs);
 }

+static void
+gdk_wayland_seat_dispose (GObject *object)
+{
+  GdkWaylandSeat *seat = GDK_WAYLAND_SEAT (object);
+
+  g_clear_pointer (&seat->wl_seat, wl_seat_destroy);
+  g_clear_pointer (&seat->wl_pointer, wl_pointer_destroy);
+  g_clear_pointer (&seat->wl_keyboard, wl_keyboard_destroy);
+  g_clear_pointer (&seat->wl_touch, wl_touch_destroy);
+  g_clear_pointer (&seat->wp_pointer_gesture_swipe, zwp_pointer_gesture_swipe_v1_destroy);
+  g_clear_pointer (&seat->wp_pointer_gesture_pinch, zwp_pointer_gesture_pinch_v1_destroy);
+  g_clear_pointer (&seat->wp_pointer_gesture_hold, zwp_pointer_gesture_hold_v1_destroy);
+  g_clear_pointer (&seat->wp_tablet_seat, zwp_tablet_seat_v2_destroy);
+
+  G_OBJECT_CLASS (gdk_wayland_seat_parent_class)->dispose (object);
+}
+
 static void
 gdk_wayland_seat_finalize (GObject *object)
 {
@@ -4189,6 +4230,7 @@ gdk_wayland_seat_class_init (GdkWaylandSeatClass *klass)
  GdkSeatClass *seat_class = GDK_SEAT_CLASS (klass);

  object_class->finalize = gdk_wayland_seat_finalize;
+  object_class->dispose = gdk_wayland_seat_dispose;

  seat_class->get_capabilities = gdk_wayland_seat_get_capabilities;
  seat_class->grab = gdk_wayland_seat_grab;
@@ -53,7 +53,7 @@ create_cairo_surface_for_surface (GdkSurface *surface,

 static void
 gdk_win32_cairo_context_begin_frame (GdkDrawContext *draw_context,
-                                     gboolean        prefers_high_depth,
+                                     GdkMemoryDepth  depth,
                                     cairo_region_t *region)
 {
  GdkWin32CairoContext *self = GDK_WIN32_CAIRO_CONTEXT (draw_context);
@@ -2734,6 +2734,10 @@ gdk_event_translate (MSG *msg,
      if (GDK_IS_DRAG_SURFACE (window) ||
          _gdk_modal_blocked (window))
        {
+          /* Focus the modal window */
+          GdkSurface *modal_window = _gdk_modal_current ();
+          if (modal_window != NULL)
+            SetFocus (GDK_SURFACE_HWND (modal_window));
          *ret_valp = MA_NOACTIVATE;
          return_val = TRUE;
        }
@@ -2744,6 +2748,10 @@ gdk_event_translate (MSG *msg,
      if (GDK_IS_DRAG_SURFACE (window) ||
          _gdk_modal_blocked (window))
        {
+          /* Focus the modal window */
+          GdkSurface *modal_window = _gdk_modal_current ();
+          if (modal_window != NULL)
+            SetFocus (GDK_SURFACE_HWND (modal_window));
          *ret_valp = PA_NOACTIVATE;
          return_val = TRUE;
        }
@@ -109,12 +109,12 @@ gdk_win32_gl_context_egl_end_frame (GdkDrawContext *draw_context,

 static void
 gdk_win32_gl_context_egl_begin_frame (GdkDrawContext *draw_context,
-                                      gboolean        prefers_high_depth,
+                                      GdkMemoryDepth  depth,
                                      cairo_region_t *update_area)
 {
  gdk_win32_surface_handle_queued_move_resize (draw_context);

-  GDK_DRAW_CONTEXT_CLASS (gdk_win32_gl_context_egl_parent_class)->begin_frame (draw_context, prefers_high_depth, update_area);
+  GDK_DRAW_CONTEXT_CLASS (gdk_win32_gl_context_egl_parent_class)->begin_frame (draw_context, depth, update_area);
 }

 static void
@@ -118,12 +118,12 @@ gdk_win32_gl_context_wgl_end_frame (GdkDrawContext *draw_context,

 static void
 gdk_win32_gl_context_wgl_begin_frame (GdkDrawContext *draw_context,
-                                      gboolean        prefers_high_depth,
+                                      GdkMemoryDepth  depth,
                                      cairo_region_t *update_area)
 {
  gdk_win32_surface_handle_queued_move_resize (draw_context);

-  GDK_DRAW_CONTEXT_CLASS (gdk_win32_gl_context_wgl_parent_class)->begin_frame (draw_context, prefers_high_depth, update_area);
+  GDK_DRAW_CONTEXT_CLASS (gdk_win32_gl_context_wgl_parent_class)->begin_frame (draw_context, depth, update_area);
 }

 static int
@@ -725,11 +725,7 @@ show_window_internal (GdkSurface *window,

      if (center)
 	{
-	  window_rect.left = 0;
-	  window_rect.top = 0;
-	  window_rect.right = window->width * surface->surface_scale;
-	  window_rect.bottom = window->height * surface->surface_scale;
-	  _gdk_win32_adjust_client_rect (window, &window_rect);
+	  GetWindowRect (GDK_SURFACE_HWND (window), &window_rect);

 	  x = center_on_rect.left + ((center_on_rect.right - center_on_rect.left) - (window_rect.right - window_rect.left)) / 2;
 	  y = center_on_rect.top + ((center_on_rect.bottom - center_on_rect.top) - (window_rect.bottom - window_rect.top)) / 2;
@@ -66,12 +66,12 @@ gdk_win32_vulkan_context_create_surface (GdkVulkanContext *context,

 static void
 gdk_win32_vulkan_context_begin_frame (GdkDrawContext *draw_context,
-                                      gboolean        prefers_high_depth,
+                                      GdkMemoryDepth  depth,
                                      cairo_region_t *update_area)
 {
  gdk_win32_surface_handle_queued_move_resize (draw_context);

-  GDK_DRAW_CONTEXT_CLASS (gdk_win32_vulkan_context_parent_class)->begin_frame (draw_context, prefers_high_depth, update_area);
+  GDK_DRAW_CONTEXT_CLASS (gdk_win32_vulkan_context_parent_class)->begin_frame (draw_context, depth, update_area);
 }

 static void
@@ -55,7 +55,7 @@ create_cairo_surface_for_surface (GdkSurface *surface)

 static void
 gdk_x11_cairo_context_begin_frame (GdkDrawContext *draw_context,
-                                   gboolean        prefers_high_depth,
+                                   GdkMemoryDepth  depth,
                                   cairo_region_t *region)
 {
  GdkX11CairoContext *self = GDK_X11_CAIRO_CONTEXT (draw_context);
@@ -549,8 +549,6 @@ gdk_x11_context_create_glx_context (GdkGLContext *context,
      context_attribs [major_idx] = gdk_gl_version_get_major (&supported_versions[j]);
      context_attribs [minor_idx] = gdk_gl_version_get_minor (&supported_versions[j]);

-      gdk_x11_display_error_trap_push (display);
-
      /* If we don't have access to GLX_ARB_create_context_profile, then
       * we have to fall back to the old GLX 1.3 API.
       */
@@ -568,19 +566,16 @@ gdk_x11_context_create_glx_context (GdkGLContext *context,
                                          True,
                                          context_attribs);

-      if (ctx == NULL)
-        {
-          gdk_x11_display_error_trap_pop_ignored (display);
-        }
-      else if (gdk_x11_display_error_trap_pop (display))
-        {
-          glXDestroyContext (dpy, ctx);
-          ctx = NULL;
-        }
-      else
+      if (ctx != NULL)
        break;
    }

+  if (ctx == NULL)
+    {
+      GDK_DISPLAY_DEBUG (display, OPENGL, "Failed to create a GLX context");
+      return 0;
+    }
+
  GDK_DISPLAY_DEBUG (display, OPENGL,
                     "Realized GLX context[%p], %s, version: %d.%d",
                     context_glx->glx_context,
@@ -661,25 +656,42 @@ gdk_x11_gl_context_glx_realize (GdkGLContext  *context,
  if (share != NULL && gdk_gl_context_is_legacy (share))
    legacy = TRUE;

+  gdk_x11_display_error_trap_push (display);
+
+  /* Increase XNextRequest because GLX may fake errors with the last request
+   * and we want the error trap to catch them */
+  XChangeWindowAttributes (GDK_DISPLAY_XDISPLAY (display),
+                           GDK_X11_DISPLAY (display)->leader_window,
+                           0,
+                           (XSetWindowAttributes[1]) { 0, });
+
  if (preferred_api == GDK_GL_API_GL)
    {
-      if ((api = gdk_x11_context_create_glx_context (context, GDK_GL_API_GL, legacy)) ||
-          (api = gdk_x11_context_create_glx_context (context, GDK_GL_API_GLES, legacy)) ||
-          (api = gdk_x11_context_create_glx_context (context, GDK_GL_API_GL, TRUE)))
-        return api;
+      api = gdk_x11_context_create_glx_context (context, GDK_GL_API_GL, legacy);
+      if (api == 0)
+        api = gdk_x11_context_create_glx_context (context, GDK_GL_API_GLES, legacy);
+      if (api == 0)
+        api = gdk_x11_context_create_glx_context (context, GDK_GL_API_GL, TRUE);
    }
  else
    {
-      if ((api = gdk_x11_context_create_glx_context (context, GDK_GL_API_GLES, FALSE)) ||
-          (api = gdk_x11_context_create_glx_context (context, GDK_GL_API_GL, legacy)) ||
-          (api = gdk_x11_context_create_glx_context (context, GDK_GL_API_GL, TRUE)))
-        return api;
+      api = gdk_x11_context_create_glx_context (context, GDK_GL_API_GLES, FALSE);
+      if (api == 0)
+        api = gdk_x11_context_create_glx_context (context, GDK_GL_API_GL, legacy);
+      if (api == 0)
+        api = gdk_x11_context_create_glx_context (context, GDK_GL_API_GL, TRUE);
    }

-  g_set_error_literal (error, GDK_GL_ERROR,
-                       GDK_GL_ERROR_NOT_AVAILABLE,
-                       _("Unable to create a GL context"));
-  return 0;
+  gdk_x11_display_error_trap_pop_ignored (display);
+
+  if (api == 0)
+    {
+      g_set_error_literal (error, GDK_GL_ERROR,
+                           GDK_GL_ERROR_NOT_AVAILABLE,
+                           _("Unable to create a GL context"));
+    }
+
+  return api;
 }

 #undef N_GLX_ATTRS
@@ -1458,6 +1458,9 @@ memory_format_gl_format (GdkMemoryFormat  data_format,
                         guint           *gl_type,
                         GLint          (*gl_swizzle)[4])
 {
+  GdkMemoryDepth depth;
+
+  /* First, try the format itself */
  if (gdk_memory_format_gl_format (data_format,
                                   use_es,
                                   major,
@@ -1469,7 +1472,48 @@ memory_format_gl_format (GdkMemoryFormat  data_format,
      gdk_memory_format_alpha (data_format) != GDK_MEMORY_ALPHA_STRAIGHT)
    return data_format;

-  if (gdk_memory_format_prefers_high_depth (data_format))
+  depth = gdk_memory_format_get_depth (data_format);
+
+  /* Next, try the generic format for the given bit depth */
+  switch (depth)
+    {
+      case GDK_MEMORY_FLOAT16:
+        data_format = GDK_MEMORY_R16G16B16A16_FLOAT_PREMULTIPLIED;
+        if (gdk_memory_format_gl_format (data_format,
+                                         use_es,
+                                         major,
+                                         minor,
+                                         gl_internalformat,
+                                         gl_format,
+                                         gl_type,
+                                         gl_swizzle))
+          return data_format;
+        break;
+
+      case GDK_MEMORY_U16:
+        data_format = GDK_MEMORY_R16G16B16A16_PREMULTIPLIED;
+        if (gdk_memory_format_gl_format (data_format,
+                                         use_es,
+                                         major,
+                                         minor,
+                                         gl_internalformat,
+                                         gl_format,
+                                         gl_type,
+                                         gl_swizzle))
+          return data_format;
+        break;
+
+      case GDK_MEMORY_FLOAT32:
+      case GDK_MEMORY_U8:
+        break;
+
+      default:
+        g_assert_not_reached ();
+        break;
+    }
+
+  /* If the format is high depth, also try float32 */
+  if (depth != GDK_MEMORY_U8)
    {
      data_format = GDK_MEMORY_R32G32B32A32_FLOAT_PREMULTIPLIED;
      if (gdk_memory_format_gl_format (data_format,
@@ -1483,6 +1527,7 @@ memory_format_gl_format (GdkMemoryFormat  data_format,
        return data_format;
    }

+  /* If all else fails, pick the one format that's always supported */
  data_format = GDK_MEMORY_R8G8B8A8_PREMULTIPLIED;
  if (!gdk_memory_format_gl_format (data_format,
                                    use_es,
@@ -296,7 +296,7 @@ gsk_gl_renderer_render (GskRenderer          *renderer,
  viewport.size.height = gdk_surface_get_height (surface) * scale;

  gdk_draw_context_begin_frame_full (GDK_DRAW_CONTEXT (self->context),
-                                     gsk_render_node_prefers_high_depth (root),
+                                     gsk_render_node_get_preferred_depth (root),
                                     update_area);

  gdk_gl_context_make_current (self->context);
@@ -373,7 +373,7 @@ gsk_gl_renderer_render_texture (GskRenderer           *renderer,
      return texture;
    }

-  if (gsk_render_node_prefers_high_depth (root) &&
+  if (gsk_render_node_get_preferred_depth (root) != GDK_MEMORY_U8 &&
      gdk_gl_context_check_version (self->context, "3.0", "3.0"))
    format = GL_RGBA32F;
  else 
@@ -194,7 +194,7 @@ static inline int
 get_target_format (GskGLRenderJob      *job,
                   const GskRenderNode *node)
 {
-  if (gsk_render_node_prefers_high_depth (node))
+  if (gsk_render_node_get_preferred_depth (node) != GDK_MEMORY_U8)
    return job->target_format;

  return GL_RGBA8;
@@ -204,6 +204,7 @@ gsk_gl_texture_library_dispose (GObject *object)

  g_clear_pointer (&self->atlases, g_ptr_array_unref);
  g_clear_object (&self->driver);
+  g_clear_pointer (&self->hash_table, g_hash_table_unref);

  G_OBJECT_CLASS (gsk_gl_texture_library_parent_class)->dispose (object);
 }
@@ -15,8 +15,7 @@ static const GdkDebugKey gsk_debug_keys[] = {
  { "geometry", GSK_DEBUG_GEOMETRY, "Show borders (when using cairo)" },
  { "full-redraw", GSK_DEBUG_FULL_REDRAW, "Force full redraws" },
  { "sync", GSK_DEBUG_SYNC, "Sync after each frame" },
-  { "vulkan-staging-image", GSK_DEBUG_VULKAN_STAGING_IMAGE, "Use a staging image for Vulkan texture upload" },
-  { "vulkan-staging-buffer", GSK_DEBUG_VULKAN_STAGING_BUFFER, "Use a staging buffer for Vulkan texture upload" }
+  { "staging", GSK_DEBUG_STAGING, "Use a staging image for texture upload (Vulkan only)" },
 };

 static guint gsk_debug_flags;
@@ -18,8 +18,7 @@ typedef enum {
  GSK_DEBUG_GEOMETRY              = 1 <<  9,
  GSK_DEBUG_FULL_REDRAW           = 1 << 10,
  GSK_DEBUG_SYNC                  = 1 << 11,
-  GSK_DEBUG_VULKAN_STAGING_IMAGE  = 1 << 12,
-  GSK_DEBUG_VULKAN_STAGING_BUFFER = 1 << 13
+  GSK_DEBUG_STAGING               = 1 << 12
 } GskDebugFlags;

 #define GSK_DEBUG_ANY ((1 << 13) - 1)
@@ -372,6 +372,8 @@ gsk_renderer_render_texture (GskRenderer           *renderer,
      gsk_render_node_get_bounds (root, &real_viewport);
      viewport = &real_viewport;
    }
+  g_return_val_if_fail (viewport->size.width > 0, NULL);
+  g_return_val_if_fail (viewport->size.height > 0, NULL);

  texture = GSK_RENDERER_GET_CLASS (renderer)->render_texture (renderer, root, viewport);

@@ -675,10 +675,10 @@ gsk_value_dup_render_node (const GValue *value)
  return gsk_render_node_ref (value->data[0].v_pointer);
 }

-gboolean
-gsk_render_node_prefers_high_depth (const GskRenderNode *node)
+GdkMemoryDepth
+gsk_render_node_get_preferred_depth (const GskRenderNode *node)
 {
-  return node->prefers_high_depth;
+  return node->preferred_depth;
 }

 /* Whether we need an offscreen to handle opacity correctly for this node.
@@ -1734,7 +1734,7 @@ gsk_texture_node_new (GdkTexture            *texture,
  self->texture = g_object_ref (texture);
  graphene_rect_init_from_rect (&node->bounds, bounds);

-  node->prefers_high_depth = gdk_memory_format_prefers_high_depth (gdk_texture_get_format (texture));
+  node->preferred_depth = gdk_memory_format_get_depth (gdk_texture_get_format (texture));

  return node;
 }
@@ -1960,7 +1960,7 @@ gsk_texture_scale_node_new (GdkTexture            *texture,
  graphene_rect_init_from_rect (&node->bounds, bounds);
  self->filter = filter;

-  node->prefers_high_depth = gdk_memory_format_prefers_high_depth (gdk_texture_get_format (texture));
+  node->preferred_depth = gdk_memory_format_get_depth (gdk_texture_get_format (texture));

  return node;
 }
@@ -3193,14 +3193,16 @@ gsk_container_node_new (GskRenderNode **children,

      self->children[0] = gsk_render_node_ref (children[0]);
      graphene_rect_init_from_rect (&bounds, &(children[0]->bounds));
-      node->prefers_high_depth = gsk_render_node_prefers_high_depth (children[0]);
+      node->preferred_depth = gdk_memory_depth_merge (node->preferred_depth,
+                                                      gsk_render_node_get_preferred_depth (children[0]));

      for (guint i = 1; i < n_children; i++)
        {
          self->children[i] = gsk_render_node_ref (children[i]);
          self->disjoint = self->disjoint && !graphene_rect_intersection (&bounds, &(children[i]->bounds), NULL);
          graphene_rect_union (&bounds, &(children[i]->bounds), &bounds);
-          node->prefers_high_depth = node->prefers_high_depth || gsk_render_node_prefers_high_depth (children[i]);
+          node->preferred_depth = gdk_memory_depth_merge (node->preferred_depth,
+                                                          gsk_render_node_get_preferred_depth (children[i]));
          node->offscreen_for_opacity = node->offscreen_for_opacity || children[i]->offscreen_for_opacity;
        }

@@ -3478,7 +3480,7 @@ gsk_transform_node_new (GskRenderNode *child,
                                  &child->bounds,
                                  &node->bounds);

-  node->prefers_high_depth = gsk_render_node_prefers_high_depth (child);
+  node->preferred_depth = gsk_render_node_get_preferred_depth (child);

  return node;
 }
@@ -3630,7 +3632,7 @@ gsk_opacity_node_new (GskRenderNode *child,

  graphene_rect_init_from_rect (&node->bounds, &child->bounds);

-  node->prefers_high_depth = gsk_render_node_prefers_high_depth (child);
+  node->preferred_depth = gsk_render_node_get_preferred_depth (child);

  return node;
 }
@@ -3868,7 +3870,7 @@ gsk_color_matrix_node_new (GskRenderNode           *child,

  graphene_rect_init_from_rect (&node->bounds, &child->bounds);

-  node->prefers_high_depth = gsk_render_node_prefers_high_depth (child);
+  node->preferred_depth = gsk_render_node_get_preferred_depth (child);

  return node;
 }
@@ -3956,27 +3958,29 @@ gsk_repeat_node_draw (GskRenderNode *node,
  cairo_pattern_t *pattern;
  cairo_surface_t *surface;
  cairo_t *surface_cr;
+  double scale_x, scale_y, width, height;
+  cairo_matrix_t matrix;

+  cairo_get_matrix (cr, &matrix);
+  width = ceil (self->child_bounds.size.width * (ABS (matrix.xx) + ABS (matrix.yx)));
+  height = ceil (self->child_bounds.size.height * (ABS (matrix.xy) + ABS (matrix.yy)));
  surface = cairo_surface_create_similar (cairo_get_target (cr),
                                          CAIRO_CONTENT_COLOR_ALPHA,
-                                          ceilf (self->child_bounds.size.width),
-                                          ceilf (self->child_bounds.size.height));
+                                          width, height);
+  cairo_surface_get_device_scale (surface, &scale_x, &scale_y);
+  scale_x *= width / self->child_bounds.size.width;
+  scale_y *= height / self->child_bounds.size.height;
+  cairo_surface_set_device_scale (surface, scale_x, scale_y);
+  cairo_surface_set_device_offset (surface, 
+                                   - self->child_bounds.origin.x * scale_x,
+                                   - self->child_bounds.origin.y * scale_y);
+
  surface_cr = cairo_create (surface);
-  cairo_translate (surface_cr,
-                   - self->child_bounds.origin.x,
-                   - self->child_bounds.origin.y);
  gsk_render_node_draw (self->child, surface_cr);
  cairo_destroy (surface_cr);

  pattern = cairo_pattern_create_for_surface (surface);
  cairo_pattern_set_extend (pattern, CAIRO_EXTEND_REPEAT);
-  cairo_pattern_set_matrix (pattern,
-                            &(cairo_matrix_t) {
-                                .xx = 1.0,
-                                .yy = 1.0,
-                                .x0 = - self->child_bounds.origin.x,
-                                .y0 = - self->child_bounds.origin.y
-                            });
  cairo_set_source (cr, pattern);
  cairo_pattern_destroy (pattern);
  cairo_surface_destroy (surface);
@@ -4033,7 +4037,7 @@ gsk_repeat_node_new (const graphene_rect_t *bounds,
  else
    graphene_rect_init_from_rect (&self->child_bounds, &child->bounds);

-  node->prefers_high_depth = gsk_render_node_prefers_high_depth (child);
+  node->preferred_depth = gsk_render_node_get_preferred_depth (child);

  return node;
 }
@@ -4181,7 +4185,7 @@ gsk_clip_node_new (GskRenderNode         *child,

  graphene_rect_intersection (&self->clip, &child->bounds, &node->bounds);

-  node->prefers_high_depth = gsk_render_node_prefers_high_depth (child);
+  node->preferred_depth = gsk_render_node_get_preferred_depth (child);

  return node;
 }
@@ -4329,7 +4333,7 @@ gsk_rounded_clip_node_new (GskRenderNode         *child,

  graphene_rect_intersection (&self->clip.bounds, &child->bounds, &node->bounds);

-  node->prefers_high_depth = gsk_render_node_prefers_high_depth (child);
+  node->preferred_depth = gsk_render_node_get_preferred_depth (child);

  return node;
 }
@@ -4571,7 +4575,7 @@ gsk_shadow_node_new (GskRenderNode   *child,

  gsk_shadow_node_get_bounds (self, &node->bounds);

-  node->prefers_high_depth = gsk_render_node_prefers_high_depth (child);
+  node->preferred_depth = gsk_render_node_get_preferred_depth (child);

  return node;
 }
@@ -4781,7 +4785,8 @@ gsk_blend_node_new (GskRenderNode *bottom,

  graphene_rect_union (&bottom->bounds, &top->bounds, &node->bounds);

-  node->prefers_high_depth = gsk_render_node_prefers_high_depth (bottom) || gsk_render_node_prefers_high_depth (top);
+  node->preferred_depth = gdk_memory_depth_merge (gsk_render_node_get_preferred_depth (bottom),
+                                                  gsk_render_node_get_preferred_depth (top));

  return node;
 }
@@ -4946,7 +4951,8 @@ gsk_cross_fade_node_new (GskRenderNode *start,

  graphene_rect_union (&start->bounds, &end->bounds, &node->bounds);

-  node->prefers_high_depth = gsk_render_node_prefers_high_depth (start) || gsk_render_node_prefers_high_depth (end);
+  node->preferred_depth = gdk_memory_depth_merge (gsk_render_node_get_preferred_depth (start),
+                                                  gsk_render_node_get_preferred_depth (end));

  return node;
 }
@@ -5574,7 +5580,7 @@ gsk_blur_node_new (GskRenderNode *child,
                       - clip_radius,
                       - clip_radius);

-  node->prefers_high_depth = gsk_render_node_prefers_high_depth (child);
+  node->preferred_depth = gsk_render_node_get_preferred_depth (child);

  return node;
 }
@@ -5636,9 +5642,12 @@ static void
 gsk_mask_node_finalize (GskRenderNode *node)
 {
  GskMaskNode *self = (GskMaskNode *) node;
+  GskRenderNodeClass *parent_class = g_type_class_peek (g_type_parent (GSK_TYPE_MASK_NODE));

  gsk_render_node_unref (self->source);
  gsk_render_node_unref (self->mask);
+
+  parent_class->finalize (node);
 }

 static void
@@ -5754,7 +5763,7 @@ gsk_mask_node_new (GskRenderNode *source,

  self->render_node.bounds = source->bounds;

-  self->render_node.prefers_high_depth = gsk_render_node_prefers_high_depth (source);
+  self->render_node.preferred_depth = gsk_render_node_get_preferred_depth (source);

  return &self->render_node;
 }
@@ -5920,7 +5929,7 @@ gsk_debug_node_new (GskRenderNode *child,

  graphene_rect_init_from_rect (&node->bounds, &child->bounds);

-  node->prefers_high_depth = gsk_render_node_prefers_high_depth (child);
+  node->preferred_depth = gsk_render_node_get_preferred_depth (child);

  return node;
 }
@@ -6103,7 +6112,8 @@ gsk_gl_shader_node_new (GskGLShader           *shader,
      for (guint i = 0; i < n_children; i++)
        {
          self->children[i] = gsk_render_node_ref (children[i]);
-          node->prefers_high_depth = node->prefers_high_depth || gsk_render_node_prefers_high_depth (children[i]);
+          node->preferred_depth = gdk_memory_depth_merge (node->preferred_depth,
+                                                          gsk_render_node_get_preferred_depth (children[i]));
        }
    }

@@ -3,6 +3,8 @@
 #include "gskrendernode.h"
 #include <cairo.h>

+#include "gdk/gdkmemoryformatprivate.h"
+
 G_BEGIN_DECLS

 typedef struct _GskRenderNodeClass GskRenderNodeClass;
@@ -27,7 +29,7 @@ struct _GskRenderNode

  graphene_rect_t bounds;

-  guint prefers_high_depth : 1;
+  guint preferred_depth : 2;
  guint offscreen_for_opacity : 1;
 };

@@ -73,17 +75,17 @@ bool            gsk_border_node_get_uniform_color       (const GskRenderNode
 void            gsk_text_node_serialize_glyphs          (GskRenderNode               *self,
                                                         GString                     *str);

-GskRenderNode ** gsk_container_node_get_children        (const GskRenderNode *node,
-                                                         guint               *n_children);
+GskRenderNode ** gsk_container_node_get_children        (const GskRenderNode         *node,
+                                                         guint                       *n_children);

-void             gsk_transform_node_get_translate       (const GskRenderNode *node,
-                                                         float               *dx,
-                                                         float               *dy);
-gboolean       gsk_render_node_prefers_high_depth       (const GskRenderNode *node);
+void            gsk_transform_node_get_translate        (const GskRenderNode         *node,
+                                                         float                       *dx,
+                                                         float                       *dy);
+GdkMemoryDepth  gsk_render_node_get_preferred_depth     (const GskRenderNode         *node);

-gboolean       gsk_container_node_is_disjoint           (const GskRenderNode *node);
+gboolean        gsk_container_node_is_disjoint          (const GskRenderNode         *node);

-gboolean       gsk_render_node_use_offscreen_for_opacity (const GskRenderNode *node);
+gboolean        gsk_render_node_use_offscreen_for_opacity (const GskRenderNode       *node);


 G_END_DECLS
@@ -689,6 +689,134 @@ gsk_rounded_rect_intersect_with_rect (const GskRoundedRect  *self,
  return GSK_INTERSECTION_NONEMPTY;
 }

+static gboolean
+check_nonintersecting_corner (const GskRoundedRect *out,
+                              const GskRoundedRect *in,
+                              GskCorner             corner,
+                              float                 diff_x,
+                              float                 diff_y,
+                              GskRoundedRect       *result)
+{
+  g_assert (diff_x >= 0);
+  g_assert (diff_y >= 0);
+
+  if (out->corner[corner].width < diff_x ||
+      out->corner[corner].height < diff_y ||
+      (out->corner[corner].width <= in->corner[corner].width + diff_x &&
+       out->corner[corner].height <= in->corner[corner].height + diff_y))
+    {
+      result->corner[corner] = in->corner[corner];
+      return TRUE;
+    }
+
+  if (diff_x > 0 || diff_y > 0)
+    return FALSE;
+
+  if (out->corner[corner].width > in->corner[corner].width &&
+      out->corner[corner].height > in->corner[corner].height)
+    {
+      result->corner[corner] = out->corner[corner];
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+/* a is outside in x direction, b is outside in y direction */
+static gboolean
+check_intersecting_corner (const GskRoundedRect *a,
+                           const GskRoundedRect *b,
+                           GskCorner             corner,
+                           float                 diff_x,
+                           float                 diff_y,
+                           GskRoundedRect       *result)
+{
+  g_assert (diff_x > 0);
+  g_assert (diff_y > 0);
+
+  if (diff_x < a->corner[corner].width ||
+      diff_x > a->bounds.size.width - a->corner[corner].width - a->corner[OPPOSITE_CORNER_X (corner)].width ||
+      diff_y < b->corner[corner].height ||
+      diff_y > b->bounds.size.height - b->corner[corner].height - b->corner[OPPOSITE_CORNER_Y (corner)].height)
+    return FALSE;
+
+  result->corner[corner] = GRAPHENE_SIZE_INIT (0, 0);
+  return TRUE;
+}
+
+static gboolean
+check_corner (const GskRoundedRect *a,
+              const GskRoundedRect *b,
+              GskCorner             corner,
+              float                 diff_x,
+              float                 diff_y,
+              GskRoundedRect       *result)
+{
+  if (diff_x >= 0)
+    {
+      if (diff_y >= 0)
+        {
+          return check_nonintersecting_corner (a, b, corner, diff_x, diff_y, result);
+        }
+      else if (diff_x == 0)
+        {
+          return check_nonintersecting_corner (b, a, corner, 0, - diff_y, result);
+        }
+      else
+        {
+          return check_intersecting_corner (a, b, corner, diff_x, - diff_y, result);
+        }
+    }
+  else
+    {
+      if (diff_y <= 0)
+        {
+          return check_nonintersecting_corner (b, a, corner, - diff_x, - diff_y, result);
+        }
+      else
+        {
+          return check_intersecting_corner (b, a, corner, - diff_x, diff_y, result);
+        }
+    }
+                    
+}
+
+GskRoundedRectIntersection
+gsk_rounded_rect_intersection (const GskRoundedRect *a,
+                               const GskRoundedRect *b,
+                               GskRoundedRect       *result)
+{
+  float top, left, bottom, right;
+
+  if (!graphene_rect_intersection (&a->bounds, &b->bounds, &result->bounds))
+    return GSK_INTERSECTION_EMPTY;
+
+  left = b->bounds.origin.x - a->bounds.origin.x;
+  top = b->bounds.origin.y - a->bounds.origin.y;
+  right = a->bounds.origin.x + a->bounds.size.width - b->bounds.origin.x - b->bounds.size.width;
+  bottom = a->bounds.origin.y + a->bounds.size.height - b->bounds.origin.y - b->bounds.size.height;
+
+  if (check_corner (a, b,
+                    GSK_CORNER_TOP_LEFT,
+                    left, top,
+                    result) &&
+      check_corner (a, b,
+                    GSK_CORNER_TOP_RIGHT,
+                    right, top,
+                    result) &&
+      check_corner (a, b,
+                    GSK_CORNER_BOTTOM_LEFT,
+                    left, bottom,
+                    result) &&
+      check_corner (a, b,
+                    GSK_CORNER_BOTTOM_RIGHT,
+                    right, bottom,
+                    result))
+    return GSK_INTERSECTION_NONEMPTY;
+
+  return GSK_INTERSECTION_NOT_REPRESENTABLE;
+}
+
 static void
 append_arc (cairo_t *cr, double angle1, double angle2, gboolean negative)
 {
@@ -766,13 +894,14 @@ gsk_rounded_rect_path (const GskRoundedRect *self,
 * only look at the last vec4 if they have to.
 */
 void
-gsk_rounded_rect_to_float (const GskRoundedRect *self,
-                           float                 rect[12])
+gsk_rounded_rect_to_float (const GskRoundedRect   *self,
+                           const graphene_point_t *offset,
+                           float                   rect[12])
 {
  guint i;

-  rect[0] = self->bounds.origin.x;
-  rect[1] = self->bounds.origin.y;
+  rect[0] = self->bounds.origin.x + offset->x;
+  rect[1] = self->bounds.origin.y + offset->y;
  rect[2] = self->bounds.size.width;
  rect[3] = self->bounds.size.height;

@@ -6,6 +6,24 @@

 G_BEGIN_DECLS

+#define OPPOSITE_CORNER(corner) ((corner) ^ 2)
+G_STATIC_ASSERT (OPPOSITE_CORNER (GSK_CORNER_TOP_LEFT) == GSK_CORNER_BOTTOM_RIGHT);
+G_STATIC_ASSERT (OPPOSITE_CORNER (GSK_CORNER_TOP_RIGHT) == GSK_CORNER_BOTTOM_LEFT);
+G_STATIC_ASSERT (OPPOSITE_CORNER (GSK_CORNER_BOTTOM_LEFT) == GSK_CORNER_TOP_RIGHT);
+G_STATIC_ASSERT (OPPOSITE_CORNER (GSK_CORNER_BOTTOM_RIGHT) == GSK_CORNER_TOP_LEFT);
+
+#define OPPOSITE_CORNER_X(corner) ((corner) ^ 1)
+G_STATIC_ASSERT (OPPOSITE_CORNER_X (GSK_CORNER_TOP_LEFT) == GSK_CORNER_TOP_RIGHT);
+G_STATIC_ASSERT (OPPOSITE_CORNER_X (GSK_CORNER_TOP_RIGHT) == GSK_CORNER_TOP_LEFT);
+G_STATIC_ASSERT (OPPOSITE_CORNER_X (GSK_CORNER_BOTTOM_LEFT) == GSK_CORNER_BOTTOM_RIGHT);
+G_STATIC_ASSERT (OPPOSITE_CORNER_X (GSK_CORNER_BOTTOM_RIGHT) == GSK_CORNER_BOTTOM_LEFT);
+
+#define OPPOSITE_CORNER_Y(corner) ((corner) ^ 3)
+G_STATIC_ASSERT (OPPOSITE_CORNER_Y (GSK_CORNER_TOP_LEFT) == GSK_CORNER_BOTTOM_LEFT);
+G_STATIC_ASSERT (OPPOSITE_CORNER_Y (GSK_CORNER_TOP_RIGHT) == GSK_CORNER_BOTTOM_RIGHT);
+G_STATIC_ASSERT (OPPOSITE_CORNER_Y (GSK_CORNER_BOTTOM_LEFT) == GSK_CORNER_TOP_LEFT);
+G_STATIC_ASSERT (OPPOSITE_CORNER_Y (GSK_CORNER_BOTTOM_RIGHT) == GSK_CORNER_TOP_RIGHT);
+
 #define GSK_ROUNDED_RECT_INIT_FROM_RECT(_r)   \
  (GskRoundedRect) { .bounds = _r, \
                     .corner = { \
@@ -28,6 +46,7 @@ gboolean                 gsk_rounded_rect_is_circular           (const GskRounde
 void                     gsk_rounded_rect_path                  (const GskRoundedRect     *self,
                                                                 cairo_t                  *cr);
 void                     gsk_rounded_rect_to_float              (const GskRoundedRect     *self,
+                                                                 const graphene_point_t   *offset,
                                                                 float                     rect[12]);

 gboolean                 gsk_rounded_rect_equal                 (gconstpointer             rect1,
@@ -43,6 +62,9 @@ typedef enum {
 GskRoundedRectIntersection gsk_rounded_rect_intersect_with_rect   (const GskRoundedRect     *self,
                                                                   const graphene_rect_t    *rect,
                                                                   GskRoundedRect           *result) G_GNUC_PURE;
+GskRoundedRectIntersection gsk_rounded_rect_intersection          (const GskRoundedRect     *a,
+                                                                   const GskRoundedRect     *b,
+                                                                   GskRoundedRect           *result);


 G_END_DECLS
@@ -12,8 +12,12 @@ typedef struct _GskVulkanBlendModeInstance GskVulkanBlendModeInstance;
 struct _GskVulkanBlendModeInstance
 {
  float rect[4];
-  float start_tex_rect[4];
-  float end_tex_rect[4];
+  float top_rect[4];
+  float bottom_rect[4];
+  float top_tex_rect[4];
+  float bottom_tex_rect[4];
+  guint32 top_tex_id[2];
+  guint32 bottom_tex_id[2];
  guint32 blend_mode;
 };

@@ -40,18 +44,42 @@ gsk_vulkan_blend_mode_pipeline_get_input_state_create_info (GskVulkanPipeline *s
          .location = 1,
          .binding = 0,
          .format = VK_FORMAT_R32G32B32A32_SFLOAT,
-          .offset = G_STRUCT_OFFSET (GskVulkanBlendModeInstance, start_tex_rect),
+          .offset = G_STRUCT_OFFSET (GskVulkanBlendModeInstance, top_rect),
      },
      {
          .location = 2,
          .binding = 0,
          .format = VK_FORMAT_R32G32B32A32_SFLOAT,
-          .offset = G_STRUCT_OFFSET (GskVulkanBlendModeInstance, end_tex_rect),
+          .offset = G_STRUCT_OFFSET (GskVulkanBlendModeInstance, bottom_rect),
      },
      {
          .location = 3,
          .binding = 0,
+          .format = VK_FORMAT_R32G32B32A32_SFLOAT,
+          .offset = G_STRUCT_OFFSET (GskVulkanBlendModeInstance, top_tex_rect),
+      },
+      {
+          .location = 4,
+          .binding = 0,
+          .format = VK_FORMAT_R32G32B32A32_SFLOAT,
+          .offset = G_STRUCT_OFFSET (GskVulkanBlendModeInstance, bottom_tex_rect),
+      },
+      {
+          .location = 5,
+          .binding = 0,
          .format = VK_FORMAT_R32_UINT,
+          .offset = G_STRUCT_OFFSET (GskVulkanBlendModeInstance, top_tex_id),
+      },
+      {
+          .location = 6,
+          .binding = 0,
+          .format = VK_FORMAT_R32G32_UINT,
+          .offset = G_STRUCT_OFFSET (GskVulkanBlendModeInstance, bottom_tex_id),
+      },
+      {
+          .location = 7,
+          .binding = 0,
+          .format = VK_FORMAT_R32G32_UINT,
          .offset = G_STRUCT_OFFSET (GskVulkanBlendModeInstance, blend_mode),
      }
  };
@@ -98,37 +126,50 @@ gsk_vulkan_blend_mode_pipeline_new (GdkVulkanContext        *context,
  return gsk_vulkan_pipeline_new (GSK_TYPE_VULKAN_BLEND_MODE_PIPELINE, context, layout, shader_name, render_pass);
 }

-gsize
-gsk_vulkan_blend_mode_pipeline_count_vertex_data (GskVulkanBlendModePipeline *pipeline)
-{
-  return sizeof (GskVulkanBlendModeInstance);
-}
-
 void
 gsk_vulkan_blend_mode_pipeline_collect_vertex_data (GskVulkanBlendModePipeline *pipeline,
-                                                    guchar                *data,
-                                                    const graphene_rect_t *bounds,
-                                                    const graphene_rect_t *start_tex_rect,
-                                                    const graphene_rect_t *end_tex_rect,
-                                                    GskBlendMode blend_mode)
+                                                    guchar                     *data,
+                                                    guint32                     top_tex_id[2],
+                                                    guint32                     bottom_tex_id[2],
+                                                    const graphene_point_t     *offset,
+                                                    const graphene_rect_t      *bounds,
+                                                    const graphene_rect_t      *top_bounds,
+                                                    const graphene_rect_t      *bottom_bounds,
+                                                    const graphene_rect_t      *top_tex_rect,
+                                                    const graphene_rect_t      *bottom_tex_rect,
+                                                    GskBlendMode                blend_mode)
 {
  GskVulkanBlendModeInstance *instance = (GskVulkanBlendModeInstance *) data;

-  instance->rect[0] = bounds->origin.x;
-  instance->rect[1] = bounds->origin.y;
+  instance->rect[0] = bounds->origin.x + offset->x;
+  instance->rect[1] = bounds->origin.y + offset->y;
  instance->rect[2] = bounds->size.width;
  instance->rect[3] = bounds->size.height;

-  instance->start_tex_rect[0] = start_tex_rect->origin.x;
-  instance->start_tex_rect[1] = start_tex_rect->origin.y;
-  instance->start_tex_rect[2] = start_tex_rect->size.width;
-  instance->start_tex_rect[3] = start_tex_rect->size.height;
+  instance->top_rect[0] = top_bounds->origin.x + offset->x;
+  instance->top_rect[1] = top_bounds->origin.y + offset->y;
+  instance->top_rect[2] = top_bounds->size.width;
+  instance->top_rect[3] = top_bounds->size.height;

-  instance->end_tex_rect[0] = end_tex_rect->origin.x;
-  instance->end_tex_rect[1] = end_tex_rect->origin.y;
-  instance->end_tex_rect[2] = end_tex_rect->size.width;
-  instance->end_tex_rect[3] = end_tex_rect->size.height;
+  instance->bottom_rect[0] = bottom_bounds->origin.x + offset->x;
+  instance->bottom_rect[1] = bottom_bounds->origin.y + offset->y;
+  instance->bottom_rect[2] = bottom_bounds->size.width;
+  instance->bottom_rect[3] = bottom_bounds->size.height;

+  instance->top_tex_rect[0] = top_tex_rect->origin.x;
+  instance->top_tex_rect[1] = top_tex_rect->origin.y;
+  instance->top_tex_rect[2] = top_tex_rect->size.width;
+  instance->top_tex_rect[3] = top_tex_rect->size.height;
+
+  instance->bottom_tex_rect[0] = bottom_tex_rect->origin.x;
+  instance->bottom_tex_rect[1] = bottom_tex_rect->origin.y;
+  instance->bottom_tex_rect[2] = bottom_tex_rect->size.width;
+  instance->bottom_tex_rect[3] = bottom_tex_rect->size.height;
+
+  instance->top_tex_id[0] = top_tex_id[0];
+  instance->top_tex_id[1] = top_tex_id[1];
+  instance->bottom_tex_id[0] = bottom_tex_id[0];
+  instance->bottom_tex_id[1] = bottom_tex_id[1];
  instance->blend_mode = blend_mode;
 }

@@ -18,12 +18,16 @@ GskVulkanPipeline * gsk_vulkan_blend_mode_pipeline_new                 (GdkVulka
                                                                        const char                 *shader_name,
                                                                        VkRenderPass                render_pass);

-gsize               gsk_vulkan_blend_mode_pipeline_count_vertex_data   (GskVulkanBlendModePipeline *pipeline);
 void                gsk_vulkan_blend_mode_pipeline_collect_vertex_data (GskVulkanBlendModePipeline *pipeline,
                                                                        guchar                     *data,
+                                                                        guint32                     top_tex_id[2],
+                                                                        guint32                     bottom_tex_id[2],
+                                                                        const graphene_point_t     *offset,
                                                                        const graphene_rect_t      *bounds,
-                                                                        const graphene_rect_t      *start_bounds,
-                                                                        const graphene_rect_t      *end_bounds,
+                                                                        const graphene_rect_t      *top_bounds,
+                                                                        const graphene_rect_t      *bottom_bounds,
+                                                                        const graphene_rect_t      *top_tex_rect,
+                                                                        const graphene_rect_t      *bottom_tex_rect,
                                                                        GskBlendMode                blend_mode);
 gsize               gsk_vulkan_blend_mode_pipeline_draw                (GskVulkanBlendModePipeline *pipeline,
                                                                        VkCommandBuffer             command_buffer,
@@ -14,6 +14,7 @@ struct _GskVulkanBlurInstance
  float rect[4];
  float tex_rect[4];
  float blur_radius;
+  guint32 tex_id[2];
 };

 G_DEFINE_TYPE (GskVulkanBlurPipeline, gsk_vulkan_blur_pipeline, GSK_TYPE_VULKAN_PIPELINE)
@@ -46,6 +47,12 @@ gsk_vulkan_blur_pipeline_get_input_state_create_info (GskVulkanPipeline *self)
          .binding = 0,
          .format = VK_FORMAT_R32_SFLOAT,
          .offset = G_STRUCT_OFFSET (GskVulkanBlurInstance, blur_radius),
+      },
+      {
+          .location = 3,
+          .binding = 0,
+          .format = VK_FORMAT_R32G32_UINT,
+          .offset = G_STRUCT_OFFSET (GskVulkanBlurInstance, tex_id),
      }
  };
  static const VkPipelineVertexInputStateCreateInfo info = {
@@ -91,23 +98,19 @@ gsk_vulkan_blur_pipeline_new (GdkVulkanContext        *context,
  return gsk_vulkan_pipeline_new (GSK_TYPE_VULKAN_BLUR_PIPELINE, context, layout, shader_name, render_pass);
 }

-gsize
-gsk_vulkan_blur_pipeline_count_vertex_data (GskVulkanBlurPipeline *pipeline)
-{
-  return sizeof (GskVulkanBlurInstance);
-}
-
 void
-gsk_vulkan_blur_pipeline_collect_vertex_data (GskVulkanBlurPipeline *pipeline,
-                                              guchar                *data,
-                                              const graphene_rect_t *rect,
-                                              const graphene_rect_t *tex_rect,
-                                              double                 blur_radius)
+gsk_vulkan_blur_pipeline_collect_vertex_data (GskVulkanBlurPipeline  *pipeline,
+                                              guchar                 *data,
+                                              guint32                 tex_id[2],
+                                              const graphene_point_t *offset,
+                                              const graphene_rect_t  *rect,
+                                              const graphene_rect_t  *tex_rect,
+                                              double                  blur_radius)
 {
  GskVulkanBlurInstance *instance = (GskVulkanBlurInstance *) data;

-  instance->rect[0] = rect->origin.x;
-  instance->rect[1] = rect->origin.y;
+  instance->rect[0] = rect->origin.x + offset->x;
+  instance->rect[1] = rect->origin.y + offset->y;
  instance->rect[2] = rect->size.width;
  instance->rect[3] = rect->size.height;
  instance->tex_rect[0] = tex_rect->origin.x;
@@ -115,6 +118,8 @@ gsk_vulkan_blur_pipeline_collect_vertex_data (GskVulkanBlurPipeline *pipeline,
  instance->tex_rect[2] = tex_rect->size.width;
  instance->tex_rect[3] = tex_rect->size.height;
  instance->blur_radius = blur_radius;
+  instance->tex_id[0] = tex_id[0];
+  instance->tex_id[1] = tex_id[1];
 }

 gsize
@@ -17,9 +17,10 @@ GskVulkanPipeline *     gsk_vulkan_blur_pipeline_new                   (GdkVulka
                                                                        const char              *shader_name,
                                                                        VkRenderPass             render_pass);

-gsize                   gsk_vulkan_blur_pipeline_count_vertex_data     (GskVulkanBlurPipeline   *pipeline);
 void                    gsk_vulkan_blur_pipeline_collect_vertex_data   (GskVulkanBlurPipeline   *pipeline,
                                                                        guchar                  *data,
+                                                                        guint32                  tex_id[2],
+                                                                        const graphene_point_t  *offset,
                                                                        const graphene_rect_t   *rect,
                                                                        const graphene_rect_t   *tex_rect,
                                                                        double                   radius);
@@ -123,15 +123,10 @@ gsk_vulkan_border_pipeline_new (GdkVulkanContext        *context,
  return gsk_vulkan_pipeline_new (GSK_TYPE_VULKAN_BORDER_PIPELINE, context, layout, shader_name, render_pass);
 }

-gsize
-gsk_vulkan_border_pipeline_count_vertex_data (GskVulkanBorderPipeline *pipeline)
-{
-  return sizeof (GskVulkanBorderInstance);
-}
-
 void
 gsk_vulkan_border_pipeline_collect_vertex_data (GskVulkanBorderPipeline *pipeline,
                                                guchar                  *data,
+                                                const graphene_point_t  *offset,
                                                const GskRoundedRect    *rect,
                                                const float              widths[4],
                                                const GdkRGBA            colors[4])
@@ -139,7 +134,7 @@ gsk_vulkan_border_pipeline_collect_vertex_data (GskVulkanBorderPipeline *pipelin
  GskVulkanBorderInstance *instance = (GskVulkanBorderInstance *) data;
  guint i;

-  gsk_rounded_rect_to_float (rect, instance->rect);
+  gsk_rounded_rect_to_float (rect, offset, instance->rect);
  for (i = 0; i < 4; i++)
    {
      instance->widths[i] = widths[i];
@@ -18,9 +18,9 @@ GskVulkanPipeline *     gsk_vulkan_border_pipeline_new                  (GdkVulk
                                                                         const char                     *shader_name,
                                                                         VkRenderPass                    render_pass);

-gsize                   gsk_vulkan_border_pipeline_count_vertex_data    (GskVulkanBorderPipeline        *pipeline);
 void                    gsk_vulkan_border_pipeline_collect_vertex_data  (GskVulkanBorderPipeline        *pipeline,
                                                                         guchar                         *data,
+                                                                         const graphene_point_t         *offset,
                                                                         const GskRoundedRect           *rect,
                                                                         const float                     widths[4],
                                                                         const GdkRGBA                   colors[4]);
@@ -119,15 +119,10 @@ gsk_vulkan_box_shadow_pipeline_new (GdkVulkanContext        *context,
  return gsk_vulkan_pipeline_new (GSK_TYPE_VULKAN_BOX_SHADOW_PIPELINE, context, layout, shader_name, render_pass);
 }

-gsize
-gsk_vulkan_box_shadow_pipeline_count_vertex_data (GskVulkanBoxShadowPipeline *pipeline)
-{
-  return sizeof (GskVulkanBoxShadowInstance);
-}
-
 void
 gsk_vulkan_box_shadow_pipeline_collect_vertex_data (GskVulkanBoxShadowPipeline *pipeline,
                                                    guchar                     *data,
+                                                    const graphene_point_t     *offset,
                                                    const GskRoundedRect       *outline,
                                                    const GdkRGBA              *color,
                                                    float                      dx,
@@ -137,7 +132,7 @@ gsk_vulkan_box_shadow_pipeline_collect_vertex_data (GskVulkanBoxShadowPipeline *
 {
  GskVulkanBoxShadowInstance *instance = (GskVulkanBoxShadowInstance *) data;

-  gsk_rounded_rect_to_float (outline, instance->outline);
+  gsk_rounded_rect_to_float (outline, offset, instance->outline);
  instance->color[0] = color->red;
  instance->color[1] = color->green;
  instance->color[2] = color->blue;
@@ -18,9 +18,9 @@ GskVulkanPipeline *     gsk_vulkan_box_shadow_pipeline_new              (GdkVulk
                                                                         const char                     *shader_name,
                                                                         VkRenderPass                    render_pass);

-gsize                   gsk_vulkan_box_shadow_pipeline_count_vertex_data (GskVulkanBoxShadowPipeline    *pipeline);
 void                    gsk_vulkan_box_shadow_pipeline_collect_vertex_data (GskVulkanBoxShadowPipeline  *pipeline,
                                                                         guchar                         *data,
+                                                                         const graphene_point_t         *offset,
                                                                         const GskRoundedRect           *outline,
                                                                         const GdkRGBA                  *color,
                                                                         float                           dx,
@@ -65,18 +65,23 @@ gsk_vulkan_buffer_new (GdkVulkanContext  *context,
 }

 GskVulkanBuffer *
-gsk_vulkan_buffer_new_staging (GdkVulkanContext  *context,
+gsk_vulkan_buffer_new_storage (GdkVulkanContext  *context,
                               gsize              size)
 {
-  return gsk_vulkan_buffer_new_internal (context, size, VK_BUFFER_USAGE_TRANSFER_SRC_BIT);
+  return gsk_vulkan_buffer_new_internal (context, size, VK_BUFFER_USAGE_STORAGE_BUFFER_BIT);
 }

 GskVulkanBuffer *
-gsk_vulkan_buffer_new_download (GdkVulkanContext  *context,
-                                gsize              size)
+gsk_vulkan_buffer_new_map (GdkVulkanContext  *context,
+                           gsize              size,
+                           GskVulkanMapMode   mode)
 {
-  return gsk_vulkan_buffer_new_internal (context, size, VK_BUFFER_USAGE_TRANSFER_DST_BIT);
+  return gsk_vulkan_buffer_new_internal (context,
+                                         size,
+                                         (mode & GSK_VULKAN_READ ? VK_BUFFER_USAGE_TRANSFER_DST_BIT : 0) |
+                                         (mode & GSK_VULKAN_WRITE ? VK_BUFFER_USAGE_TRANSFER_SRC_BIT : 0));
 }
+
 void
 gsk_vulkan_buffer_free (GskVulkanBuffer *self)
 {
@@ -6,12 +6,20 @@ G_BEGIN_DECLS

 typedef struct _GskVulkanBuffer GskVulkanBuffer;

+typedef enum
+{
+  GSK_VULKAN_READ = (1 << 0),
+  GSK_VULKAN_WRITE = (1 << 1),
+  GSK_VULKAN_READWRITE = GSK_VULKAN_READ | GSK_VULKAN_WRITE
+} GskVulkanMapMode;
+
 GskVulkanBuffer *       gsk_vulkan_buffer_new                           (GdkVulkanContext       *context,
                                                                         gsize                   size);
-GskVulkanBuffer *       gsk_vulkan_buffer_new_staging                   (GdkVulkanContext       *context,
-                                                                         gsize                   size);
-GskVulkanBuffer *       gsk_vulkan_buffer_new_download                  (GdkVulkanContext       *context,
+GskVulkanBuffer *       gsk_vulkan_buffer_new_storage                   (GdkVulkanContext       *context,
                                                                         gsize                   size);
+GskVulkanBuffer *       gsk_vulkan_buffer_new_map                       (GdkVulkanContext       *context,
+                                                                         gsize                   size,
+                                                                         GskVulkanMapMode        mode);
 void                    gsk_vulkan_buffer_free                          (GskVulkanBuffer        *buffer);

 VkBuffer                gsk_vulkan_buffer_get_buffer                    (GskVulkanBuffer        *self);
@@ -13,7 +13,15 @@ gsk_vulkan_clip_init_empty (GskVulkanClip         *clip,
  gsk_rounded_rect_init_from_rect (&clip->rect, rect, 0);
 }

-static void
+void
+gsk_vulkan_clip_init_rect (GskVulkanClip         *clip,
+                           const graphene_rect_t *rect)
+{
+  clip->type = GSK_VULKAN_CLIP_RECT;
+  gsk_rounded_rect_init_from_rect (&clip->rect, rect, 0);
+}
+
+void
 gsk_vulkan_clip_init_copy (GskVulkanClip *self,
                           const GskVulkanClip *src)
 {
@@ -21,11 +29,30 @@ gsk_vulkan_clip_init_copy (GskVulkanClip *self,
  gsk_rounded_rect_init_copy (&self->rect, &src->rect);
 }

+static gboolean
+gsk_vulkan_clip_init_after_intersection (GskVulkanClip              *self,
+                                         GskRoundedRectIntersection  res)
+{
+  if (res == GSK_INTERSECTION_NOT_REPRESENTABLE)
+    return FALSE;
+
+  if (res == GSK_INTERSECTION_EMPTY)
+    self->type = GSK_VULKAN_CLIP_ALL_CLIPPED;
+  else if (gsk_rounded_rect_is_rectilinear (&self->rect))
+    self->type = GSK_VULKAN_CLIP_RECT;
+  else
+    self->type = GSK_VULKAN_CLIP_ROUNDED;
+
+  return TRUE;
+}
+
 gboolean
 gsk_vulkan_clip_intersect_rect (GskVulkanClip         *dest,
                                const GskVulkanClip   *src,
                                const graphene_rect_t *rect)
 {
+  GskRoundedRectIntersection res;
+
  if (graphene_rect_contains_rect (rect, &src->rect.bounds))
    {
      gsk_vulkan_clip_init_copy (dest, src);
@@ -57,22 +84,10 @@ gsk_vulkan_clip_intersect_rect (GskVulkanClip         *dest,
        dest->type = GSK_VULKAN_CLIP_ALL_CLIPPED;
      break;

-    case GSK_VULKAN_CLIP_ROUNDED_CIRCULAR:
    case GSK_VULKAN_CLIP_ROUNDED:
-      if (gsk_rounded_rect_contains_rect (&src->rect, rect))
-        {
-          dest->type = GSK_VULKAN_CLIP_RECT;
-          gsk_rounded_rect_init_from_rect (&dest->rect, rect, 0);
-        }
-      else
-        {
-          /* some points of rect are inside src's rounded rect,
-           * some are outside. */
-          /* XXX: If the 2 rects don't intersect on rounded corners,
-           * we could actually compute a new clip here.
-           */
-          return FALSE;
-        }
+      res = gsk_rounded_rect_intersect_with_rect (&src->rect, rect, &dest->rect);
+      if (!gsk_vulkan_clip_init_after_intersection (dest, res))
+        return FALSE;
      break;

    default:
@@ -88,6 +103,8 @@ gsk_vulkan_clip_intersect_rounded_rect (GskVulkanClip        *dest,
                                        const GskVulkanClip  *src,
                                        const GskRoundedRect *rounded)
 {
+  GskRoundedRectIntersection res;
+
  if (gsk_rounded_rect_contains_rect (rounded, &src->rect.bounds))
    {
      gsk_vulkan_clip_init_copy (dest, src);
@@ -106,34 +123,21 @@ gsk_vulkan_clip_intersect_rounded_rect (GskVulkanClip        *dest,
      break;

    case GSK_VULKAN_CLIP_NONE:
-      dest->type = gsk_rounded_rect_is_circular (rounded) ? GSK_VULKAN_CLIP_ROUNDED_CIRCULAR : GSK_VULKAN_CLIP_ROUNDED;
+      dest->type = GSK_VULKAN_CLIP_ROUNDED;
      gsk_rounded_rect_init_copy (&dest->rect, rounded);
      break;

    case GSK_VULKAN_CLIP_RECT:
-      if (graphene_rect_contains_rect (&src->rect.bounds, &rounded->bounds))
-        {
-          dest->type = gsk_rounded_rect_is_circular (rounded) ? GSK_VULKAN_CLIP_ROUNDED_CIRCULAR : GSK_VULKAN_CLIP_ROUNDED;
-          gsk_rounded_rect_init_copy (&dest->rect, rounded);
-          return TRUE;
-        }
-      /* some points of rect are inside src's rounded rect,
-       * some are outside. */
-      /* XXX: If the 2 rects don't intersect on rounded corners,
-       * we could actually compute a new clip here.
-       */
-      return FALSE;
+      res = gsk_rounded_rect_intersect_with_rect (rounded, &src->rect.bounds, &dest->rect);
+      if (!gsk_vulkan_clip_init_after_intersection (dest, res))
+        return FALSE;
+      break;

-    case GSK_VULKAN_CLIP_ROUNDED_CIRCULAR:
    case GSK_VULKAN_CLIP_ROUNDED:
-      if (gsk_rounded_rect_contains_rect (&src->rect, &rounded->bounds))
-        {
-          dest->type = gsk_rounded_rect_is_circular (rounded) ? GSK_VULKAN_CLIP_ROUNDED_CIRCULAR : GSK_VULKAN_CLIP_ROUNDED;
-          gsk_rounded_rect_init_copy (&dest->rect, rounded);
-          return TRUE;
-        }
-      /* XXX: Can be improved for the case where one of the rects is a slightly shrunk version of the other */
-      return FALSE;
+      res = gsk_rounded_rect_intersection (&src->rect, rounded, &dest->rect);
+      if (!gsk_vulkan_clip_init_after_intersection (dest, res))
+        return FALSE;
+      break;

    default:
      g_assert_not_reached ();
@@ -143,6 +147,19 @@ gsk_vulkan_clip_intersect_rounded_rect (GskVulkanClip        *dest,
  return TRUE;
 }

+void
+gsk_vulkan_clip_scale (GskVulkanClip       *dest,
+                       const GskVulkanClip *src,
+                       float                scale_x,
+                       float                scale_y)
+{
+  dest->type = src->type;
+  gsk_rounded_rect_scale_affine (&dest->rect, 
+                                 &src->rect,
+                                 1.0f / scale_x, 1.0f / scale_y,
+                                 0, 0);
+}
+
 gboolean
 gsk_vulkan_clip_transform (GskVulkanClip         *dest,
                           const GskVulkanClip   *src,
@@ -164,7 +181,6 @@ gsk_vulkan_clip_transform (GskVulkanClip         *dest,
      return TRUE;

    case GSK_VULKAN_CLIP_RECT:
-    case GSK_VULKAN_CLIP_ROUNDED_CIRCULAR:
    case GSK_VULKAN_CLIP_ROUNDED:
      switch (gsk_transform_get_category (transform))
        {
@@ -220,9 +236,41 @@ gsk_vulkan_clip_transform (GskVulkanClip         *dest,
 }

 gboolean
-gsk_vulkan_clip_contains_rect (const GskVulkanClip   *self,
-                               const graphene_rect_t *rect)
+gsk_vulkan_clip_intersects_rect (const GskVulkanClip    *self,
+                                 const graphene_point_t *offset,
+                                 const graphene_rect_t  *rect)
 {
+  graphene_rect_t r = *rect;
+  r.origin.x += offset->x;
+  r.origin.y += offset->y;
+
+  switch (self->type)
+    {
+    default:
+      g_assert_not_reached();
+    case GSK_VULKAN_CLIP_ALL_CLIPPED:
+      return FALSE;
+
+    case GSK_VULKAN_CLIP_NONE:
+      return r.size.width > 0 && r.size.height > 0;
+
+    case GSK_VULKAN_CLIP_RECT:
+      return graphene_rect_intersection (&self->rect.bounds, &r, NULL);
+
+    case GSK_VULKAN_CLIP_ROUNDED:
+      return gsk_rounded_rect_intersects_rect (&self->rect, &r);
+    }
+}
+
+gboolean
+gsk_vulkan_clip_contains_rect (const GskVulkanClip    *self,
+                               const graphene_point_t *offset,
+                               const graphene_rect_t  *rect)
+{
+  graphene_rect_t r = *rect;
+  r.origin.x += offset->x;
+  r.origin.y += offset->y;
+
  switch (self->type)
    {
    default:
@@ -234,10 +282,9 @@ gsk_vulkan_clip_contains_rect (const GskVulkanClip   *self,
      return TRUE;

    case GSK_VULKAN_CLIP_RECT:
-      return graphene_rect_contains_rect (&self->rect.bounds, rect);
+      return graphene_rect_contains_rect (&self->rect.bounds, &r);

-    case GSK_VULKAN_CLIP_ROUNDED_CIRCULAR:
    case GSK_VULKAN_CLIP_ROUNDED:
-      return gsk_rounded_rect_contains_rect (&self->rect, rect);
+      return gsk_rounded_rect_contains_rect (&self->rect, &r);
    }
 }
@@ -18,10 +18,6 @@ typedef enum {
  GSK_VULKAN_CLIP_NONE,
  /* The clip is a rectangular area */
  GSK_VULKAN_CLIP_RECT,
-  /* The clip is a rounded rectangle, and for every corner
-   * corner.width == corner.height is true
-   */
-  GSK_VULKAN_CLIP_ROUNDED_CIRCULAR,
  /* The clip is a rounded rectangle */
  GSK_VULKAN_CLIP_ROUNDED
 } GskVulkanClipComplexity;
@@ -36,6 +32,10 @@ struct _GskVulkanClip

 void                    gsk_vulkan_clip_init_empty                      (GskVulkanClip          *clip,
                                                                         const graphene_rect_t  *rect);
+void                    gsk_vulkan_clip_init_copy                       (GskVulkanClip          *self,
+                                                                         const GskVulkanClip    *src);
+void                    gsk_vulkan_clip_init_rect                       (GskVulkanClip          *clip,
+                                                                         const graphene_rect_t  *rect);

 gboolean                gsk_vulkan_clip_intersect_rect                  (GskVulkanClip          *dest,
                                                                         const GskVulkanClip    *src,
@@ -43,12 +43,20 @@ gboolean                gsk_vulkan_clip_intersect_rect                  (GskVulk
 gboolean                gsk_vulkan_clip_intersect_rounded_rect          (GskVulkanClip          *dest,
                                                                         const GskVulkanClip    *src,
                                                                         const GskRoundedRect   *rounded) G_GNUC_WARN_UNUSED_RESULT;
+void                    gsk_vulkan_clip_scale                           (GskVulkanClip          *dest,
+                                                                         const GskVulkanClip    *src,
+                                                                         float                   scale_x,
+                                                                         float                   scale_y);
 gboolean                gsk_vulkan_clip_transform                       (GskVulkanClip          *dest,
                                                                         const GskVulkanClip    *src,
                                                                         GskTransform           *transform,
                                                                         const graphene_rect_t  *viewport) G_GNUC_WARN_UNUSED_RESULT;

 gboolean                gsk_vulkan_clip_contains_rect                   (const GskVulkanClip    *self,
+                                                                         const graphene_point_t *offset,
+                                                                         const graphene_rect_t  *rect) G_GNUC_WARN_UNUSED_RESULT;
+gboolean                gsk_vulkan_clip_intersects_rect                 (const GskVulkanClip    *self,
+                                                                         const graphene_point_t *offset,
                                                                         const graphene_rect_t  *rect) G_GNUC_WARN_UNUSED_RESULT;

 G_END_DECLS
@@ -84,22 +84,17 @@ gsk_vulkan_color_pipeline_new (GdkVulkanContext         *context,
  return gsk_vulkan_pipeline_new (GSK_TYPE_VULKAN_COLOR_PIPELINE, context, layout, shader_name, render_pass);
 }

-gsize
-gsk_vulkan_color_pipeline_count_vertex_data (GskVulkanColorPipeline *pipeline)
-{
-  return sizeof (GskVulkanColorInstance);
-}
-
 void
 gsk_vulkan_color_pipeline_collect_vertex_data (GskVulkanColorPipeline *pipeline,
                                               guchar                 *data,
+                                               const graphene_point_t *offset,
                                               const graphene_rect_t  *rect,
                                               const GdkRGBA          *color)
 {
  GskVulkanColorInstance *instance = (GskVulkanColorInstance *) data;

-  instance->rect[0] = rect->origin.x;
-  instance->rect[1] = rect->origin.y;
+  instance->rect[0] = rect->origin.x + offset->x;
+  instance->rect[1] = rect->origin.y + offset->y;
  instance->rect[2] = rect->size.width;
  instance->rect[3] = rect->size.height;
  instance->color[0] = color->red;
@@ -17,9 +17,9 @@ GskVulkanPipeline *     gsk_vulkan_color_pipeline_new                   (GdkVulk
                                                                         const char                     *shader_name,
                                                                         VkRenderPass                    render_pass);

-gsize                   gsk_vulkan_color_pipeline_count_vertex_data     (GskVulkanColorPipeline         *pipeline);
 void                    gsk_vulkan_color_pipeline_collect_vertex_data   (GskVulkanColorPipeline         *pipeline,
                                                                         guchar                         *data,
+                                                                         const graphene_point_t         *offset,
                                                                         const graphene_rect_t          *rect,
                                                                         const GdkRGBA                  *color);
 gsize                   gsk_vulkan_color_pipeline_draw                  (GskVulkanColorPipeline         *pipeline,
@@ -13,6 +13,7 @@ struct _GskVulkanColorTextInstance
 {
  float rect[4];
  float tex_rect[4];
+  guint32 tex_id[2];
 };

 G_DEFINE_TYPE (GskVulkanColorTextPipeline, gsk_vulkan_color_text_pipeline, GSK_TYPE_VULKAN_PIPELINE)
@@ -40,6 +41,12 @@ gsk_vulkan_color_text_pipeline_get_input_state_create_info (GskVulkanPipeline *s
          .format = VK_FORMAT_R32G32B32A32_SFLOAT,
          .offset = G_STRUCT_OFFSET (GskVulkanColorTextInstance, tex_rect),
      },
+      {
+          .location = 2,
+          .binding = 0,
+          .format = VK_FORMAT_R32G32_UINT,
+          .offset = G_STRUCT_OFFSET (GskVulkanColorTextInstance, tex_id),
+      }
  };
  static const VkPipelineVertexInputStateCreateInfo info = {
      .sType = VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO,
@@ -84,18 +91,12 @@ gsk_vulkan_color_text_pipeline_new (GdkVulkanContext        *context,
  return gsk_vulkan_pipeline_new (GSK_TYPE_VULKAN_COLOR_TEXT_PIPELINE, context, layout, shader_name, render_pass);
 }

-gsize
-gsk_vulkan_color_text_pipeline_count_vertex_data (GskVulkanColorTextPipeline *pipeline,
-                                                  int                         num_instances)
-{
-  return sizeof (GskVulkanColorTextInstance) * num_instances;
-}
-
 void
 gsk_vulkan_color_text_pipeline_collect_vertex_data (GskVulkanColorTextPipeline *pipeline,
                                                    guchar                     *data,
                                                    GskVulkanRenderer          *renderer,
                                                    const graphene_rect_t      *rect,
+                                                    guint                       tex_id[2],
                                                    PangoFont                  *font,
                                                    guint                       total_glyphs,
                                                    const PangoGlyphInfo       *glyphs,
@@ -140,6 +141,9 @@ gsk_vulkan_color_text_pipeline_collect_vertex_data (GskVulkanColorTextPipeline *
          instance->tex_rect[2] = glyph->tw;
          instance->tex_rect[3] = glyph->th;

+          instance->tex_id[0] = tex_id[0];
+          instance->tex_id[1] = tex_id[1];
+
          count++;
       }
     x_position += gi->geometry.width;
@@ -18,12 +18,11 @@ GskVulkanPipeline *     gsk_vulkan_color_text_pipeline_new                   (Gd
                                                                              const char                     *shader_name,
                                                                              VkRenderPass                    render_pass);

-gsize                   gsk_vulkan_color_text_pipeline_count_vertex_data     (GskVulkanColorTextPipeline     *pipeline,
-                                                                              int                             num_instances);
 void                    gsk_vulkan_color_text_pipeline_collect_vertex_data   (GskVulkanColorTextPipeline     *pipeline,
                                                                              guchar                         *data,
                                                                              GskVulkanRenderer              *renderer,
                                                                              const graphene_rect_t          *rect,
+                                                                              guint                           tex_id[2],
                                                                              PangoFont                      *font,
                                                                              guint                           total_glyphs,
                                                                              const PangoGlyphInfo           *glyphs,
@@ -12,8 +12,12 @@ typedef struct _GskVulkanCrossFadeInstance GskVulkanCrossFadeInstance;
 struct _GskVulkanCrossFadeInstance
 {
  float rect[4];
+  float start_rect[4];
+  float end_rect[4];
  float start_tex_rect[4];
  float end_tex_rect[4];
+  guint32 start_tex_id[2];
+  guint32 end_tex_id[2];
  float progress;
 };

@@ -40,17 +44,41 @@ gsk_vulkan_cross_fade_pipeline_get_input_state_create_info (GskVulkanPipeline *s
          .location = 1,
          .binding = 0,
          .format = VK_FORMAT_R32G32B32A32_SFLOAT,
-          .offset = G_STRUCT_OFFSET (GskVulkanCrossFadeInstance, start_tex_rect),
+          .offset = G_STRUCT_OFFSET (GskVulkanCrossFadeInstance, start_rect),
      },
      {
          .location = 2,
          .binding = 0,
          .format = VK_FORMAT_R32G32B32A32_SFLOAT,
-          .offset = G_STRUCT_OFFSET (GskVulkanCrossFadeInstance, end_tex_rect),
+          .offset = G_STRUCT_OFFSET (GskVulkanCrossFadeInstance, end_rect),
      },
      {
          .location = 3,
          .binding = 0,
+          .format = VK_FORMAT_R32G32B32A32_SFLOAT,
+          .offset = G_STRUCT_OFFSET (GskVulkanCrossFadeInstance, start_tex_rect),
+      },
+      {
+          .location = 4,
+          .binding = 0,
+          .format = VK_FORMAT_R32G32B32A32_SFLOAT,
+          .offset = G_STRUCT_OFFSET (GskVulkanCrossFadeInstance, end_tex_rect),
+      },
+      {
+          .location = 5,
+          .binding = 0,
+          .format = VK_FORMAT_R32G32_UINT,
+          .offset = G_STRUCT_OFFSET (GskVulkanCrossFadeInstance, start_tex_id),
+      },
+      {
+          .location = 6,
+          .binding = 0,
+          .format = VK_FORMAT_R32G32_UINT,
+          .offset = G_STRUCT_OFFSET (GskVulkanCrossFadeInstance, end_tex_id),
+      },
+      {
+          .location = 7,
+          .binding = 0,
          .format = VK_FORMAT_R32_SFLOAT,
          .offset = G_STRUCT_OFFSET (GskVulkanCrossFadeInstance, progress),
      }
@@ -98,27 +126,36 @@ gsk_vulkan_cross_fade_pipeline_new (GdkVulkanContext        *context,
  return gsk_vulkan_pipeline_new (GSK_TYPE_VULKAN_CROSS_FADE_PIPELINE, context, layout, shader_name, render_pass);
 }

-gsize
-gsk_vulkan_cross_fade_pipeline_count_vertex_data (GskVulkanCrossFadePipeline *pipeline)
-{
-  return sizeof (GskVulkanCrossFadeInstance);
-}
-
 void
 gsk_vulkan_cross_fade_pipeline_collect_vertex_data (GskVulkanCrossFadePipeline *pipeline,
-                                                    guchar                *data,
-                                                    const graphene_rect_t *bounds,
-                                                    const graphene_rect_t *start_tex_rect,
-                                                    const graphene_rect_t *end_tex_rect,
-                                                    double                 progress)
+                                                    guchar                     *data,
+                                                    guint32                     start_tex_id[2],
+                                                    guint32                     end_tex_id[2],
+                                                    const graphene_point_t     *offset,
+                                                    const graphene_rect_t      *bounds,
+                                                    const graphene_rect_t      *start_bounds,
+                                                    const graphene_rect_t      *end_bounds,
+                                                    const graphene_rect_t      *start_tex_rect,
+                                                    const graphene_rect_t      *end_tex_rect,
+                                                    double                      progress)
 {
  GskVulkanCrossFadeInstance *instance = (GskVulkanCrossFadeInstance *) data;

-  instance->rect[0] = bounds->origin.x;
-  instance->rect[1] = bounds->origin.y;
+  instance->rect[0] = bounds->origin.x + offset->x;
+  instance->rect[1] = bounds->origin.y + offset->y;
  instance->rect[2] = bounds->size.width;
  instance->rect[3] = bounds->size.height;

+  instance->start_rect[0] = start_bounds->origin.x + offset->x;
+  instance->start_rect[1] = start_bounds->origin.y + offset->y;
+  instance->start_rect[2] = start_bounds->size.width;
+  instance->start_rect[3] = start_bounds->size.height;
+
+  instance->end_rect[0] = end_bounds->origin.x + offset->x;
+  instance->end_rect[1] = end_bounds->origin.y + offset->y;
+  instance->end_rect[2] = end_bounds->size.width;
+  instance->end_rect[3] = end_bounds->size.height;
+
  instance->start_tex_rect[0] = start_tex_rect->origin.x;
  instance->start_tex_rect[1] = start_tex_rect->origin.y;
  instance->start_tex_rect[2] = start_tex_rect->size.width;
@@ -129,6 +166,10 @@ gsk_vulkan_cross_fade_pipeline_collect_vertex_data (GskVulkanCrossFadePipeline *
  instance->end_tex_rect[2] = end_tex_rect->size.width;
  instance->end_tex_rect[3] = end_tex_rect->size.height;

+  instance->start_tex_id[0] = start_tex_id[0];
+  instance->start_tex_id[1] = start_tex_id[1];
+  instance->end_tex_id[0] = end_tex_id[0];
+  instance->end_tex_id[1] = end_tex_id[1];
  instance->progress = progress;
 }

@@ -17,12 +17,16 @@ GskVulkanPipeline * gsk_vulkan_cross_fade_pipeline_new                 (GdkVulka
                                                                        const char                 *shader_name,
                                                                        VkRenderPass                render_pass);

-gsize               gsk_vulkan_cross_fade_pipeline_count_vertex_data   (GskVulkanCrossFadePipeline *pipeline);
 void                gsk_vulkan_cross_fade_pipeline_collect_vertex_data (GskVulkanCrossFadePipeline *pipeline,
                                                                        guchar                     *data,
+                                                                        guint32                     start_tex_id[2],
+                                                                        guint32                     end_tex_id[2],
+                                                                        const graphene_point_t     *offset,
                                                                        const graphene_rect_t      *bounds,
                                                                        const graphene_rect_t      *start_bounds,
                                                                        const graphene_rect_t      *end_bounds,
+                                                                        const graphene_rect_t      *start_tex_rect,
+                                                                        const graphene_rect_t      *end_tex_rect,
                                                                        double                      progress);
 gsize               gsk_vulkan_cross_fade_pipeline_draw                (GskVulkanCrossFadePipeline *pipeline,
                                                                        VkCommandBuffer             command_buffer,
@@ -15,6 +15,7 @@ struct _GskVulkanEffectInstance
  float tex_rect[4];
  float color_matrix[16];
  float color_offset[4];
+  guint32 tex_id[2];
 };

 G_DEFINE_TYPE (GskVulkanEffectPipeline, gsk_vulkan_effect_pipeline, GSK_TYPE_VULKAN_PIPELINE)
@@ -71,6 +72,12 @@ gsk_vulkan_effect_pipeline_get_input_state_create_info (GskVulkanPipeline *self)
          .binding = 0,
          .format = VK_FORMAT_R32G32B32A32_SFLOAT,
          .offset = G_STRUCT_OFFSET (GskVulkanEffectInstance, color_offset),
+      },
+      {
+          .location = 7,
+          .binding = 0,
+          .format = VK_FORMAT_R32G32_UINT,
+          .offset = G_STRUCT_OFFSET (GskVulkanEffectInstance, tex_id),
      }
  };
  static const VkPipelineVertexInputStateCreateInfo info = {
@@ -116,15 +123,11 @@ gsk_vulkan_effect_pipeline_new (GdkVulkanContext        *context,
  return gsk_vulkan_pipeline_new (GSK_TYPE_VULKAN_EFFECT_PIPELINE, context, layout, shader_name, render_pass);
 }

-gsize
-gsk_vulkan_effect_pipeline_count_vertex_data (GskVulkanEffectPipeline *pipeline)
-{
-  return sizeof (GskVulkanEffectInstance);
-}
-
 void
 gsk_vulkan_effect_pipeline_collect_vertex_data (GskVulkanEffectPipeline *pipeline,
                                                guchar                  *data,
+                                                guint32                  tex_id[2],
+                                                const graphene_point_t  *offset,
                                                const graphene_rect_t   *rect,
                                                const graphene_rect_t   *tex_rect,
                                                const graphene_matrix_t *color_matrix,
@@ -132,8 +135,8 @@ gsk_vulkan_effect_pipeline_collect_vertex_data (GskVulkanEffectPipeline *pipelin
 {
  GskVulkanEffectInstance *instance = (GskVulkanEffectInstance *) data;

-  instance->rect[0] = rect->origin.x;
-  instance->rect[1] = rect->origin.y;
+  instance->rect[0] = rect->origin.x + offset->x;
+  instance->rect[1] = rect->origin.y + offset->y;
  instance->rect[2] = rect->size.width;
  instance->rect[3] = rect->size.height;
  instance->tex_rect[0] = tex_rect->origin.x;
@@ -142,6 +145,8 @@ gsk_vulkan_effect_pipeline_collect_vertex_data (GskVulkanEffectPipeline *pipelin
  instance->tex_rect[3] = tex_rect->size.height;
  graphene_matrix_to_float (color_matrix, instance->color_matrix);
  graphene_vec4_to_float (color_offset, instance->color_offset);
+  instance->tex_id[0] = tex_id[0];
+  instance->tex_id[1] = tex_id[1];
 }

 gsize
@@ -17,9 +17,10 @@ GskVulkanPipeline *     gsk_vulkan_effect_pipeline_new                  (GdkVulk
                                                                         const char                     *shader_name,
                                                                         VkRenderPass                    render_pass);

-gsize                   gsk_vulkan_effect_pipeline_count_vertex_data    (GskVulkanEffectPipeline        *pipeline);
 void                    gsk_vulkan_effect_pipeline_collect_vertex_data  (GskVulkanEffectPipeline        *pipeline,
                                                                         guchar                         *data,
+                                                                         guint32                         tex_id[2],
+                                                                         const graphene_point_t         *offset,
                                                                         const graphene_rect_t          *rect,
                                                                         const graphene_rect_t          *tex_rect,
                                                                         const graphene_matrix_t        *color_matrix,
@@ -2,8 +2,10 @@

 #include <gdk/gdk.h>

+#include "gskvulkanbufferprivate.h"
 #include "gskvulkancommandpoolprivate.h"

+
 G_BEGIN_DECLS

 typedef struct _GskVulkanUploader GskVulkanUploader;
@@ -24,11 +26,8 @@ GskVulkanImage *        gsk_vulkan_image_new_for_swapchain              (GdkVulk
                                                                         VkFormat                format,
                                                                         gsize                   width,
                                                                         gsize                   height);
-GskVulkanImage *        gsk_vulkan_image_new_from_data                  (GskVulkanUploader      *uploader,
-                                                                         guchar                 *data,
-                                                                         gsize                   width,
-                                                                         gsize                   height,
-                                                                         gsize                   stride);
+GskVulkanImage *        gsk_vulkan_image_new_from_texture               (GskVulkanUploader      *uploader,
+                                                                         GdkTexture             *texture);

 typedef struct {
  guchar *data;
@@ -43,23 +42,46 @@ void                    gsk_vulkan_image_upload_regions                 (GskVulk
                                                                         GskVulkanUploader      *uploader,
                                                                         guint                   num_regions,
                                                                         GskImageRegion         *regions);
-GskVulkanImage *        gsk_vulkan_image_new_for_framebuffer            (GdkVulkanContext       *context,
-                                                                         gsize                   width,
-                                                                         gsize                   height);
 GskVulkanImage *        gsk_vulkan_image_new_for_atlas                  (GdkVulkanContext       *context,
                                                                         gsize                   width,
                                                                         gsize                   height);
-GskVulkanImage *        gsk_vulkan_image_new_for_texture                (GdkVulkanContext       *context,
+GskVulkanImage *        gsk_vulkan_image_new_for_offscreen              (GdkVulkanContext       *context,
+                                                                         GdkMemoryFormat         preferred_format,
                                                                         gsize                   width,
                                                                         gsize                   height);

 GdkTexture *            gsk_vulkan_image_download                       (GskVulkanImage         *self,
                                                                         GskVulkanUploader      *uploader);

+typedef struct _GskVulkanImageMap GskVulkanImageMap;
+
+struct _GskVulkanImageMap
+{
+  guchar *data;
+  gsize stride;
+  GskVulkanMapMode mode;
+
+  /* private */
+  GskVulkanBuffer *staging_buffer;
+};
+
+GskVulkanImage *        gsk_vulkan_image_new_for_upload                 (GskVulkanUploader      *uploader,
+                                                                         GdkMemoryFormat         format,
+                                                                         gsize                   width,
+                                                                         gsize                   height);
+void                    gsk_vulkan_image_map_memory                     (GskVulkanImage         *self,
+                                                                         GskVulkanUploader      *uploader,
+                                                                         GskVulkanMapMode        mode,
+                                                                         GskVulkanImageMap      *map);
+void                    gsk_vulkan_image_unmap_memory                   (GskVulkanImage         *self,
+                                                                         GskVulkanUploader      *uploader,
+                                                                         GskVulkanImageMap      *map);
+
 gsize                   gsk_vulkan_image_get_width                      (GskVulkanImage         *self);
 gsize                   gsk_vulkan_image_get_height                     (GskVulkanImage         *self);
 VkImage                 gsk_vulkan_image_get_image                      (GskVulkanImage         *self);
 VkImageView             gsk_vulkan_image_get_image_view                 (GskVulkanImage         *self);
+VkFormat                gsk_vulkan_image_get_vk_format                  (GskVulkanImage         *self);

 G_END_DECLS

@@ -15,9 +15,8 @@ struct _GskVulkanLinearGradientInstance
  float start[2];
  float end[2];
  gint32 repeating;
+  gint32 offset;
  gint32 stop_count;
-  float offsets[GSK_VULKAN_LINEAR_GRADIENT_PIPELINE_MAX_COLOR_STOPS];
-  float colors[GSK_VULKAN_LINEAR_GRADIENT_PIPELINE_MAX_COLOR_STOPS][4];
 };

 G_DEFINE_TYPE (GskVulkanLinearGradientPipeline, gsk_vulkan_linear_gradient_pipeline, GSK_TYPE_VULKAN_PIPELINE)
@@ -61,67 +60,13 @@ gsk_vulkan_linear_gradient_pipeline_get_input_state_create_info (GskVulkanPipeli
          .location = 4,
          .binding = 0,
          .format = VK_FORMAT_R32_SINT,
-          .offset = G_STRUCT_OFFSET (GskVulkanLinearGradientInstance, stop_count),
+          .offset = G_STRUCT_OFFSET (GskVulkanLinearGradientInstance, offset),
      },
      {
          .location = 5,
          .binding = 0,
-          .format = VK_FORMAT_R32G32B32A32_SFLOAT,
-          .offset = G_STRUCT_OFFSET (GskVulkanLinearGradientInstance, offsets),
-      },
-      {
-          .location = 6,
-          .binding = 0,
-          .format = VK_FORMAT_R32G32B32A32_SFLOAT,
-          .offset = G_STRUCT_OFFSET (GskVulkanLinearGradientInstance, offsets) + sizeof (float) * 4,
-      },
-      {
-          .location = 7,
-          .binding = 0,
-          .format = VK_FORMAT_R32G32B32A32_SFLOAT,
-          .offset = G_STRUCT_OFFSET (GskVulkanLinearGradientInstance, colors[0]),
-      },
-      {
-          .location = 8,
-          .binding = 0,
-          .format = VK_FORMAT_R32G32B32A32_SFLOAT,
-          .offset = G_STRUCT_OFFSET (GskVulkanLinearGradientInstance, colors[1]),
-      },
-      {
-          .location = 9,
-          .binding = 0,
-          .format = VK_FORMAT_R32G32B32A32_SFLOAT,
-          .offset = G_STRUCT_OFFSET (GskVulkanLinearGradientInstance, colors[2]),
-      },
-      {
-          .location = 10,
-          .binding = 0,
-          .format = VK_FORMAT_R32G32B32A32_SFLOAT,
-          .offset = G_STRUCT_OFFSET (GskVulkanLinearGradientInstance, colors[3]),
-      },
-      {
-          .location = 11,
-          .binding = 0,
-          .format = VK_FORMAT_R32G32B32A32_SFLOAT,
-          .offset = G_STRUCT_OFFSET (GskVulkanLinearGradientInstance, colors[4]),
-      },
-      {
-          .location = 12,
-          .binding = 0,
-          .format = VK_FORMAT_R32G32B32A32_SFLOAT,
-          .offset = G_STRUCT_OFFSET (GskVulkanLinearGradientInstance, colors[5]),
-      },
-      {
-          .location = 13,
-          .binding = 0,
-          .format = VK_FORMAT_R32G32B32A32_SFLOAT,
-          .offset = G_STRUCT_OFFSET (GskVulkanLinearGradientInstance, colors[6]),
-      },
-      {
-          .location = 14,
-          .binding = 0,
-          .format = VK_FORMAT_R32G32B32A32_SFLOAT,
-          .offset = G_STRUCT_OFFSET (GskVulkanLinearGradientInstance, colors[7]),
+          .format = VK_FORMAT_R32_SINT,
+          .offset = G_STRUCT_OFFSET (GskVulkanLinearGradientInstance, stop_count),
      }
  };
  static const VkPipelineVertexInputStateCreateInfo info = {
@@ -167,48 +112,30 @@ gsk_vulkan_linear_gradient_pipeline_new (GdkVulkanContext        *context,
  return gsk_vulkan_pipeline_new (GSK_TYPE_VULKAN_LINEAR_GRADIENT_PIPELINE, context, layout, shader_name, render_pass);
 }

-gsize
-gsk_vulkan_linear_gradient_pipeline_count_vertex_data (GskVulkanLinearGradientPipeline *pipeline)
-{
-  return sizeof (GskVulkanLinearGradientInstance);
-}
-
 void
 gsk_vulkan_linear_gradient_pipeline_collect_vertex_data (GskVulkanLinearGradientPipeline *pipeline,
-                                                         guchar                    *data,
-                                                         const graphene_rect_t     *rect,
-                                                         const graphene_point_t    *start,
-                                                         const graphene_point_t    *end,
-                                                         gboolean                   repeating,
-                                                         gsize                      n_stops,
-                                                         const GskColorStop        *stops)
+                                                         guchar                          *data,
+                                                         const graphene_point_t          *offset,
+                                                         const graphene_rect_t           *rect,
+                                                         const graphene_point_t          *start,
+                                                         const graphene_point_t          *end,
+                                                         gboolean                         repeating,
+                                                         gsize                            gradient_offset,
+                                                         gsize                            n_stops)
 {
  GskVulkanLinearGradientInstance *instance = (GskVulkanLinearGradientInstance *) data;
-  gsize i;

-  if (n_stops > GSK_VULKAN_LINEAR_GRADIENT_PIPELINE_MAX_COLOR_STOPS)
-    {
-      g_warning ("Only %u color stops supported.", GSK_VULKAN_LINEAR_GRADIENT_PIPELINE_MAX_COLOR_STOPS);
-      n_stops = GSK_VULKAN_LINEAR_GRADIENT_PIPELINE_MAX_COLOR_STOPS;
-    }
-  instance->rect[0] = rect->origin.x;
-  instance->rect[1] = rect->origin.y;
+  instance->rect[0] = rect->origin.x + offset->x;
+  instance->rect[1] = rect->origin.y + offset->y;
  instance->rect[2] = rect->size.width;
  instance->rect[3] = rect->size.height;
-  instance->start[0] = start->x;
-  instance->start[1] = start->y;
-  instance->end[0] = end->x;
-  instance->end[1] = end->y;
+  instance->start[0] = start->x + offset->x;
+  instance->start[1] = start->y + offset->y;
+  instance->end[0] = end->x + offset->x;
+  instance->end[1] = end->y + offset->y;
  instance->repeating = repeating;
+  instance->offset = gradient_offset;
  instance->stop_count = n_stops;
-  for (i = 0; i < n_stops; i++)
-    {
-      instance->offsets[i] = stops[i].offset;
-      instance->colors[i][0] = stops[i].color.red;
-      instance->colors[i][1] = stops[i].color.green;
-      instance->colors[i][2] = stops[i].color.blue;
-      instance->colors[i][3] = stops[i].color.alpha;
-    }
 }

 gsize
@@ -20,17 +20,16 @@ GskVulkanPipeline *     gsk_vulkan_linear_gradient_pipeline_new         (GdkVulk
                                                                         const char                     *shader_name,
                                                                         VkRenderPass                    render_pass);

-gsize                   gsk_vulkan_linear_gradient_pipeline_count_vertex_data
-                                                                        (GskVulkanLinearGradientPipeline*pipeline);
 void                    gsk_vulkan_linear_gradient_pipeline_collect_vertex_data
                                                                        (GskVulkanLinearGradientPipeline*pipeline,
                                                                         guchar                         *data,
+                                                                         const graphene_point_t         *offset,
                                                                         const graphene_rect_t          *rect,
                                                                         const graphene_point_t         *start,
                                                                         const graphene_point_t         *end,
                                                                         gboolean                        repeating,
-                                                                         gsize                           n_stops,
-                                                                         const GskColorStop             *stops);
+                                                                         gsize                           gradient_offset,
+                                                                         gsize                           n_stops);
 gsize                   gsk_vulkan_linear_gradient_pipeline_draw        (GskVulkanLinearGradientPipeline*pipeline,
                                                                         VkCommandBuffer                 command_buffer,
                                                                         gsize                           offset,
@@ -9,6 +9,7 @@ struct _GskVulkanMemory

  gsize size;

+  VkMemoryType vk_memory_type;
  VkDeviceMemory vk_memory;
 };

@@ -41,6 +42,7 @@ gsk_vulkan_memory_new (GdkVulkanContext      *context,

  g_assert (i < properties.memoryTypeCount);

+  self->vk_memory_type = properties.memoryTypes[i];
  GSK_VK_CHECK (vkAllocateMemory, gdk_vulkan_context_get_device (context),
                                  &(VkMemoryAllocateInfo) {
                                      .sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO,
@@ -71,11 +73,33 @@ gsk_vulkan_memory_get_device_memory (GskVulkanMemory *self)
  return self->vk_memory;
 }

+gboolean
+gsk_vulkan_memory_can_map (GskVulkanMemory *self,
+                           gboolean         fast)
+{
+  if (!(self->vk_memory_type.propertyFlags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT))
+    return FALSE;
+
+  /* FIXME: no support implemented for this */
+  if (!(self->vk_memory_type.propertyFlags & VK_MEMORY_PROPERTY_HOST_COHERENT_BIT))
+    return FALSE;
+
+  if (!fast)
+    return TRUE;
+
+  if (!(self->vk_memory_type.propertyFlags & VK_MEMORY_PROPERTY_HOST_CACHED_BIT))
+    return FALSE;
+
+  return TRUE;
+}
+
 guchar *
 gsk_vulkan_memory_map (GskVulkanMemory *self)
 {
  void *data;

+  g_assert (gsk_vulkan_memory_can_map (self, FALSE));
+
  GSK_VK_CHECK (vkMapMemory, gdk_vulkan_context_get_device (self->vulkan),
                             self->vk_memory,
                             0,
@@ -14,6 +14,8 @@ void                    gsk_vulkan_memory_free                          (GskVulk

 VkDeviceMemory          gsk_vulkan_memory_get_device_memory             (GskVulkanMemory        *self);

+gboolean                gsk_vulkan_memory_can_map                       (GskVulkanMemory        *self,
+                                                                         gboolean                fast);
 guchar *                gsk_vulkan_memory_map                           (GskVulkanMemory        *self);
 void                    gsk_vulkan_memory_unmap                         (GskVulkanMemory        *self);

@@ -16,10 +16,11 @@ struct _GskVulkanPipelinePrivate
  GdkVulkanContext *context;

  VkPipeline pipeline;
-  VkPipelineLayout layout;

  GskVulkanShader *vertex_shader;
  GskVulkanShader *fragment_shader;
+
+  gsize vertex_stride;
 };

 G_DEFINE_TYPE_WITH_PRIVATE (GskVulkanPipeline, gsk_vulkan_pipeline, G_TYPE_OBJECT)
@@ -54,12 +55,13 @@ gsk_vulkan_pipeline_init (GskVulkanPipeline *self)
 }

 GskVulkanPipeline *
-gsk_vulkan_pipeline_new (GType                    pipeline_type,
-                         GdkVulkanContext        *context,
-                         VkPipelineLayout         layout,
-                         const char              *shader_name,
-                         VkRenderPass             render_pass)
+gsk_vulkan_pipeline_new (GType             pipeline_type,
+                         GdkVulkanContext *context,
+                         VkPipelineLayout  layout,
+                         const char       *shader_name,
+                         VkRenderPass      render_pass)
 {
+  const VkPipelineVertexInputStateCreateInfo *vertex_input_state;
  GskVulkanPipelinePrivate *priv;
  GskVulkanPipeline *self;
  VkDevice device;
@@ -76,11 +78,14 @@ gsk_vulkan_pipeline_new (GType                    pipeline_type,
  device = gdk_vulkan_context_get_device (context);

  priv->context = context;
-  priv->layout = layout;

  priv->vertex_shader = gsk_vulkan_shader_new_from_resource (context, GSK_VULKAN_SHADER_VERTEX, shader_name, NULL);
  priv->fragment_shader = gsk_vulkan_shader_new_from_resource (context, GSK_VULKAN_SHADER_FRAGMENT, shader_name, NULL);

+  vertex_input_state = GSK_VULKAN_PIPELINE_GET_CLASS (self)->get_input_state_create_info (self);
+  g_assert (vertex_input_state->vertexBindingDescriptionCount == 1);
+  priv->vertex_stride = vertex_input_state->pVertexBindingDescriptions[0].stride;
+
  GSK_VK_CHECK (vkCreateGraphicsPipelines, device,
                                           VK_NULL_HANDLE,
                                           1,
@@ -91,7 +96,7 @@ gsk_vulkan_pipeline_new (GType                    pipeline_type,
                                                   GST_VULKAN_SHADER_STAGE_CREATE_INFO (priv->vertex_shader),
                                                   GST_VULKAN_SHADER_STAGE_CREATE_INFO (priv->fragment_shader)
                                               },
-                                               .pVertexInputState = GSK_VULKAN_PIPELINE_GET_CLASS (self)->get_input_state_create_info (self),
+                                               .pVertexInputState = vertex_input_state,
                                               .pInputAssemblyState = &(VkPipelineInputAssemblyStateCreateInfo) {
                                                   .sType = VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO,
                                                   .topology = VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST,
@@ -108,7 +113,7 @@ gsk_vulkan_pipeline_new (GType                    pipeline_type,
                                                   .depthClampEnable = VK_FALSE,
                                                   .rasterizerDiscardEnable = VK_FALSE,
                                                   .polygonMode = VK_POLYGON_MODE_FILL,
-                                                   .cullMode = VK_CULL_MODE_BACK_BIT,
+                                                   .cullMode = VK_CULL_MODE_NONE,
                                                   .frontFace = VK_FRONT_FACE_CLOCKWISE,
                                                   .lineWidth = 1.0f,
                                               },
@@ -146,7 +151,7 @@ gsk_vulkan_pipeline_new (GType                    pipeline_type,
                                                       VK_DYNAMIC_STATE_SCISSOR
                                                   },
                                               },
-                                               .layout = priv->layout,
+                                               .layout = layout,
                                               .renderPass = render_pass,
                                               .subpass = 0,
                                               .basePipelineHandle = VK_NULL_HANDLE,
@@ -166,10 +171,10 @@ gsk_vulkan_pipeline_get_pipeline (GskVulkanPipeline *self)
  return priv->pipeline;
 }

-VkPipelineLayout
-gsk_vulkan_pipeline_get_pipeline_layout (GskVulkanPipeline *self)
+gsize
+gsk_vulkan_pipeline_get_vertex_stride (GskVulkanPipeline *self)
 {
  GskVulkanPipelinePrivate *priv = gsk_vulkan_pipeline_get_instance_private (self);

-  return priv->layout;
+  return priv->vertex_stride;
 }
@@ -37,7 +37,7 @@ GskVulkanPipeline *     gsk_vulkan_pipeline_new                         (GType
                                                                         const char                     *shader_name,
                                                                         VkRenderPass                    render_pass);
 VkPipeline              gsk_vulkan_pipeline_get_pipeline                (GskVulkanPipeline              *self);
-VkPipelineLayout        gsk_vulkan_pipeline_get_pipeline_layout         (GskVulkanPipeline              *self);
+gsize                   gsk_vulkan_pipeline_get_vertex_stride           (GskVulkanPipeline              *self);

 G_END_DECLS

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