Quick visualization of rounded rects

Still to do:
 - Handle the cases that need solving for ellipse intersections
 - Write tests

.gitignore

@@ -1,2 +1 @@
 /subprojects/*/
-.flatpak-builder/

.gitlab-ci.yml

@@ -24,7 +24,7 @@ stages:
 variables:
   COMMON_MESON_FLAGS: "-Dwerror=true -Dcairo:werror=false -Dgi-docgen:werror=false -Dgraphene:werror=false -Dlibepoxy:werror=false -Dlibsass:werror=false -Dpango:werror=false -Dsassc:werror=false -Dgdk-pixbuf:werror=false -Dglib:werror=false -Dlibcloudproviders:werror=false -Dlibpng:werror=false -Dlibtiff:werror=false -Dsysprof:werror=false -Dwayland-protocols:werror=false -Dharfbuzz:werror=false -Dfreetype2:werror=false -Dfontconfig:werror=false -Dfribidi:werror=false -Dlibffi:werror=false -Dlibjpeg-turbo:werror=false -Dmutest:werror=false -Dpixman:werror=false -Dproxy-libintl:werror=false"
   BACKEND_FLAGS: "-Dx11-backend=true -Dwayland-backend=true -Dbroadway-backend=true"
-  FEATURE_FLAGS: "-Dvulkan=enabled -Dcloudproviders=enabled -Dbuild-testsuite=true -Dintrospection=enabled"
+  FEATURE_FLAGS: "-Dvulkan=enabled -Dcloudproviders=enabled -Dbuild-demos=false -Dbuild-examples=false -Dbuild-tests=false -Dbuild-testsuite=true"
   MESON_TEST_TIMEOUT_MULTIPLIER: 3
   FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v46"
 
@@ -123,26 +123,6 @@ release-build:
     - LD_LIBRARY_PATH=${CI_PROJECT_DIR}/_install/lib64 meson compile -C _build_hello
     - .gitlab-ci/run-tests.sh _build x11
 
-fedora-clang:
-  extends: .build-fedora-default
-  stage: build
-  needs: []
-  variables:
-    EXTRA_MESON_FLAGS: "--buildtype=release"
-  script:
-    - .gitlab-ci/show-info-linux.sh
-    - export PATH="$HOME/.local/bin:$PATH"
-    - export CC=clang
-    - meson subprojects download
-    - meson subprojects update --reset
-    - meson setup
-            ${COMMON_MESON_FLAGS}
-            ${EXTRA_MESON_FLAGS}
-            ${BACKEND_FLAGS}
-            ${FEATURE_FLAGS}
-            _build
-    - meson compile -C _build
-
 fedora-mingw64:
   extends: .build-fedora-default
   stage: build

NEWS

@@ -1,84 +1,6 @@
-Overview of Changes in 4.11.3, 05-06 2023
+Overview of Changes in 4.11.3, xx-xx-xxxx
 =========================================
 
-* GtkGridView:
- - Respect css border-spacing
- - Don't leak the factories
-
-* GtkListView:
- - Don't leak the factories
-
-* GtkColumnView:
- - Support displaying sections
-
-* GtkNotebook:
- - Make the pages model implement GtkSelectionModel
-
-* GtkScrolledWindow:
- - Propagate child measure size whenever possible
-
-* GtkPopoverMenu:
- - Avoid unnecessary left padding
-
-* GtkSearchEntry:
- - Improve size allocation for the clear icon
-
-* GtkBoxLayout:
- - Fix a regression from recent baseline work
-
-* CSS:
- - Add new binding-friendly css provider apis
-
-* Theme:
- - Show focus in the shortcuts window
-
-* 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
-     profile -> demo-profile
-   The old names still work
-
-* Deprecations:
- - gtk_css_provider_load_from_data
- - gdk_wayland_toplevel_unexport_handle
- - gdk_pixbuf_get_from_surface
- - gdk_pixbuf_get_from_texture
- - gtk_image_new_from_pixbuf
- - gtk_image_set_from_pixbuf
- - gtk_picture_new_for_pixbuf
- - gtk_picture_set_pixbuf
-
-* Translation updates:
- Basque
- Catalan
- Georgian
- Russian
- Turkish
-
-
 Overview of Changes in 4.11.2, 09-05-2023
 =========================================
 

demos/gtk-demo/fontrendering.c

@@ -43,7 +43,6 @@ update_image (void)
   cairo_t *cr;
   GdkPixbuf *pixbuf;
   GdkPixbuf *pixbuf2;
-  GdkTexture *texture;
   cairo_font_options_t *fopt;
   cairo_hint_style_t hintstyle;
   cairo_hint_metrics_t hintmetrics;
@@ -121,17 +120,8 @@ update_image (void)
       cairo_destroy (cr);
       g_object_unref (layout);
 
-      pixbuf = gdk_pixbuf_new_from_data (cairo_image_surface_get_data (surface),
-                                         GDK_COLORSPACE_RGB, TRUE, 8,
-                                         cairo_image_surface_get_width (surface),
-                                         cairo_image_surface_get_height (surface),
-                                         cairo_image_surface_get_stride (surface),
-                                         NULL, NULL);
-
-      pixbuf2 = gdk_pixbuf_scale_simple (pixbuf,
-                                         gdk_pixbuf_get_width (pixbuf) * scale,
-                                         gdk_pixbuf_get_height (pixbuf) * scale,
-                                         GDK_INTERP_NEAREST);
+      pixbuf = gdk_pixbuf_get_from_surface (surface, 0, 0, cairo_image_surface_get_width (surface), cairo_image_surface_get_height (surface));
+      pixbuf2 = gdk_pixbuf_scale_simple (pixbuf, gdk_pixbuf_get_width (pixbuf) * scale, gdk_pixbuf_get_height (pixbuf) * scale, GDK_INTERP_NEAREST);
 
       g_object_unref (pixbuf);
       cairo_surface_destroy (surface);
@@ -288,24 +278,14 @@ retry:
       pango_layout_iter_free (iter);
       g_object_unref (layout);
 
-      pixbuf = gdk_pixbuf_new_from_data (cairo_image_surface_get_data (surface),
-                                         GDK_COLORSPACE_RGB, TRUE, 8,
-                                         cairo_image_surface_get_width (surface),
-                                         cairo_image_surface_get_height (surface),
-                                         cairo_image_surface_get_stride (surface),
-                                         NULL, NULL);
-
-      pixbuf2 = gdk_pixbuf_scale_simple (pixbuf,
-                                         gdk_pixbuf_get_width (pixbuf) * scale,
-                                         gdk_pixbuf_get_height (pixbuf) * scale,
-                                         GDK_INTERP_NEAREST);
+      pixbuf = gdk_pixbuf_get_from_surface (surface, 0, 0, cairo_image_surface_get_width (surface), cairo_image_surface_get_height (surface));
+      pixbuf2 = gdk_pixbuf_scale_simple (pixbuf, gdk_pixbuf_get_width (pixbuf) * scale, gdk_pixbuf_get_height (pixbuf) * scale, GDK_INTERP_NEAREST);
       g_object_unref (pixbuf);
       cairo_surface_destroy (surface);
     }
 
-  texture = gdk_texture_new_for_pixbuf (pixbuf2);
-  gtk_picture_set_paintable (GTK_PICTURE (image), GDK_PAINTABLE (texture));
-  g_object_unref (pixbuf2);
+  gtk_picture_set_pixbuf (GTK_PICTURE (image), pixbuf2);
+
   g_object_unref (pixbuf2);
 }
 

demos/gtk-demo/images.c

@@ -30,7 +30,6 @@ progressive_prepared_callback (GdkPixbufLoader *loader,
 {
   GdkPixbuf *pixbuf;
   GtkWidget *picture;
-  GdkTexture *texture;
 
   picture = GTK_WIDGET (data);
 
@@ -41,9 +40,7 @@ progressive_prepared_callback (GdkPixbufLoader *loader,
    */
   gdk_pixbuf_fill (pixbuf, 0xaaaaaaff);
 
-  texture = gdk_texture_new_for_pixbuf (pixbuf);
-  gtk_picture_set_paintable (GTK_PICTURE (picture), GDK_PAINTABLE (texture));
-  g_object_unref (texture);
+  gtk_picture_set_pixbuf (GTK_PICTURE (picture), pixbuf);
 }
 
 static void
@@ -54,18 +51,22 @@ progressive_updated_callback (GdkPixbufLoader *loader,
                               int                  height,
                               gpointer     data)
 {
-  GtkWidget *picture = GTK_WIDGET (data);
-  GdkTexture *texture;
+  GtkWidget *picture;
+  GdkPixbuf *pixbuf;
 
-  texture = gdk_texture_new_for_pixbuf (gdk_pixbuf_loader_get_pixbuf (loader));
-  gtk_picture_set_paintable (GTK_PICTURE (picture), GDK_PAINTABLE (texture));
-  g_object_unref (texture);
+  picture = GTK_WIDGET (data);
+
+  pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
+  gtk_picture_set_pixbuf (GTK_PICTURE (picture), NULL);
+  gtk_picture_set_pixbuf (GTK_PICTURE (picture), pixbuf);
 }
 
 static int
 progressive_timeout (gpointer data)
 {
-  GtkWidget *picture = GTK_WIDGET (data);
+  GtkWidget *picture;
+
+  picture = GTK_WIDGET (data);
 
   /* This shows off fully-paranoid error handling, so looks scary.
    * You could factor out the error handling code into a nice separate

demos/node-editor/node-editor-window.c

@@ -1701,13 +1701,6 @@ node_editor_window_init (NodeEditorWindow *self)
          "  }\n"
          "  transform: translate(0, 140);\n"
          "}", -1);
-
-  if (g_getenv ("GSK_RENDERER"))
-    {
-      char *new_title = g_strdup_printf ("GTK Node Editor - %s", g_getenv ("GSK_RENDERER"));
-      gtk_window_set_title (GTK_WINDOW (self), new_title);
-      g_free (new_title);
-    }
 }
 
 NodeEditorWindow *

demos/widget-factory/widget-factory.c

@@ -1210,12 +1210,12 @@ typedef struct {
 static void
 add_background (GtkWidget  *flowbox,
                 const char *filename,
-                GdkTexture *texture,
+                GdkPixbuf  *pixbuf,
                 gboolean    is_resource)
 {
   GtkWidget *child;
 
-  child = gtk_picture_new_for_paintable (GDK_PAINTABLE (texture));
+  child = gtk_picture_new_for_pixbuf (pixbuf);
   gtk_widget_set_size_request (child, 110, 70);
   gtk_flow_box_insert (GTK_FLOW_BOX (flowbox), child, -1);
   child = gtk_widget_get_parent (child);
@@ -1231,7 +1231,6 @@ background_loaded_cb (GObject      *source,
 {
   BackgroundData *bd = data;
   GdkPixbuf *pixbuf;
-  GdkTexture *texture;
   GError *error = NULL;
 
   pixbuf = gdk_pixbuf_new_from_stream_finish (res, &error);
@@ -1242,11 +1241,8 @@ background_loaded_cb (GObject      *source,
       return;
     }
 
-  texture = gdk_texture_new_for_pixbuf (pixbuf);
-  add_background (bd->flowbox, bd->filename, texture, FALSE);
+  add_background (bd->flowbox, bd->filename, pixbuf, FALSE);
 
-  g_object_unref (texture);
-  g_object_unref (pixbuf);
   g_free (bd->filename);
   g_free (bd);
 }
@@ -1263,10 +1259,7 @@ populate_flowbox (GtkWidget *flowbox)
   GInputStream *stream;
   BackgroundData *bd;
   GdkPixbuf *pixbuf;
-  GdkTexture *texture;
   GtkWidget *child;
-  guchar *data;
-  GBytes *bytes;
   int i;
   const char *resources[] = {
     "sunset.jpg", "portland-rose.jpg", "beach.jpg", "nyc.jpg"
@@ -1277,14 +1270,9 @@ populate_flowbox (GtkWidget *flowbox)
 
   g_object_set_data (G_OBJECT (flowbox), "populated", GUINT_TO_POINTER (1));
 
-  data = g_malloc (4 * 110  * 70);
-  memset (data, 0xff, 4 * 110  * 70);
-  bytes = g_bytes_new_take (data, 4 * 110 * 70);
-  texture = gdk_memory_texture_new (110, 70, GDK_MEMORY_DEFAULT, bytes, 4 * 110);
-  child = gtk_picture_new_for_paintable (GDK_PAINTABLE (texture));
-  g_object_unref (texture);
-  g_bytes_unref (bytes);
-
+  pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, 110, 70);
+  gdk_pixbuf_fill (pixbuf, 0xffffffff);
+  child = gtk_picture_new_for_pixbuf (pixbuf);
   gtk_widget_add_css_class (child, "frame");
   gtk_flow_box_insert (GTK_FLOW_BOX (flowbox), child, -1);
 
@@ -1292,10 +1280,7 @@ populate_flowbox (GtkWidget *flowbox)
     {
       filename = g_strconcat ("/org/gtk/WidgetFactory4/", resources[i], NULL);
       pixbuf = gdk_pixbuf_new_from_resource_at_scale (filename, 110, 110, TRUE, NULL);
-      texture = gdk_texture_new_for_pixbuf (pixbuf);
-      add_background (flowbox, filename, texture, TRUE);
-      g_object_unref (texture);
-      g_object_unref (pixbuf);
+      add_background (flowbox, filename, pixbuf, TRUE);
     }
 
   location = "/usr/share/backgrounds/gnome";

demos/widget-factory/widget-factory.ui

@@ -2244,24 +2244,20 @@ microphone-sensitivity-medium-symbolic</property>
                         <child>
                           <object class="GtkBox">
                             <property name="spacing">6</property>
-                            <property name="valign">center</property>
                             <child>
                               <object class="GtkBox" id="lockbox">
                                 <property name="hexpand">1</property>
                                 <property name="spacing">6</property>
-                                <property name="valign">center</property>
                                 <child>
                                   <object class="GtkMenuButton" id="open_menubutton">
                                     <property name="halign">3</property>
                                     <property name="popover">open_popover</property>
                                     <property name="label">Open</property>
-                                    <property name="valign">center</property>
                                   </object>
                                 </child>
                                 <child>
                                   <object class="GtkToggleButton" id="record_button">
                                     <property name="halign">3</property>
-                                    <property name="valign">center</property>
                                     <signal name="toggled" handler="on_record_button_toggled"/>
                                     <style>
                                       <class name="text-button"/>
@@ -2271,19 +2267,16 @@ microphone-sensitivity-medium-symbolic</property>
                                     <child>
                                       <object class="GtkBox">
                                         <property name="spacing">6</property>
-                                        <property name="valign">center</property>
                                         <child>
                                           <object class="GtkImage">
                                             <property name="valign">4</property>
                                             <property name="icon-name">media-record-symbolic</property>
-                                            <property name="valign">center</property>
                                           </object>
                                         </child>
                                         <child>
                                           <object class="GtkLabel">
                                             <property name="valign">4</property>
                                             <property name="label">Record</property>
-                                            <property name="valign">center</property>
                                           </object>
                                         </child>
                                       </object>
@@ -2292,7 +2285,6 @@ microphone-sensitivity-medium-symbolic</property>
                                 </child>
                                 <child>
                                   <object class="GtkBox">
-                                    <property name="valign">center</property>
                                     <style>
                                       <class name="linked"/>
                                     </style>
@@ -2300,14 +2292,12 @@ microphone-sensitivity-medium-symbolic</property>
                                       <object class="GtkToggleButton" id="grid_button">
                                         <property name="active">1</property>
                                         <property name="icon-name">view-grid-symbolic</property>
-                                        <property name="valign">center</property>
                                       </object>
                                     </child>
                                     <child>
                                       <object class="GtkToggleButton" id="list_button">
                                         <property name="group">grid_button</property>
                                         <property name="icon-name">view-list-symbolic</property>
-                                        <property name="valign">center</property>
                                       </object>
                                     </child>
                                   </object>
@@ -2315,7 +2305,6 @@ microphone-sensitivity-medium-symbolic</property>
                                 <child>
                                   <object class="GtkButton" id="circular_button">
                                     <property name="icon-name">emblem-system-symbolic</property>
-                                    <property name="valign">center</property>
                                     <style>
                                       <class name="circular"/>
                                     </style>
@@ -2324,15 +2313,12 @@ microphone-sensitivity-medium-symbolic</property>
                               </object>
                             </child>
                             <child>
-                              <object class="GtkLockButton" id="lockbutton">
-                                <property name="valign">center</property>
-                              </object>
+                              <object class="GtkLockButton" id="lockbutton"/>
                             </child>
                             <child>
                               <object class="GtkMenuButton">
                                 <property name="icon-name">view-more-symbolic</property>
                                 <property name="menu-model">new_style_menu_model</property>
-                                <property name="valign">center</property>
                               </object>
                             </child>
                           </object>

docs/reference/gtk/actions.md

@@ -220,6 +220,6 @@ clipboard.cut, clipboard.copy, clipboard.paste
 selection.delete, selection.select-all
 : Selection operations on entries, text view and labels
 
-color.select, color.customize
+color.select, color.customize:
 : Operate on colors in a `GtkColorChooserWidget`. These actions are
-  unusual in that they have the non-trivial parameter type (dddd).
+  unusual in that they have the non-trivial parameter type (dddd):

docs/reference/gtk/css-overview.md

@@ -68,7 +68,7 @@ in a selector, widget names must be prefixed with a # character.
 | E:focus-within | [CSS Selector Level 4](https://drafts.csswg.org/selectors/#focus-within-pseudo) | Set on all ancestors of the focus widget, unlike CSS |
 | E:focus-visible | [CSS Selector Level 4](https://drafts.csswg.org/selectors/#focus-within-pseudo) | Set on focus widget and all ancestors, unlike CSS |
 | E:disabled | [CSS Selector Level 3](https://www.w3.org/TR/css3-selectors/#UIstates) | Corresponds to GTK_STATE_FLAG_INSENSITIVE |
-| E:checked | [CSS Selector Level 3](https://www.w3.org/TR/css3-selectors/#UIstates) | Corresponds to GTK_STATE_FLAG_CHECKED |
+| E:disabled | [CSS Selector Level 3](https://www.w3.org/TR/css3-selectors/#UIstates) | Corresponds to GTK_STATE_FLAG_CHECKED |
 | E:indeterminate | [CSS Selector Level 3](https://www.w3.org/TR/css3-selectors/#indeterminate) | Corresponds to GTK_STATE_FLAG_INCONSISTENT |
 | E:backdrop, E:selected | | Corresponds to GTK_STATE_FLAG_BACKDROP, GTK_STATE_FLAG_SELECTED |
 | E:not(selector) | [CSS Selector Level 3](https://www.w3.org/TR/css3-selectors/#negation) | |

docs/reference/gtk/input-handling.md

@@ -103,15 +103,14 @@ fields, but e.g. buttons can take the focus too.
 
 Input widgets can be given the focus by clicking on them, but focus
 can also be moved around with certain key events (this is known as
-“keyboard navigation”).
-GTK reserves the <kbd>Tab</kbd> key to move the focus to the next location,
-and <kbd>Shift</kbd>+<kbd>Tab</kbd> to move it back to the previous one.
-In addition many containers allow “directional navigation” with the arrow keys.
+“keyboard navigation”). GTK reserves the <kbd>Tab</kbd> key to move the focus
+to the next location, and <kbd>Shift</kbd>+<kbd>Tab</kbd> to move it back to the previous
+one. In addition many containers allow “directional navigation” with
+the arrow keys.
 
-Many widgets can be “activated” to trigger and action.
-E.g., you can activate a button or switch by clicking on them,
-but you can also activate them with the keyboard,
-by using the <kbd>Enter</kbd> or <kbd>Space</kbd> keys.
+Many widgets can be “activated” to trigger and action. E.g., you can
+activate a button or switch by clicking on them, but you can also
+activate them with the keyboard, by using the <kbd>Enter</kbd> or <kbd>␣</kbd> keys.
 
 Apart from keyboard navigation, activation and directly typing into
 entries or text views, GTK widgets can use key events for activating
@@ -122,17 +121,15 @@ GTK has traditionally supported different kinds of shortcuts:
 
 - Accelerators are any other shortcuts that can be activated regardless
   of where the focus is, and typically trigger global actions, such as
-  <kbd>Ctrl</kbd>+<kbd>Q</kbd> to quit an application.
-- Mnemonics are usually triggered using <kbd>Alt</kbd>
-  as a modifier for a letter.
+  Ctrl-Q to quit an application.
+- Mnemonics are usually triggered using Alt as a modifier for a letter.
   They are used in places where a label is associated with a control,
   and are indicated by underlining the letter in the label. As a special
   case, inside menus (i.e. inside `GtkPopoverMenu`), mnemonics can be
   triggered without the modifier.
-- Key bindings are specific to individual widgets,
-  such as <kbd>Ctrl</kbd>+<kbd>C</kbd> or <kbd>Ctrl</kbd>+<kbd>V</kbd>
-  in an entry copy to or paste from the clipboard.
-  They are only triggered when the widget has focus.
+- Key bindings are specific to individual widgets, such as Ctrl-C or
+  Ctrl-V in an entry copy to or paste from the clipboard. They are only
+  triggered when the widget has focus.
 
 GTK handles accelerators and mnemonics in a global scope, during the
 capture phase, and key bindings locally, during the target phase.
@@ -211,4 +208,4 @@ sequence, so setting the state on one does transfer the state to
 the others. They also are mutually exclusive, within a widget
 where may be only one gesture group claiming a given sequence.
 If another gesture group claims later that same sequence, the
-first group will deny the sequence.
+first group will deny the sequence:

docs/reference/gtk/migrating-4to5.md

@@ -133,9 +133,3 @@ The function gtk_widget_get_allocation() is also going away. It does not have a
 replacement, but the previously mentioned alternatives can be used for it too.
 
 The function gtk_widget_get_allocated_baseline() has been renamed to [method@Gtk.Widget.get_baseline].
-
-## Stop using GdkPixbuf
-
-GTK is moving away from GdkPixbuf as the primary API for transporting image data, in favor
-of GdkTexture. APIs that are accepting or returning GdkPixbufs are being replaced by equivalent
-APIs using GdkTexture or GdkPaintable objects.

docs/reference/gtk/section-list-widget.md

@@ -196,15 +196,6 @@ The _data table_ style of list is a high density table, similar in style to a
 traditional treeview. Individual cells can be selectable and editable. Use
 the `.data-table` style class.
 
-## Sections
-
-List models can optionally group their items into **_sections_**, by implementing
-the `GtkSectionModel` interface. Both `GtkListView` and `GtkGridView` can
-display headers for sections, by installing a separate **_header factory_**.
-
-Many GTK list models support section inherently, or they pass through the
-section of a model they are wrapping.
-
 ## Comparison to GtkTreeView
 
 Developers familiar with `GtkTreeView` may wonder how this way of doing lists

examples/plugman.c

@@ -57,7 +57,7 @@ window_paste (GSimpleAction *action,
 {
   GtkWindow *window = GTK_WINDOW (user_data);
   GtkTextView *text = g_object_get_data ((GObject*)window, "plugman-text");
-
+  
   gtk_text_buffer_paste_clipboard (gtk_text_view_get_buffer (text),
                                    gtk_widget_get_clipboard (GTK_WIDGET (text)),
                                    NULL,
@@ -221,7 +221,7 @@ plugin_action (GAction  *action,
   g_message ("Color: %s", g_action_get_name (action));
 
   css_provider = gtk_css_provider_new ();
-  gtk_css_provider_load_from_string (css_provider, css_to_load);
+  gtk_css_provider_load_from_data (css_provider, css_to_load, -1);
   gtk_style_context_add_provider_for_display (gdk_display_get_default (),
                                               GTK_STYLE_PROVIDER (css_provider),
                                               GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);

gdk/deprecated/meson.build

@@ -1,7 +0,0 @@
-gdk_deprecated_sources = files([
-  'gdkpixbuf.c',
-])
-
-gdk_deprecated_headers = files([
-  'gdkpixbuf.h',
-])

gdk/gdk.h

@@ -61,7 +61,7 @@
 #include <gdk/gdkmonitor.h>
 #include <gdk/gdkpaintable.h>
 #include <gdk/gdkpango.h>
-#include <gdk/deprecated/gdkpixbuf.h>
+#include <gdk/gdkpixbuf.h>
 #include <gdk/gdkpopup.h>
 #include <gdk/gdkpopuplayout.h>
 #include <gdk/gdkrectangle.h>

gdk/gdkcairo.c

@@ -17,7 +17,7 @@
 
 #include "config.h"
 
-#include "gdkcairo.h"
+#include "gdkcairoprivate.h"
 
 #include "gdkrgba.h"
 #include "gdktexture.h"
@@ -90,7 +90,7 @@ gdk_cairo_region (cairo_t              *cr,
     }
 }
 
-static void
+void
 gdk_cairo_surface_paint_pixbuf (cairo_surface_t *surface,
                                 const GdkPixbuf *pixbuf)
 {
@@ -171,7 +171,7 @@ gdk_cairo_set_source_pixbuf (cairo_t         *cr,
  *
  * Returns: %TRUE if the extents fit in a `GdkRectangle`, %FALSE if not
  */
-static gboolean
+gboolean
 _gdk_cairo_surface_extents (cairo_surface_t *surface,
                             GdkRectangle    *extents)
 {
@@ -303,3 +303,38 @@ gdk_cairo_region_create_from_surface (cairo_surface_t *surface)
 
   return region;
 }
+
+cairo_region_t *
+gdk_cairo_region_from_clip (cairo_t *cr)
+{
+  cairo_rectangle_list_t *rectangles;
+  cairo_region_t *region;
+  int i;
+
+  rectangles = cairo_copy_clip_rectangle_list (cr);
+
+  if (rectangles->status != CAIRO_STATUS_SUCCESS)
+    return NULL;
+
+  region = cairo_region_create ();
+  for (i = 0; i < rectangles->num_rectangles; i++)
+    {
+      cairo_rectangle_int_t clip_rect;
+      cairo_rectangle_t *rect;
+
+      rect = &rectangles->rectangles[i];
+
+      /* Here we assume clip rects are ints for direct targets, which
+         is true for cairo */
+      clip_rect.x = (int)rect->x;
+      clip_rect.y = (int)rect->y;
+      clip_rect.width = (int)rect->width;
+      clip_rect.height = (int)rect->height;
+
+      cairo_region_union_rectangle (region, &clip_rect);
+    }
+
+  cairo_rectangle_list_destroy (rectangles);
+
+  return region;
+}

gdk/gdkcairo.h

@@ -22,7 +22,7 @@
 #endif
 
 #include <gdk/gdktypes.h>
-#include <gdk/deprecated/gdkpixbuf.h>
+#include <gdk/gdkpixbuf.h>
 #include <pango/pangocairo.h>
 
 G_BEGIN_DECLS

gdk/gdkcairoprivate.h

@@ -0,0 +1,37 @@
+/* GDK - The GIMP Drawing Kit
+ * Copyright (C) 2020 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "gdkcairo.h"
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <cairo.h>
+
+G_BEGIN_DECLS
+
+gboolean        _gdk_cairo_surface_extents       (cairo_surface_t *surface,
+                                                  GdkRectangle    *extents);
+
+void            gdk_cairo_surface_paint_pixbuf   (cairo_surface_t *surface,
+                                                  const GdkPixbuf *pixbuf);
+
+cairo_region_t *gdk_cairo_region_from_clip       (cairo_t         *cr);
+
+
+G_END_DECLS
+

gdk/gdkcontentserializer.c

@@ -22,7 +22,7 @@
 #include "gdkcontentserializer.h"
 
 #include "gdkcontentformats.h"
-#include "deprecated/gdkpixbuf.h"
+#include "gdkpixbuf.h"
 #include "filetransferportalprivate.h"
 #include "gdktextureprivate.h"
 #include "gdkrgba.h"
@@ -642,9 +642,7 @@ pixbuf_serializer (GdkContentSerializer *serializer)
   else if (G_VALUE_HOLDS (value, GDK_TYPE_TEXTURE))
     {
       GdkTexture *texture = g_value_get_object (value);
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
       pixbuf = gdk_pixbuf_get_from_texture (texture);
-G_GNUC_END_IGNORE_DEPRECATIONS
     }
   else
     {

gdk/gdkdrawcontext.c

@@ -371,12 +371,6 @@ gdk_draw_context_begin_frame_full (GdkDrawContext       *context,
   priv->surface->paint_context = g_object_ref (context);
 
   GDK_DRAW_CONTEXT_GET_CLASS (context)->begin_frame (context, prefers_high_depth, priv->frame_region);
-
-  cairo_region_intersect_rectangle (priv->frame_region,
-                                    &(cairo_rectangle_int_t) {
-                                      0, 0,
-                                      priv->surface->width, priv->surface->height
-                                    });
 }
 
 #ifdef HAVE_SYSPROF

gdk/gdkenums.h

@@ -30,8 +30,6 @@
 
 #include <glib.h>
 
-#include <gdk/version/gdkversionmacros.h>
-
 G_BEGIN_DECLS
 
 /**
@@ -308,20 +306,6 @@ typedef enum
  *   the alpha value. Since: 4.6
  * @GDK_MEMORY_R32G32B32A32_FLOAT: 4 float values; for red, green, blue and
  *   alpha. Since: 4.6
-  * @GDK_MEMORY_G8A8_PREMULTIPLIED: 2 bytes; for grayscale, alpha. The color
- *   values are premultiplied with the alpha value. Since: 4.12
- * @GDK_MEMORY_G8A8: 2 bytes; for grayscale, alpha. Since: 4.12
- * @GDK_MEMORY_G8: One byte; for grayscale. The data is opaque.
- *   Since: 4.12
- * @GDK_MEMORY_G16A16_PREMULTIPLIED: 2 guint16 values; for grayscale, alpha.
- *  The color values are premultiplied with the alpha value. Since: 4.12
- * @GDK_MEMORY_G16A16: 2 guint16 values; for grayscale, alpha. Since: 4.12
- * @GDK_MEMORY_G16: One guint16 value; for grayscale. The data is opaque.
- *   Since: 4.12
- * @GDK_MEMORY_A8: One byte; for alpha.
- *   Since: 4.12
- * @GDK_MEMORY_A16: One guint16 value; for alpha.
- *   Since: 4.12
  * @GDK_MEMORY_N_FORMATS: The number of formats. This value will change as
  *   more formats get added, so do not rely on its concrete integer.
  *
@@ -356,14 +340,6 @@ typedef enum {
   GDK_MEMORY_R32G32B32_FLOAT,
   GDK_MEMORY_R32G32B32A32_FLOAT_PREMULTIPLIED,
   GDK_MEMORY_R32G32B32A32_FLOAT,
-  GDK_MEMORY_G8A8_PREMULTIPLIED GDK_AVAILABLE_ENUMERATOR_IN_4_12,
-  GDK_MEMORY_G8A8 GDK_AVAILABLE_ENUMERATOR_IN_4_12,
-  GDK_MEMORY_G8 GDK_AVAILABLE_ENUMERATOR_IN_4_12,
-  GDK_MEMORY_G16A16_PREMULTIPLIED GDK_AVAILABLE_ENUMERATOR_IN_4_12,
-  GDK_MEMORY_G16A16 GDK_AVAILABLE_ENUMERATOR_IN_4_12,
-  GDK_MEMORY_G16 GDK_AVAILABLE_ENUMERATOR_IN_4_12,
-  GDK_MEMORY_A8 GDK_AVAILABLE_ENUMERATOR_IN_4_12,
-  GDK_MEMORY_A16 GDK_AVAILABLE_ENUMERATOR_IN_4_12,
 
   GDK_MEMORY_N_FORMATS
 } GdkMemoryFormat;

gdk/gdkglcontext.c

@@ -173,8 +173,12 @@ static GPrivate thread_current_context = G_PRIVATE_INIT (unref_unmasked);
 static void
 gdk_gl_context_clear_old_updated_area (GdkGLContext *context)
 {
-  for (unsigned int i = 0; i < GDK_GL_MAX_TRACKED_BUFFERS; i++)
-    g_clear_pointer (&context->old_updated_area[i], cairo_region_destroy);
+  int i;
+
+  for (i = 0; i < 2; i++)
+    {
+      g_clear_pointer (&context->old_updated_area[i], cairo_region_destroy);
+    }
 }
 
 static void
@@ -462,26 +466,29 @@ gdk_gl_context_real_get_damage (GdkGLContext *context)
       eglQuerySurface (gdk_display_get_egl_display (display), egl_surface,
                        EGL_BUFFER_AGE_EXT, &buffer_age);
 
-      if (buffer_age > 0 && buffer_age <= GDK_GL_MAX_TRACKED_BUFFERS)
+      switch (buffer_age)
         {
-          cairo_region_t *damage = cairo_region_create ();
-          int i;
+          case 1:
+            return cairo_region_create ();
+            break;
 
-          for (i = 0; i < buffer_age - 1; i++)
-            {
-              if (context->old_updated_area[i] == NULL)
-                {
-                  cairo_region_create_rectangle (&(GdkRectangle) {
-                                                     0, 0,
-                                                     gdk_surface_get_width (surface),
-                                                     gdk_surface_get_height (surface)
-                                                 });
-                  break;
-                }
-              cairo_region_union (damage, context->old_updated_area[i]);
-            }
+          case 2:
+            if (context->old_updated_area[0])
+              return cairo_region_copy (context->old_updated_area[0]);
+            break;
 
-          return damage;
+          case 3:
+            if (context->old_updated_area[0] &&
+                context->old_updated_area[1])
+              {
+                cairo_region_t *damage = cairo_region_copy (context->old_updated_area[0]);
+                cairo_region_union (damage, context->old_updated_area[1]);
+                return damage;
+              }
+            break;
+
+          default:
+            ;
         }
     }
 #endif
@@ -590,7 +597,6 @@ gdk_gl_context_real_begin_frame (GdkDrawContext *draw_context,
   cairo_region_t *damage;
   double scale;
   int ww, wh;
-  int i;
 
   surface = gdk_draw_context_get_surface (draw_context);
   scale = gdk_gl_context_get_scale (context);
@@ -602,11 +608,9 @@ gdk_gl_context_real_begin_frame (GdkDrawContext *draw_context,
 
   damage = GDK_GL_CONTEXT_GET_CLASS (context)->get_damage (context);
 
-  g_clear_pointer (&context->old_updated_area[GDK_GL_MAX_TRACKED_BUFFERS - 1], cairo_region_destroy);
-  for (i = GDK_GL_MAX_TRACKED_BUFFERS - 1; i > 0; i--)
-    {
-      context->old_updated_area[i] = context->old_updated_area[i - 1];
-    }
+  if (context->old_updated_area[1])
+    cairo_region_destroy (context->old_updated_area[1]);
+  context->old_updated_area[1] = context->old_updated_area[0];
   context->old_updated_area[0] = cairo_region_copy (region);
 
   cairo_region_union (region, damage);

gdk/gdkglcontextprivate.h

@@ -34,11 +34,6 @@ typedef enum {
   GDK_GL_CGL
 } GdkGLBackend;
 
-/* The maximum amount of buffers we track update regions for.
- * Note that this is equal to the max buffer age value we
- * can provide a damage region for */
-#define GDK_GL_MAX_TRACKED_BUFFERS 4
-
 #define GDK_GL_CONTEXT_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_GL_CONTEXT, GdkGLContextClass))
 #define GDK_IS_GL_CONTEXT_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_GL_CONTEXT))
 #define GDK_GL_CONTEXT_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_GL_CONTEXT, GdkGLContextClass))
@@ -50,7 +45,7 @@ struct _GdkGLContext
   GdkDrawContext parent_instance;
 
   /* We store the old drawn areas to support buffer-age optimizations */
-  cairo_region_t *old_updated_area[GDK_GL_MAX_TRACKED_BUFFERS];
+  cairo_region_t *old_updated_area[2];
 };
 
 struct _GdkGLContextClass

gdk/gdkgltexture.c

@@ -138,7 +138,6 @@ static gboolean
 gdk_gl_texture_find_format (gboolean         use_es,
                             guint            gl_major,
                             guint            gl_minor,
-                            GdkMemoryAlpha   alpha,
                             GLint            gl_format,
                             GLint            gl_type,
                             GdkMemoryFormat *out_format)
@@ -148,12 +147,8 @@ gdk_gl_texture_find_format (gboolean         use_es,
   for (format = 0; format < GDK_MEMORY_N_FORMATS; format++)
     {
       GLenum q_internal_format, q_format, q_type;
-      GLint q_swizzle[4];
 
-      if (gdk_memory_format_alpha (format) != alpha)
-        continue;
-
-      if (!gdk_memory_format_gl_format (format, use_es, gl_major, gl_minor, &q_internal_format, &q_format, &q_type, &q_swizzle))
+      if (!gdk_memory_format_gl_format (format, use_es, gl_major, gl_minor, &q_internal_format, &q_format, &q_type))
         continue;
 
       if (q_format != gl_format || q_type != gl_type)
@@ -172,57 +167,23 @@ gdk_gl_texture_do_download (GdkGLTexture *self,
                             gpointer      download_)
 {
   GdkTexture *texture = GDK_TEXTURE (self);
-  GdkMemoryFormat format;
   gsize expected_stride;
   Download *download = download_;
   GLenum gl_internal_format, gl_format, gl_type;
-  GLint gl_swizzle[4];
   int major, minor;
 
-  format = gdk_texture_get_format (texture),
   expected_stride = texture->width * gdk_memory_format_bytes_per_pixel (download->format);
   gdk_gl_context_get_version (context, &major, &minor);
 
-  if (!gdk_gl_context_get_use_es (context) &&
-      gdk_memory_format_gl_format (format,
-                                   FALSE,
-                                   major, minor,
-                                   &gl_internal_format,
-                                   &gl_format, &gl_type, &gl_swizzle))
+  if (download->stride == expected_stride &&
+      !gdk_gl_context_get_use_es (context) &&
+      gdk_memory_format_gl_format (download->format, TRUE, major, minor, &gl_internal_format, &gl_format, &gl_type))
     {
-      if (download->stride == expected_stride &&
-          download->format == format)
-        {
-          glGetTexImage (GL_TEXTURE_2D,
-                         0,
-                         gl_format,
-                         gl_type,
-                         download->data);
-        }
-      else
-        {
-          gsize stride = texture->width * gdk_memory_format_bytes_per_pixel (format);
-          guchar *pixels = g_malloc_n (stride, texture->height);
-
-          glPixelStorei (GL_PACK_ALIGNMENT, 1);
-          glGetTexImage (GL_TEXTURE_2D,
-                         0,
-                         gl_format,
-                         gl_type,
-                         pixels);
-
-          gdk_memory_convert (download->data,
-                              download->stride,
-                              download->format,
-                              pixels,
-                              stride,
-                              format,
-                              texture->width,
-                              texture->height);
-
-          g_free (pixels);
-
-        }
+      glGetTexImage (GL_TEXTURE_2D,
+                     0,
+                     gl_format,
+                     gl_type,
+                     download->data);
     }
   else
     {
@@ -235,26 +196,17 @@ gdk_gl_texture_do_download (GdkGLTexture *self,
       glFramebufferTexture2D (GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, self->id, 0);
       if (gdk_gl_context_check_version (context, "4.3", "3.1"))
         {
+          gdk_gl_context_get_version (context, &major, &minor);
           glGetFramebufferParameteriv (GL_FRAMEBUFFER, GL_IMPLEMENTATION_COLOR_READ_FORMAT, &gl_read_format);
           glGetFramebufferParameteriv (GL_FRAMEBUFFER, GL_IMPLEMENTATION_COLOR_READ_TYPE, &gl_read_type);
-          if (!gdk_gl_texture_find_format (TRUE, major, minor, gdk_memory_format_alpha (format), gl_read_format, gl_read_type, &actual_format))
-            {
-              gl_read_format = GL_RGBA;
-              gl_read_type = GL_UNSIGNED_BYTE;
-              if (gdk_memory_format_alpha (format) == GDK_MEMORY_ALPHA_PREMULTIPLIED)
-                actual_format = GDK_MEMORY_R8G8B8A8_PREMULTIPLIED; /* pray */
-              else
-                actual_format = GDK_MEMORY_R8G8B8A8;
-            }
+          if (!gdk_gl_texture_find_format (gdk_gl_context_get_use_es (context), major, minor, gl_read_format, gl_read_type, &actual_format))
+            actual_format = GDK_MEMORY_R8G8B8A8_PREMULTIPLIED; /* pray */
         }
       else
         {
           gl_read_format = GL_RGBA;
           gl_read_type = GL_UNSIGNED_BYTE;
-          if (gdk_memory_format_alpha (format) == GDK_MEMORY_ALPHA_PREMULTIPLIED)
-            actual_format = GDK_MEMORY_R8G8B8A8_PREMULTIPLIED; /* pray */
-          else
-            actual_format = GDK_MEMORY_R8G8B8A8;
+          actual_format = GDK_MEMORY_R8G8B8A8_PREMULTIPLIED;
         }
 
       if (download->format == actual_format &&
@@ -269,95 +221,19 @@ gdk_gl_texture_do_download (GdkGLTexture *self,
       else
         {
           gsize actual_bpp = gdk_memory_format_bytes_per_pixel (actual_format);
-          gsize stride = actual_bpp * texture->width;
-          guchar *pixels = g_malloc_n (stride, texture->height);
+          guchar *pixels = g_malloc_n (texture->width * actual_bpp, texture->height);
 
-          glPixelStorei (GL_PACK_ALIGNMENT, 1);
           glReadPixels (0, 0,
                         texture->width, texture->height,
                         gl_read_format,
                         gl_read_type,
                         pixels);
 
-          /* Fix up gles inadequacies */
-
-          if (gl_read_format == GL_RGBA &&
-              gl_read_type == GL_UNSIGNED_BYTE &&
-              (format == GDK_MEMORY_G8A8 ||
-               format == GDK_MEMORY_G8A8_PREMULTIPLIED ||
-               format == GDK_MEMORY_G8 ||
-               format == GDK_MEMORY_A8))
-            {
-              for (unsigned int y = 0; y < texture->height; y++)
-                {
-                  for (unsigned int x = 0; x < texture->width; x++)
-                    {
-                      guchar *data = &pixels[y * stride + x * actual_bpp];
-                      if (format == GDK_MEMORY_G8A8 ||
-                          format == GDK_MEMORY_G8A8_PREMULTIPLIED)
-                        {
-                          data[3] = data[1];
-                          data[1] = data[0];
-                          data[2] = data[0];
-                        }
-                      else if (format == GDK_MEMORY_G8)
-                        {
-                          data[1] = data[0];
-                          data[2] = data[0];
-                          data[3] = 0xff;
-                        }
-                      else if (format == GDK_MEMORY_A8)
-                        {
-                          data[3] = data[0];
-                          data[0] = 0;
-                          data[1] = 0;
-                          data[2] = 0;
-                        }
-                    }
-                }
-            }
-
-          if (gl_read_format == GL_RGBA &&
-              gl_read_type == GL_UNSIGNED_SHORT &&
-              (format == GDK_MEMORY_G16A16 ||
-               format == GDK_MEMORY_G16A16_PREMULTIPLIED ||
-               format == GDK_MEMORY_G16 ||
-               format == GDK_MEMORY_A16))
-            {
-              for (unsigned int y = 0; y < texture->height; y++)
-                {
-                  for (unsigned int x = 0; x < texture->width; x++)
-                    {
-                      guint16 *data = (guint16 *) &pixels[y * stride + x * actual_bpp];
-                      if (format == GDK_MEMORY_G16A16 ||
-                          format == GDK_MEMORY_G16A16_PREMULTIPLIED)
-                        {
-                          data[3] = data[1];
-                          data[1] = data[0];
-                          data[2] = data[0];
-                        }
-                      else if (format == GDK_MEMORY_G16)
-                        {
-                          data[1] = data[0];
-                          data[2] = data[0];
-                          data[3] = 0xffff;
-                        }
-                      else if (format == GDK_MEMORY_A16)
-                        {
-                          data[3] = data[0];
-                          data[0] = 0;
-                          data[1] = 0;
-                          data[2] = 0;
-                        }
-                    }
-                }
-            }
-
           gdk_memory_convert (download->data,
                               download->stride,
                               download->format,
                               pixels,
-                              stride,
+                              texture->width * actual_bpp,
                               actual_format,
                               texture->width,
                               texture->height);

gdk/gdkgltexturebuilder.c

@@ -644,18 +644,10 @@ gdk_gl_texture_builder_get_format (GdkGLTextureBuilder *self)
  * The format is the preferred format the texture data should be downloaded to. The
  * format must be supported by the GL version of [property@Gdk.GLTextureBuilder:context].
  *
- * GDK's texture download code assumes that the format corresponds to the storage
- * parameters of the GL texture in an obvious way. For example, a format of
- * `GDK_MEMORY_R16G16B16A16_PREMULTIPLIED` is expected to be stored as `GL_RGBA16`
- * texture, and `GDK_MEMORY_G8A8` is expected to be stored as `GL_RG8` texture.
- *
  * Setting the right format is particularly useful when using high bit depth textures
  * to preserve the bit depth, to set the correct value for unpremultiplied textures
  * and to make sure opaque textures are treated as such.
  *
- * Non-RGBA textures need to have swizzling parameters set up properly to be usable
- * in GSK's shaders.
- *
  * Since: 4.12
  */
 void

gdk/gdkmemoryformat.c

@@ -60,36 +60,6 @@ name ## _from_float (guchar      *dest_data, \
     } \
 }
 
-#define TYPED_GRAY_FUNCS(name, T, G, A, bpp, scale) \
-static void \
-name ## _to_float (float        *dest, \
-                   const guchar *src_data, \
-                   gsize         n) \
-{ \
-  for (gsize i = 0; i < n; i++) \
-    { \
-      T *src = (T *) (src_data + i * bpp); \
-      if (G >= 0) dest[0] = (float) src[G] / scale; else dest[0] = 1.0; \
-      dest[1] = dest[2] = dest[0]; \
-      if (A >= 0) dest[3] = (float) src[A] / scale; else dest[3] = 1.0; \
-      dest += 4; \
-    } \
-} \
-\
-static void \
-name ## _from_float (guchar      *dest_data, \
-                     const float *src, \
-                     gsize        n) \
-{ \
-  for (gsize i = 0; i < n; i++) \
-    { \
-      T *dest = (T *) (dest_data + i * bpp); \
-      if (G >= 0) dest[G] = CLAMP ((src[0] + src[1] + src[2]) * scale / 3.f + 0.5, 0, scale); \
-      if (A >= 0) dest[A] = CLAMP (src[3] * scale + 0.5, 0, scale); \
-      src += 4; \
-    } \
-}
-
 TYPED_FUNCS (b8g8r8a8_premultiplied, guchar, 2, 1, 0, 3, 4, 255)
 TYPED_FUNCS (a8r8g8b8_premultiplied, guchar, 1, 2, 3, 0, 4, 255)
 TYPED_FUNCS (r8g8b8a8_premultiplied, guchar, 0, 1, 2, 3, 4, 255)
@@ -102,15 +72,6 @@ TYPED_FUNCS (b8g8r8, guchar, 2, 1, 0, -1, 3, 255)
 TYPED_FUNCS (r16g16b16, guint16, 0, 1, 2, -1, 6, 65535)
 TYPED_FUNCS (r16g16b16a16, guint16, 0, 1, 2, 3, 8, 65535)
 
-TYPED_GRAY_FUNCS (g8a8_premultiplied, guchar, 0, 1, 2, 255)
-TYPED_GRAY_FUNCS (g8a8, guchar, 0, 1, 2, 255)
-TYPED_GRAY_FUNCS (g8, guchar, 0, -1, 1, 255)
-TYPED_GRAY_FUNCS (a8, guchar, -1, 0, 1, 255)
-TYPED_GRAY_FUNCS (g16a16_premultiplied, guint16, 0, 1, 4, 65535)
-TYPED_GRAY_FUNCS (g16a16, guint16, 0, 1, 4, 65535)
-TYPED_GRAY_FUNCS (g16, guint16, 0, -1, 2, 65535)
-TYPED_GRAY_FUNCS (a16, guint16, -1, 0, 2, 65535)
-
 static void
 r16g16b16_float_to_float (float        *dest,
                           const guchar *src_data,
@@ -269,7 +230,6 @@ struct _GdkMemoryFormatDescription
     guint internal_format;
     guint format;
     guint type;
-    GLint swizzle[4];
   } gl;
   /* no premultiplication going on here */
   void (* to_float) (float *, const guchar*, gsize);
@@ -291,7 +251,7 @@ static const GdkMemoryFormatDescription memory_formats[GDK_MEMORY_N_FORMATS] = {
     G_ALIGNOF (guchar),
     FALSE,
     { 0, 0, G_MAXUINT, G_MAXUINT },
-    { GL_RGBA8, GL_BGRA, GL_UNSIGNED_BYTE, { GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA } },
+    { GL_RGBA8, GL_BGRA, GL_UNSIGNED_BYTE },
     b8g8r8a8_premultiplied_to_float,
     b8g8r8a8_premultiplied_from_float,
   },
@@ -301,7 +261,7 @@ static const GdkMemoryFormatDescription memory_formats[GDK_MEMORY_N_FORMATS] = {
     G_ALIGNOF (guchar),
     FALSE,
     { 0, 0, G_MAXUINT, G_MAXUINT },
-    { GL_RGBA8, GL_BGRA, GDK_GL_UNSIGNED_BYTE_FLIPPED, { GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA } },
+    { GL_RGBA8, GL_BGRA, GDK_GL_UNSIGNED_BYTE_FLIPPED },
     a8r8g8b8_premultiplied_to_float,
     a8r8g8b8_premultiplied_from_float,
   },
@@ -311,7 +271,7 @@ static const GdkMemoryFormatDescription memory_formats[GDK_MEMORY_N_FORMATS] = {
     G_ALIGNOF (guchar),
     FALSE,
     { 0, 0, 0, 0 },
-    { GL_RGBA8, GL_RGBA, GL_UNSIGNED_BYTE, { GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA } },
+    { GL_RGBA8, GL_RGBA, GL_UNSIGNED_BYTE },
     r8g8b8a8_premultiplied_to_float,
     r8g8b8a8_premultiplied_from_float,
   },
@@ -321,7 +281,7 @@ static const GdkMemoryFormatDescription memory_formats[GDK_MEMORY_N_FORMATS] = {
     G_ALIGNOF (guchar),
     FALSE,
     { 0, 0, G_MAXUINT, G_MAXUINT },
-    { GL_RGBA8, GL_BGRA, GL_UNSIGNED_BYTE, { GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA } },
+    { GL_RGBA8, GL_BGRA, GL_UNSIGNED_BYTE },
     b8g8r8a8_to_float,
     b8g8r8a8_from_float,
   },
@@ -331,7 +291,7 @@ static const GdkMemoryFormatDescription memory_formats[GDK_MEMORY_N_FORMATS] = {
     G_ALIGNOF (guchar),
     FALSE,
     { 0, 0, G_MAXUINT, G_MAXUINT },
-    { GL_RGBA8, GL_RGBA, GDK_GL_UNSIGNED_BYTE_FLIPPED, { GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA } },
+    { GL_RGBA8, GL_RGBA, GDK_GL_UNSIGNED_BYTE_FLIPPED },
     a8r8g8b8_to_float,
     a8r8g8b8_from_float,
   },
@@ -341,7 +301,7 @@ static const GdkMemoryFormatDescription memory_formats[GDK_MEMORY_N_FORMATS] = {
     G_ALIGNOF (guchar),
     FALSE,
     { 0, 0, 0, 0 },
-    { GL_RGBA8, GL_RGBA, GL_UNSIGNED_BYTE, { GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA } },
+    { GL_RGBA8, GL_RGBA, GL_UNSIGNED_BYTE },
     r8g8b8a8_to_float,
     r8g8b8a8_from_float,
   },
@@ -351,7 +311,7 @@ static const GdkMemoryFormatDescription memory_formats[GDK_MEMORY_N_FORMATS] = {
     G_ALIGNOF (guchar),
     FALSE,
     { 0, 0, G_MAXUINT, G_MAXUINT },
-    { GL_RGBA8, GL_BGRA, GDK_GL_UNSIGNED_BYTE_FLIPPED, { GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA } },
+    { GL_RGBA8, GL_BGRA, GDK_GL_UNSIGNED_BYTE_FLIPPED },
     a8b8g8r8_to_float,
     a8b8g8r8_from_float,
   },
@@ -361,7 +321,7 @@ static const GdkMemoryFormatDescription memory_formats[GDK_MEMORY_N_FORMATS] = {
     G_ALIGNOF (guchar),
     FALSE,
     { 0, 0, 0, 0 },
-    { GL_RGB8, GL_RGB, GL_UNSIGNED_BYTE, { GL_RED, GL_GREEN, GL_BLUE, GL_ONE } },
+    { GL_RGB8, GL_RGB, GL_UNSIGNED_BYTE },
     r8g8b8_to_float,
     r8g8b8_from_float,
   },
@@ -371,7 +331,7 @@ static const GdkMemoryFormatDescription memory_formats[GDK_MEMORY_N_FORMATS] = {
     G_ALIGNOF (guchar),
     FALSE,
     { 0, 0, G_MAXUINT, G_MAXUINT },
-    { GL_RGB8, GL_BGR, GL_UNSIGNED_BYTE, { GL_RED, GL_GREEN, GL_BLUE, GL_ONE } },
+    { GL_RGB8, GL_BGR, GL_UNSIGNED_BYTE },
     b8g8r8_to_float,
     b8g8r8_from_float,
   },
@@ -381,7 +341,7 @@ static const GdkMemoryFormatDescription memory_formats[GDK_MEMORY_N_FORMATS] = {
     G_ALIGNOF (guint16),
     TRUE,
     { 0, 0, 3, 0 },
-    { GL_RGB16, GL_RGB, GL_UNSIGNED_SHORT, { GL_RED, GL_GREEN, GL_BLUE, GL_ONE } },
+    { GL_RGB16, GL_RGB, GL_UNSIGNED_SHORT },
     r16g16b16_to_float,
     r16g16b16_from_float,
   },
@@ -391,7 +351,7 @@ static const GdkMemoryFormatDescription memory_formats[GDK_MEMORY_N_FORMATS] = {
     G_ALIGNOF (guint16),
     TRUE,
     { 0, 0, 3, 0 },
-    { GL_RGBA16, GL_RGBA, GL_UNSIGNED_SHORT, { GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA } },
+    { GL_RGBA16, GL_RGBA, GL_UNSIGNED_SHORT },
     r16g16b16a16_to_float,
     r16g16b16a16_from_float,
   },
@@ -401,7 +361,7 @@ static const GdkMemoryFormatDescription memory_formats[GDK_MEMORY_N_FORMATS] = {
     G_ALIGNOF (guint16),
     TRUE,
     { 0, 0, 3, 0 },
-    { GL_RGBA16, GL_RGBA, GL_UNSIGNED_SHORT, { GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA } },
+    { GL_RGBA16, GL_RGBA, GL_UNSIGNED_SHORT },
     r16g16b16a16_to_float,
     r16g16b16a16_from_float,
   },
@@ -411,7 +371,7 @@ static const GdkMemoryFormatDescription memory_formats[GDK_MEMORY_N_FORMATS] = {
     G_ALIGNOF (guint16),
     TRUE,
     { 0, 0, 3, 0 },
-    { GL_RGB16F, GL_RGB, GL_HALF_FLOAT, { GL_RED, GL_GREEN, GL_BLUE, GL_ONE } },
+    { GL_RGB16F, GL_RGB, GL_HALF_FLOAT },
     r16g16b16_float_to_float,
     r16g16b16_float_from_float,
   },
@@ -421,7 +381,7 @@ static const GdkMemoryFormatDescription memory_formats[GDK_MEMORY_N_FORMATS] = {
     G_ALIGNOF (guint16),
     TRUE,
     { 0, 0, 3, 0 },
-    { GL_RGBA16F, GL_RGBA, GL_HALF_FLOAT, { GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA } },
+    { GL_RGBA16F, GL_RGBA, GL_HALF_FLOAT },
     r16g16b16a16_float_to_float,
     r16g16b16a16_float_from_float,
   },
@@ -431,7 +391,7 @@ static const GdkMemoryFormatDescription memory_formats[GDK_MEMORY_N_FORMATS] = {
     G_ALIGNOF (guint16),
     TRUE,
     { 0, 0, 3, 0 },
-    { GL_RGBA16F, GL_RGBA, GL_HALF_FLOAT, { GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA } },
+    { GL_RGBA16F, GL_RGBA, GL_HALF_FLOAT },
     r16g16b16a16_float_to_float,
     r16g16b16a16_float_from_float,
   },
@@ -441,7 +401,7 @@ static const GdkMemoryFormatDescription memory_formats[GDK_MEMORY_N_FORMATS] = {
     G_ALIGNOF (float),
     TRUE,
     { 0, 0, 3, 0 },
-    { GL_RGB32F, GL_RGB, GL_FLOAT, { GL_RED, GL_GREEN, GL_BLUE, GL_ONE } },
+    { GL_RGB32F, GL_RGB, GL_FLOAT },
     r32g32b32_float_to_float,
     r32g32b32_float_from_float,
   },
@@ -451,7 +411,7 @@ static const GdkMemoryFormatDescription memory_formats[GDK_MEMORY_N_FORMATS] = {
     G_ALIGNOF (float),
     TRUE,
     { 0, 0, 3, 0 },
-    { GL_RGBA32F, GL_RGBA, GL_FLOAT, { GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA } },
+    { GL_RGBA32F, GL_RGBA, GL_FLOAT },
     r32g32b32a32_float_to_float,
     r32g32b32a32_float_from_float,
   },
@@ -461,89 +421,9 @@ static const GdkMemoryFormatDescription memory_formats[GDK_MEMORY_N_FORMATS] = {
     G_ALIGNOF (float),
     TRUE,
     { 0, 0, 3, 0 },
-    { GL_RGBA32F, GL_RGBA, GL_FLOAT, { GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA } },
+    { GL_RGBA32F, GL_RGBA, GL_FLOAT },
     r32g32b32a32_float_to_float,
     r32g32b32a32_float_from_float,
-  },
-  [GDK_MEMORY_G8A8_PREMULTIPLIED] = {
-    GDK_MEMORY_ALPHA_PREMULTIPLIED,
-    2,
-    G_ALIGNOF (guchar),
-    FALSE,
-    { 0, 0, 3, 0 },
-    { GL_RG8, GL_RG, GL_UNSIGNED_BYTE, { GL_RED, GL_RED, GL_RED, GL_GREEN } },
-    g8a8_premultiplied_to_float,
-    g8a8_premultiplied_from_float,
-  },
-  [GDK_MEMORY_G8A8] = {
-    GDK_MEMORY_ALPHA_STRAIGHT,
-    2,
-    G_ALIGNOF (guchar),
-    FALSE,
-    { 0, 0, 3, 0 },
-    { GL_RG8, GL_RG, GL_UNSIGNED_BYTE, { GL_RED, GL_RED, GL_RED, GL_GREEN } },
-    g8a8_to_float,
-    g8a8_from_float,
-  },
-  [GDK_MEMORY_G8] = {
-    GDK_MEMORY_ALPHA_OPAQUE,
-    1,
-    G_ALIGNOF (guchar),
-    FALSE,
-    { 0, 0, 3, 0 },
-    { GL_R8, GL_RED, GL_UNSIGNED_BYTE, { GL_RED, GL_RED, GL_RED, GL_ONE } },
-    g8_to_float,
-    g8_from_float,
-  },
-  [GDK_MEMORY_G16A16_PREMULTIPLIED] = {
-    GDK_MEMORY_ALPHA_PREMULTIPLIED,
-    4,
-    G_ALIGNOF (guint16),
-    TRUE,
-    { 0, 0, 3, 0 },
-    { GL_RG16, GL_RG, GL_UNSIGNED_SHORT, { GL_RED, GL_RED, GL_RED, GL_GREEN } },
-    g16a16_premultiplied_to_float,
-    g16a16_premultiplied_from_float,
-  },
-  [GDK_MEMORY_G16A16] = {
-    GDK_MEMORY_ALPHA_STRAIGHT,
-    4,
-    G_ALIGNOF (guint16),
-    TRUE,
-    { 0, 0, 3, 0 },
-    { GL_RG16, GL_RG, GL_UNSIGNED_SHORT, { GL_RED, GL_RED, GL_RED, GL_GREEN } },
-    g16a16_to_float,
-    g16a16_from_float,
-  },
-  [GDK_MEMORY_G16] = {
-    GDK_MEMORY_ALPHA_OPAQUE,
-    2,
-    G_ALIGNOF (guint16),
-    TRUE,
-    { 0, 0, 3, 0 },
-    { GL_R16, GL_RED, GL_UNSIGNED_SHORT, { GL_RED, GL_RED, GL_RED, GL_ONE } },
-    g16_to_float,
-    g16_from_float,
-  },
-  [GDK_MEMORY_A8] = {
-    GDK_MEMORY_ALPHA_STRAIGHT,
-    1,
-    G_ALIGNOF (guchar),
-    FALSE,
-    { 0, 0, 3, 0 },
-    { GL_R8, GL_RED, GL_UNSIGNED_BYTE, { GL_ONE, GL_ONE, GL_ONE, GL_RED } },
-    a8_to_float,
-    a8_from_float,
-  },
-  [GDK_MEMORY_A16] = {
-    GDK_MEMORY_ALPHA_STRAIGHT,
-    2,
-    G_ALIGNOF (guint16),
-    TRUE,
-    { 0, 0, 3, 0 },
-    { GL_R16, GL_RED, GL_UNSIGNED_SHORT, { GL_ONE, GL_ONE, GL_ONE, GL_RED } },
-    a16_to_float,
-    a16_from_float,
   }
 };
 
@@ -592,13 +472,14 @@ gdk_memory_format_gl_format (GdkMemoryFormat  format,
                              guint            gl_minor,
                              guint           *out_internal_format,
                              guint           *out_format,
-                             guint           *out_type,
-                             GLint          (*out_swizzle)[4])
+                             guint           *out_type)
 {
   *out_internal_format = memory_formats[format].gl.internal_format;
   *out_format = memory_formats[format].gl.format;
   *out_type = memory_formats[format].gl.type;
-  memcpy (out_swizzle, &memory_formats[format].gl.swizzle, sizeof(GLint) * 4);
+
+  if (memory_formats[format].alpha == GDK_MEMORY_ALPHA_STRAIGHT)
+    return FALSE;
 
   if (gles)
     {

gdk/gdkmemoryformatprivate.h

@@ -21,8 +21,6 @@
 
 #include "gdkenums.h"
 
-#include <epoxy/gl.h>
-
 G_BEGIN_DECLS
 
 typedef enum {
@@ -41,8 +39,7 @@ gboolean                gdk_memory_format_gl_format         (GdkMemoryFormat
                                                              guint                       gl_minor,
                                                              guint                      *out_internal_format,
                                                              guint                      *out_format,
-                                                             guint                      *out_type,
-                                                             GLint                     (*out_gizzle)[4]);
+                                                             guint                      *out_type);
 
 void                    gdk_memory_convert                  (guchar                     *dest_data,
                                                              gsize                       dest_stride,

gdk/gdkpixbuf.c

@@ -157,9 +157,6 @@ convert_no_alpha (guchar *dest_data,
  *
  * Returns: (nullable) (transfer full): A newly-created pixbuf with a
  *   reference count of 1
- *
- * Deprecated: 4.12: Use [class@Gdk.Texture] and subclasses instead
- *   cairo surfaces and pixbufs
  */
 GdkPixbuf *
 gdk_pixbuf_get_from_surface (cairo_surface_t *surface,
@@ -237,9 +234,6 @@ pixbuf_texture_unref_cb (guchar   *pixels,
  * to draw it on screen.
  *
  * Returns: (transfer full) (nullable): a new `GdkPixbuf`
- *
- * Deprecated: 4.12: Use [class@Gdk.Texture] and subclasses instead
- *   cairo surfaces and pixbufs
  */
 GdkPixbuf *
 gdk_pixbuf_get_from_texture (GdkTexture *texture)

gdk/gdkpixbuf.h

@@ -33,13 +33,13 @@
 
 G_BEGIN_DECLS
 
-GDK_DEPRECATED_IN_4_12
+GDK_AVAILABLE_IN_ALL
 GdkPixbuf *gdk_pixbuf_get_from_surface (cairo_surface_t *surface,
                                         int              src_x,
                                         int              src_y,
                                         int              width,
                                         int              height);
-GDK_DEPRECATED_IN_4_12
+GDK_AVAILABLE_IN_ALL
 GdkPixbuf *gdk_pixbuf_get_from_texture (GdkTexture      *texture);
 
 G_END_DECLS

gdk/gdkrgba.c

@@ -170,7 +170,7 @@ parse_rgb_value (const char   *str,
  *
  * The string can be either one of:
  *
- * - A standard name (Taken from the CSS specification).
+ * - A standard name (Taken from the Css specification).
  * - A hexadecimal value in the form “\#rgb”, “\#rrggbb”,
  *   “\#rrrgggbbb” or ”\#rrrrggggbbbb”
  * - A hexadecimal value in the form “\#rgba”, “\#rrggbbaa”,
@@ -178,8 +178,6 @@ parse_rgb_value (const char   *str,
  * - A RGB color in the form “rgb(r,g,b)” (In this case the color
  *   will have full opacity)
  * - A RGBA color in the form “rgba(r,g,b,a)”
- * - A HSL color in the form "hsl(hue, saturation, lightness)"
- * - A HSLA color in the form "hsla(hue, saturation, lightness, alpha)"
  *
  * Where “r”, “g”, “b” and “a” are respectively the red, green,
  * blue and alpha color values. In the last two cases, “r”, “g”,

gdk/gdktexturedownloader.c

@@ -225,17 +225,17 @@ gdk_texture_downloader_download_into (const GdkTextureDownloader *self,
 /**
  * gdk_texture_downloader_download_bytes:
  * @self: the downloader
- * @out_stride: (out): The stride of the resulting data in bytes
+ * @out_stride: (out): The stride of the resulting data in bytes.
  *
  * Downloads the given texture pixels into a `GBytes`. The rowstride will
  * be stored in the stride value.
  *
  * This function will abort if it tries to download a large texture and
- * fails to allocate memory. If you think that may happen, you should handle
- * memory allocation yourself and use [method@Gdk.TextureDownloader.download_into]
- * once allocation succeeded.
+ * fails to allocate memory. If you think that may happen, you should
+ * handle memory allocation yourself and use
+ * gdk_texture_downloader_download_into() once allocation succeeded.
  *
- * Returns: The downloaded pixels
+ * Returns: The downloaded pixels.
  *
  * Since: 4.10
  **/

gdk/gdktoplevel.c

@@ -135,8 +135,7 @@ gdk_toplevel_default_export_handle_finish (GdkToplevel   *toplevel,
 }
 
 static void
-gdk_toplevel_default_unexport_handle (GdkToplevel *toplevel,
-                                      const char  *handle)
+gdk_toplevel_default_unexport_handle (GdkToplevel *toplevel)
 {
 }
 
@@ -792,7 +791,7 @@ gdk_toplevel_export_handle (GdkToplevel         *toplevel,
  * @result: the `GAsyncResult`
  * @error: return location for an error
  *
- * Finishes the [method@Gdk.Toplevel.export_handle] call and
+ * Finishes the [method@Gdk.Toplevel.export_handle] cal and
  * returns the resulting handle.
  *
  * Returns: (nullable) (transfer full): the exported handle,
@@ -811,7 +810,6 @@ gdk_toplevel_export_handle_finish (GdkToplevel   *toplevel,
 /*< private >
  * gdk_toplevel_unexport_handle:
  * @toplevel: a `GdkToplevel`
- * @handle: the handle to unexport
  *
  * Destroys the handle that was obtained with [method@Gdk.Toplevel.export_handle].
  *
@@ -821,8 +819,7 @@ gdk_toplevel_export_handle_finish (GdkToplevel   *toplevel,
  * Since: 4.10
  */
 void
-gdk_toplevel_unexport_handle (GdkToplevel *toplevel,
-                              const char  *handle)
+gdk_toplevel_unexport_handle (GdkToplevel *toplevel)
 {
-  GDK_TOPLEVEL_GET_IFACE (toplevel)->unexport_handle (toplevel, handle);
+  GDK_TOPLEVEL_GET_IFACE (toplevel)->unexport_handle (toplevel);
 }

gdk/gdktoplevelprivate.h

@@ -49,8 +49,7 @@ struct _GdkToplevelInterface
                                             GAsyncResult         *result,
                                             GError              **error);
 
-  void          (* unexport_handle)        (GdkToplevel          *toplevel,
-                                            const char           *handle);
+  void          (* unexport_handle)        (GdkToplevel          *toplevel);
 };
 
 typedef enum
@@ -83,8 +82,7 @@ char *gdk_toplevel_export_handle_finish (GdkToplevel          *toplevel,
                                          GAsyncResult         *result,
                                          GError              **error);
 
-void  gdk_toplevel_unexport_handle      (GdkToplevel          *toplevel,
-                                         const char           *handle);
+void  gdk_toplevel_unexport_handle      (GdkToplevel          *toplevel);
 
 G_END_DECLS
 

gdk/gdkvulkancontext.c

@@ -1053,30 +1053,26 @@ gdk_display_create_vulkan_device (GdkDisplay  *display,
 
               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) {
-                                                    .sType = VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO,
-                                                    .queueCreateInfoCount = 1,
-                                                    .pQueueCreateInfos = &(VkDeviceQueueCreateInfo) {
+                                                    VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO,
+                                                    NULL,
+                                                    0,
+                                                    1,
+                                                    &(VkDeviceQueueCreateInfo) {
                                                         .sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO,
                                                         .queueFamilyIndex = j,
                                                         .queueCount = 1,
                                                         .pQueuePriorities = (float []) { 1.0f },
                                                     },
-                                                    .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,
-                                                    }
+                                                    0,
+                                                    NULL,
+                                                    device_extensions->len,
+                                                    (const char * const *) device_extensions->pdata
                                                 },
                                                 NULL,
                                                 &display->vk_device) != VK_SUCCESS)
@@ -1148,7 +1144,6 @@ 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++)
@@ -1220,7 +1215,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);

gdk/loaders/gdkpng.c

@@ -183,7 +183,8 @@ gdk_load_png (GBytes  *bytes,
   if (color_type == PNG_COLOR_TYPE_PALETTE)
     png_set_palette_to_rgb (png);
 
-  if (color_type == PNG_COLOR_TYPE_GRAY)
+  if (color_type == PNG_COLOR_TYPE_GRAY ||
+      color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
     png_set_expand_gray_1_2_4_to_8 (png);
 
   if (png_get_valid (png, info, PNG_INFO_tRNS))
@@ -192,6 +193,10 @@ gdk_load_png (GBytes  *bytes,
   if (depth < 8)
     png_set_packing (png);
 
+  if (color_type == PNG_COLOR_TYPE_GRAY ||
+      color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
+    png_set_gray_to_rgb (png);
+
   if (interlace != PNG_INTERLACE_NONE)
     png_set_interlace_handling (png);
 
@@ -234,26 +239,6 @@ gdk_load_png (GBytes  *bytes,
           format = GDK_MEMORY_R16G16B16;
         }
       break;
-    case PNG_COLOR_TYPE_GRAY:
-      if (depth == 8)
-        {
-          format = GDK_MEMORY_G8;
-        }
-      else if (depth == 16)
-        {
-          format = GDK_MEMORY_G16;
-        }
-      break;
-    case PNG_COLOR_TYPE_GRAY_ALPHA:
-      if (depth == 8)
-        {
-          format = GDK_MEMORY_G8A8;
-        }
-      else if (depth == 16)
-        {
-          format = GDK_MEMORY_G16A16;
-        }
-      break;
     default:
       png_destroy_read_struct (&png, &info, NULL);
       g_set_error (error,
@@ -364,34 +349,6 @@ gdk_save_png (GdkTexture *texture)
       depth = 16;
       break;
 
-    case GDK_MEMORY_G8:
-      format = GDK_MEMORY_G8;
-      png_format = PNG_COLOR_TYPE_GRAY;
-      depth = 8;
-      break;
-
-    case GDK_MEMORY_G8A8_PREMULTIPLIED:
-    case GDK_MEMORY_G8A8:
-    case GDK_MEMORY_A8:
-      format = GDK_MEMORY_G8A8;
-      png_format = PNG_COLOR_TYPE_GRAY_ALPHA;
-      depth = 8;
-      break;
-
-    case GDK_MEMORY_G16:
-      format = GDK_MEMORY_G16;
-      png_format = PNG_COLOR_TYPE_GRAY;
-      depth = 16;
-      break;
-
-    case GDK_MEMORY_G16A16_PREMULTIPLIED:
-    case GDK_MEMORY_G16A16:
-    case GDK_MEMORY_A16:
-      format = GDK_MEMORY_G16A16;
-      png_format = PNG_COLOR_TYPE_GRAY_ALPHA;
-      depth = 16;
-      break;
-
     case GDK_MEMORY_N_FORMATS:
     default:
       g_assert_not_reached ();

gdk/loaders/gdktiff.c

@@ -229,36 +229,27 @@ struct _FormatData {
   guint16 samples_per_pixel;
   guint16 sample_format;
   guint16 alpha_samples;
-  guint16 photometric;
 };
 
 static const FormatData format_data[] = {
-  [GDK_MEMORY_B8G8R8A8_PREMULTIPLIED]           = { GDK_MEMORY_R8G8B8A8_PREMULTIPLIED,            8, 4, SAMPLEFORMAT_UINT,   EXTRASAMPLE_ASSOCALPHA, PHOTOMETRIC_RGB },
-  [GDK_MEMORY_A8R8G8B8_PREMULTIPLIED]           = { GDK_MEMORY_R8G8B8A8_PREMULTIPLIED,            8, 4, SAMPLEFORMAT_UINT,   EXTRASAMPLE_ASSOCALPHA, PHOTOMETRIC_RGB },
-  [GDK_MEMORY_R8G8B8A8_PREMULTIPLIED]           = { GDK_MEMORY_R8G8B8A8_PREMULTIPLIED,            8, 4, SAMPLEFORMAT_UINT,   EXTRASAMPLE_ASSOCALPHA, PHOTOMETRIC_RGB },
-  [GDK_MEMORY_B8G8R8A8]                         = { GDK_MEMORY_R8G8B8A8,                          8, 4, SAMPLEFORMAT_UINT,   EXTRASAMPLE_UNASSALPHA, PHOTOMETRIC_RGB },
-  [GDK_MEMORY_A8R8G8B8]                         = { GDK_MEMORY_R8G8B8A8,                          8, 4, SAMPLEFORMAT_UINT,   EXTRASAMPLE_UNASSALPHA, PHOTOMETRIC_RGB },
-  [GDK_MEMORY_R8G8B8A8]                         = { GDK_MEMORY_R8G8B8A8,                          8, 4, SAMPLEFORMAT_UINT,   EXTRASAMPLE_UNASSALPHA, PHOTOMETRIC_RGB },
-  [GDK_MEMORY_A8B8G8R8]                         = { GDK_MEMORY_R8G8B8A8,                          8, 4, SAMPLEFORMAT_UINT,   EXTRASAMPLE_UNASSALPHA, PHOTOMETRIC_RGB },
-  [GDK_MEMORY_R8G8B8]                           = { GDK_MEMORY_R8G8B8,                            8, 3, SAMPLEFORMAT_UINT,   0,                      PHOTOMETRIC_RGB },
-  [GDK_MEMORY_B8G8R8]                           = { GDK_MEMORY_R8G8B8,                            8, 3, SAMPLEFORMAT_UINT,   0,                      PHOTOMETRIC_RGB },
-  [GDK_MEMORY_R16G16B16]                        = { GDK_MEMORY_R16G16B16,                        16, 3, SAMPLEFORMAT_UINT,   0,                      PHOTOMETRIC_RGB },
-  [GDK_MEMORY_R16G16B16A16_PREMULTIPLIED]       = { GDK_MEMORY_R16G16B16A16_PREMULTIPLIED,       16, 4, SAMPLEFORMAT_UINT,   EXTRASAMPLE_ASSOCALPHA, PHOTOMETRIC_RGB },
-  [GDK_MEMORY_R16G16B16A16]                     = { GDK_MEMORY_R16G16B16A16,                     16, 4, SAMPLEFORMAT_UINT,   EXTRASAMPLE_UNASSALPHA, PHOTOMETRIC_RGB },
-  [GDK_MEMORY_R16G16B16_FLOAT]                  = { GDK_MEMORY_R16G16B16_FLOAT,                  16, 3, SAMPLEFORMAT_IEEEFP, 0,                      PHOTOMETRIC_RGB },
-  [GDK_MEMORY_R16G16B16A16_FLOAT_PREMULTIPLIED] = { GDK_MEMORY_R16G16B16A16_FLOAT_PREMULTIPLIED, 16, 4, SAMPLEFORMAT_IEEEFP, EXTRASAMPLE_ASSOCALPHA, PHOTOMETRIC_RGB },
-  [GDK_MEMORY_R16G16B16A16_FLOAT]               = { GDK_MEMORY_R16G16B16A16_FLOAT,               16, 4, SAMPLEFORMAT_IEEEFP, EXTRASAMPLE_UNASSALPHA, PHOTOMETRIC_RGB },
-  [GDK_MEMORY_R32G32B32_FLOAT]                  = { GDK_MEMORY_R32G32B32_FLOAT,                  32, 3, SAMPLEFORMAT_IEEEFP, 0,                      PHOTOMETRIC_RGB },
-  [GDK_MEMORY_R32G32B32A32_FLOAT_PREMULTIPLIED] = { GDK_MEMORY_R32G32B32A32_FLOAT_PREMULTIPLIED, 32, 4, SAMPLEFORMAT_IEEEFP, EXTRASAMPLE_ASSOCALPHA, PHOTOMETRIC_RGB },
-  [GDK_MEMORY_R32G32B32A32_FLOAT]               = { GDK_MEMORY_R32G32B32A32_FLOAT,               32, 4, SAMPLEFORMAT_IEEEFP, EXTRASAMPLE_UNASSALPHA, PHOTOMETRIC_RGB },
-  [GDK_MEMORY_G8A8_PREMULTIPLIED]               = { GDK_MEMORY_G8A8_PREMULTIPLIED,                8, 2, SAMPLEFORMAT_UINT,   EXTRASAMPLE_ASSOCALPHA, PHOTOMETRIC_MINISBLACK },
-  [GDK_MEMORY_G8A8]                             = { GDK_MEMORY_G8A8,                              8, 2, SAMPLEFORMAT_UINT,   EXTRASAMPLE_UNASSALPHA, PHOTOMETRIC_MINISBLACK },
-  [GDK_MEMORY_G8]                               = { GDK_MEMORY_G8,                                8, 1, SAMPLEFORMAT_UINT,   0,                      PHOTOMETRIC_MINISBLACK },
-  [GDK_MEMORY_G16A16_PREMULTIPLIED]             = { GDK_MEMORY_G16A16_PREMULTIPLIED,             16, 2, SAMPLEFORMAT_UINT,   EXTRASAMPLE_ASSOCALPHA, PHOTOMETRIC_MINISBLACK },
-  [GDK_MEMORY_G16A16]                           = { GDK_MEMORY_G16A16,                           16, 2, SAMPLEFORMAT_UINT,   EXTRASAMPLE_UNASSALPHA, PHOTOMETRIC_MINISBLACK },
-  [GDK_MEMORY_G16]                              = { GDK_MEMORY_G16,                              16, 1, SAMPLEFORMAT_UINT,   0,                      PHOTOMETRIC_MINISBLACK },
-  [GDK_MEMORY_A8]                               = { GDK_MEMORY_G8A8,                              8, 2, SAMPLEFORMAT_UINT,   EXTRASAMPLE_UNASSALPHA, PHOTOMETRIC_MINISBLACK },
-  [GDK_MEMORY_A16]                              = { GDK_MEMORY_G16A16,                           16, 2, SAMPLEFORMAT_UINT,   EXTRASAMPLE_UNASSALPHA, PHOTOMETRIC_MINISBLACK },
+  [GDK_MEMORY_B8G8R8A8_PREMULTIPLIED]           = { GDK_MEMORY_R8G8B8A8_PREMULTIPLIED,            8, 4, SAMPLEFORMAT_UINT,   EXTRASAMPLE_ASSOCALPHA },
+  [GDK_MEMORY_A8R8G8B8_PREMULTIPLIED]           = { GDK_MEMORY_R8G8B8A8_PREMULTIPLIED,            8, 4, SAMPLEFORMAT_UINT,   EXTRASAMPLE_ASSOCALPHA },
+  [GDK_MEMORY_R8G8B8A8_PREMULTIPLIED]           = { GDK_MEMORY_R8G8B8A8_PREMULTIPLIED,            8, 4, SAMPLEFORMAT_UINT,   EXTRASAMPLE_ASSOCALPHA },
+  [GDK_MEMORY_B8G8R8A8]                         = { GDK_MEMORY_R8G8B8A8,                          8, 4, SAMPLEFORMAT_UINT,   EXTRASAMPLE_UNASSALPHA },
+  [GDK_MEMORY_A8R8G8B8]                         = { GDK_MEMORY_R8G8B8A8,                          8, 4, SAMPLEFORMAT_UINT,   EXTRASAMPLE_UNASSALPHA },
+  [GDK_MEMORY_R8G8B8A8]                         = { GDK_MEMORY_R8G8B8A8,                          8, 4, SAMPLEFORMAT_UINT,   EXTRASAMPLE_UNASSALPHA },
+  [GDK_MEMORY_A8B8G8R8]                         = { GDK_MEMORY_R8G8B8A8,                          8, 4, SAMPLEFORMAT_UINT,   EXTRASAMPLE_UNASSALPHA },
+  [GDK_MEMORY_R8G8B8]                           = { GDK_MEMORY_R8G8B8,                            8, 3, SAMPLEFORMAT_UINT,   0                      },
+  [GDK_MEMORY_B8G8R8]                           = { GDK_MEMORY_R8G8B8,                            8, 3, SAMPLEFORMAT_UINT,   0                      },
+  [GDK_MEMORY_R16G16B16]                        = { GDK_MEMORY_R16G16B16,                        16, 3, SAMPLEFORMAT_UINT,   0                      },
+  [GDK_MEMORY_R16G16B16A16_PREMULTIPLIED]       = { GDK_MEMORY_R16G16B16A16_PREMULTIPLIED,       16, 4, SAMPLEFORMAT_UINT,   EXTRASAMPLE_ASSOCALPHA },
+  [GDK_MEMORY_R16G16B16A16]                     = { GDK_MEMORY_R16G16B16A16,                     16, 4, SAMPLEFORMAT_UINT,   EXTRASAMPLE_UNASSALPHA },
+  [GDK_MEMORY_R16G16B16_FLOAT]                  = { GDK_MEMORY_R16G16B16_FLOAT,                  16, 3, SAMPLEFORMAT_IEEEFP, 0                      },
+  [GDK_MEMORY_R16G16B16A16_FLOAT_PREMULTIPLIED] = { GDK_MEMORY_R16G16B16A16_FLOAT_PREMULTIPLIED, 16, 4, SAMPLEFORMAT_IEEEFP, EXTRASAMPLE_ASSOCALPHA },
+  [GDK_MEMORY_R16G16B16A16_FLOAT]               = { GDK_MEMORY_R16G16B16A16_FLOAT,               16, 4, SAMPLEFORMAT_IEEEFP, EXTRASAMPLE_UNASSALPHA },
+  [GDK_MEMORY_R32G32B32_FLOAT]                  = { GDK_MEMORY_R32G32B32_FLOAT,                  32, 3, SAMPLEFORMAT_IEEEFP, 0                      },
+  [GDK_MEMORY_R32G32B32A32_FLOAT_PREMULTIPLIED] = { GDK_MEMORY_R32G32B32A32_FLOAT_PREMULTIPLIED, 32, 4, SAMPLEFORMAT_IEEEFP, EXTRASAMPLE_ASSOCALPHA },
+  [GDK_MEMORY_R32G32B32A32_FLOAT]               = { GDK_MEMORY_R32G32B32A32_FLOAT,               32, 4, SAMPLEFORMAT_IEEEFP, EXTRASAMPLE_UNASSALPHA },
 };
 
 /* if this fails, somebody forgot to add formats above */
@@ -298,7 +289,7 @@ gdk_save_tiff (GdkTexture *texture)
   if (fdata->alpha_samples)
     TIFFSetField (tif, TIFFTAG_EXTRASAMPLES, 1, &fdata->alpha_samples);
 
-  TIFFSetField (tif, TIFFTAG_PHOTOMETRIC, fdata->photometric);
+  TIFFSetField (tif, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_RGB);
   TIFFSetField (tif, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG);
 
   gdk_texture_downloader_init (&downloader, texture);
@@ -406,7 +397,7 @@ gdk_load_tiff (GBytes  *input_bytes,
   TIFFGetFieldDefaulted (tif, TIFFTAG_IMAGEWIDTH, &width);
   TIFFGetFieldDefaulted (tif, TIFFTAG_IMAGELENGTH, &height);
 
-  if (samples_per_pixel == 2 || samples_per_pixel == 4)
+  if (samples_per_pixel == 4)
     {
       guint16 extra;
       guint16 *extra_types;
@@ -435,15 +426,14 @@ gdk_load_tiff (GBytes  *input_bytes,
       if (format_data[format].sample_format == sample_format &&
           format_data[format].bits_per_sample == bits_per_sample &&
           format_data[format].samples_per_pixel == samples_per_pixel &&
-          format_data[format].alpha_samples == alpha_samples &&
-          format_data[format].photometric == photometric)
+          format_data[format].alpha_samples == alpha_samples)
         {
           break;
         }
     }
 
   if (format == G_N_ELEMENTS(format_data) ||
-      (photometric != PHOTOMETRIC_RGB && photometric != PHOTOMETRIC_MINISBLACK) ||
+      photometric != PHOTOMETRIC_RGB ||
       planarconfig != PLANARCONFIG_CONTIG ||
       TIFFIsTiled (tif) ||
       orientation != ORIENTATION_TOPLEFT)

gdk/macos/gdkmacosglcontext.c

@@ -344,14 +344,14 @@ create_pixel_format (GdkGLVersion  *version,
   if (gdk_gl_version_get_major (version) >= 4)
     {
       attrs[1] = (CGLPixelFormatAttribute)kCGLOGLPVersion_GL4_Core;
-      if (CHECK (error, CGLChoosePixelFormat (attrs, &format, &n_format)))
+      if (CGLChoosePixelFormat (attrs, &format, &n_format))
         return g_steal_pointer (&format);
     }
 
   if (gdk_gl_version_greater_equal (version, &GDK_GL_MIN_GL_VERSION))
     {
       attrs[1] = (CGLPixelFormatAttribute)kCGLOGLPVersion_GL3_Core;
-      if (CHECK (error, CGLChoosePixelFormat (attrs, &format, &n_format)))
+      if (CGLChoosePixelFormat (attrs, &format, &n_format))
         return g_steal_pointer (&format);
     }
 
@@ -396,7 +396,7 @@ gdk_macos_gl_context_real_realize (GdkGLContext  *context,
   gdk_gl_context_get_matching_version (context,
                                        GDK_GL_API_GL,
                                        FALSE,
-                                       &min_version);
+                                       &version);
 
   display = gdk_gl_context_get_display (context);
   shared = gdk_display_get_gl_context (display);

gdk/meson.build

@@ -1,5 +1,3 @@
-subdir('deprecated')
-
 gdk_public_sources = files([
   'gdk.c',
   'gdkapplaunchcontext.c',
@@ -40,6 +38,7 @@ gdk_public_sources = files([
   'gdkmonitor.c',
   'gdkpaintable.c',
   'gdkpango.c',
+  'gdkpixbuf.c',
   'gdkpipeiostream.c',
   'gdkrectangle.c',
   'gdkrgba.c',
@@ -95,6 +94,7 @@ gdk_public_headers = files([
   'gdkmonitor.h',
   'gdkpaintable.h',
   'gdkpango.h',
+  'gdkpixbuf.h',
   'gdkrectangle.h',
   'gdkrgba.h',
   'gdkseat.h',
@@ -112,9 +112,8 @@ gdk_public_headers = files([
   'gdkdragsurface.h',
 ])
 install_headers(gdk_public_headers, subdir: 'gtk-4.0/gdk/')
-install_headers(gdk_deprecated_headers, subdir: 'gtk-4.0/gdk/deprecated')
 
-gdk_sources = gdk_public_sources + gdk_deprecated_sources
+gdk_sources = gdk_public_sources
 
 gdk_private_h_sources = files([
   'gdkeventsprivate.h',

gdk/wayland/cursor/wayland-cursor.c

@@ -207,7 +207,7 @@ wl_cursor_create_from_xcursor_images(struct wl_cursor_theme *theme,
 {
         char *path;
         XcursorImages *images;
-        struct wl_cursor *cursor;
+	struct cursor *cursor;
 	struct cursor_image *image;
 	int i, nbytes;
         unsigned int load_size;
@@ -240,16 +240,17 @@ wl_cursor_create_from_xcursor_images(struct wl_cursor_theme *theme,
 		return NULL;
         }
 
-	cursor->images =
-		malloc(images->nimage * sizeof cursor->images[0]);
-	if (!cursor->images) {
+	cursor->cursor.images =
+		malloc(images->nimage * sizeof cursor->cursor.images[0]);
+	if (!cursor->cursor.images) {
 		free(cursor);
 	        xcursor_images_destroy (images);
 		return NULL;
 	}
 
-	cursor->name = strdup(name);
-        cursor->size = load_size;
+	cursor->cursor.name = strdup(name);
+        cursor->cursor.size = load_size;
+	cursor->total_delay = 0;
 
 	for (i = 0; i < images->nimage; i++) {
 		image = malloc(sizeof *image);
@@ -290,13 +291,14 @@ wl_cursor_create_from_xcursor_images(struct wl_cursor_theme *theme,
                         }
                     }
                 }
-		cursor->images[i] = (struct wl_cursor_image *) image;
+		cursor->total_delay += image->image.delay;
+		cursor->cursor.images[i] = (struct wl_cursor_image *) image;
 	}
-	cursor->image_count = i;
+	cursor->cursor.image_count = i;
 
-	if (cursor->image_count == 0) {
-		free(cursor->name);
-		free(cursor->images);
+	if (cursor->cursor.image_count == 0) {
+		free(cursor->cursor.name);
+		free(cursor->cursor.images);
 		free(cursor);
 	        xcursor_images_destroy (images);
 		return NULL;
@@ -304,7 +306,7 @@ wl_cursor_create_from_xcursor_images(struct wl_cursor_theme *theme,
 
 	xcursor_images_destroy (images);
 
-	return cursor;
+	return &cursor->cursor;
 }
 
 static void

gdk/wayland/gdksurface-wayland.c

@@ -1148,10 +1148,7 @@ gdk_wayland_surface_destroy (GdkSurface *surface,
 
   gdk_wayland_surface_hide_surface (surface);
 
-  if (GDK_IS_TOPLEVEL (surface))
-    gdk_wayland_toplevel_destroy (GDK_TOPLEVEL (surface));
-
-  gdk_wayland_surface_destroy_wl_surface (GDK_WAYLAND_SURFACE (surface));
+  gdk_wayland_surface_destroy_wl_surface (GDK_WAYLAND_SURFACE(surface));
 
   frame_clock = gdk_surface_get_frame_clock (surface);
   g_signal_handlers_disconnect_by_func (frame_clock, on_frame_clock_before_paint, surface);

gdk/wayland/gdktoplevel-wayland-private.h

@@ -39,4 +39,3 @@ void     gdk_wayland_toplevel_announce_ssd        (GdkToplevel *toplevel);
 gboolean gdk_wayland_toplevel_inhibit_idle        (GdkToplevel *toplevel);
 void     gdk_wayland_toplevel_uninhibit_idle      (GdkToplevel *toplevel);
 
-void     gdk_wayland_toplevel_destroy             (GdkToplevel *toplevel);

gdk/wayland/gdktoplevel-wayland.c

@@ -54,16 +54,11 @@ static void gdk_wayland_toplevel_sync_parent             (GdkWaylandToplevel *to
 static void gdk_wayland_toplevel_sync_parent_of_imported (GdkWaylandToplevel *toplevel);
 static void gdk_wayland_surface_create_xdg_toplevel      (GdkWaylandToplevel *toplevel);
 static void gdk_wayland_toplevel_sync_title              (GdkWaylandToplevel *toplevel);
+static gboolean gdk_wayland_toplevel_is_exported         (GdkWaylandToplevel *toplevel);
 static void unset_transient_for_exported                 (GdkWaylandToplevel *toplevel);
 
 /* {{{ GdkWaylandToplevel definition */
 
-typedef struct {
-  struct zxdg_exported_v1 *xdg_exported;
-  struct zxdg_exported_v2 *xdg_exported_v2;
-  char *handle;
-} GdkWaylandExported;
-
 /**
  * GdkWaylandToplevel:
  *
@@ -88,7 +83,8 @@ struct _GdkWaylandToplevel
   GdkWaylandToplevel *transient_for;
 
   struct org_kde_kwin_server_decoration *server_decoration;
-  GList *exported;
+  struct zxdg_exported_v1 *xdg_exported;
+  struct zxdg_exported_v2 *xdg_exported_v2;
 
   struct {
     int width;
@@ -106,6 +102,12 @@ struct _GdkWaylandToplevel
       gboolean size_is_fixed;
   } next_layout;
 
+  struct {
+    GdkWaylandToplevelExported callback;
+    gpointer user_data;
+    GDestroyNotify destroy_func;
+  } exported;
+
   struct {
     gboolean was_set;
 
@@ -1278,6 +1280,9 @@ gdk_wayland_toplevel_finalize (GObject *object)
 
   display_wayland->toplevels = g_list_remove (display_wayland->toplevels, self);
 
+  if (gdk_wayland_toplevel_is_exported (self))
+    gdk_wayland_toplevel_unexport_handle (GDK_TOPLEVEL (self));
+
   g_free (self->application.application_id);
   g_free (self->application.app_menu_path);
   g_free (self->application.menubar_path);
@@ -1742,12 +1747,8 @@ xdg_exported_handle_v1 (void                    *data,
                         struct zxdg_exported_v1 *zxdg_exported_v1,
                         const char              *handle)
 {
-  GTask *task = G_TASK (data);
-  GdkWaylandExported *exported = (GdkWaylandExported *)g_task_get_task_data (task);
-
-  exported->handle = g_strdup (handle);
-  g_task_return_pointer (task, g_strdup (handle), g_free);
-  g_object_unref (task);
+  g_task_return_pointer (G_TASK (data), g_strdup (handle), g_free);
+  g_object_unref (data);
 }
 
 static const struct zxdg_exported_v1_listener xdg_exported_listener_v1 = {
@@ -1759,12 +1760,8 @@ xdg_exported_handle_v2 (void                    *data,
                         struct zxdg_exported_v2 *zxdg_exported_v2,
                         const char              *handle)
 {
-  GTask *task = G_TASK (data);
-  GdkWaylandExported *exported = (GdkWaylandExported *)g_task_get_task_data (task);
-
-  exported->handle = g_strdup (handle);
-  g_task_return_pointer (task, g_strdup (handle), g_free);
-  g_object_unref (task);
+  g_task_return_pointer (G_TASK (data), g_strdup (handle), g_free);
+  g_object_unref (data);
 }
 
 static const struct zxdg_exported_v2_listener xdg_exported_listener_v2 = {
@@ -1787,27 +1784,19 @@ gdk_wayland_toplevel_real_export_handle (GdkToplevel          *toplevel,
 
   if (display_wayland->xdg_exporter_v2)
     {
-      GdkWaylandExported *exported = g_new0 (GdkWaylandExported, 1);
-      exported->xdg_exported_v2 =
+      wayland_toplevel->xdg_exported_v2 =
         zxdg_exporter_v2_export_toplevel (display_wayland->xdg_exporter_v2,
                                           gdk_wayland_surface_get_wl_surface (surface));
-      zxdg_exported_v2_add_listener (exported->xdg_exported_v2,
+      zxdg_exported_v2_add_listener (wayland_toplevel->xdg_exported_v2,
                                      &xdg_exported_listener_v2, task);
-
-      wayland_toplevel->exported = g_list_prepend (wayland_toplevel->exported, exported);
-      g_task_set_task_data (task, exported, NULL);
     }
   else if (display_wayland->xdg_exporter)
     {
-      GdkWaylandExported *exported = g_new0 (GdkWaylandExported, 1);
-      exported->xdg_exported =
+      wayland_toplevel->xdg_exported =
         zxdg_exporter_v1_export (display_wayland->xdg_exporter,
                                  gdk_wayland_surface_get_wl_surface (surface));
-      zxdg_exported_v1_add_listener (exported->xdg_exported,
+      zxdg_exported_v1_add_listener (wayland_toplevel->xdg_exported,
                                      &xdg_exported_listener_v1, task);
-
-      wayland_toplevel->exported = g_list_prepend (wayland_toplevel->exported, exported);
-      g_task_set_task_data (task, exported, NULL);
     }
   else
     {
@@ -1826,36 +1815,15 @@ gdk_wayland_toplevel_real_export_handle_finish (GdkToplevel   *toplevel,
 }
 
 static void
-destroy_exported (GdkWaylandExported *exported)
-{
-  g_clear_pointer (&exported->handle, g_free);
-  g_clear_pointer (&exported->xdg_exported_v2, zxdg_exported_v2_destroy);
-  g_clear_pointer (&exported->xdg_exported, zxdg_exported_v1_destroy);
-  g_free (exported);
-}
-
-static void
-gdk_wayland_toplevel_real_unexport_handle (GdkToplevel *toplevel,
-                                           const char  *handle)
+gdk_wayland_toplevel_real_unexport_handle (GdkToplevel *toplevel)
 {
   GdkWaylandToplevel *wayland_toplevel = GDK_WAYLAND_TOPLEVEL (toplevel);
 
   g_return_if_fail (GDK_IS_WAYLAND_TOPLEVEL (toplevel));
-  g_return_if_fail (handle != NULL);
+  g_return_if_fail (wayland_toplevel->xdg_exported_v2 || wayland_toplevel->xdg_exported);
 
-  for (GList *l = wayland_toplevel->exported; l; l = l->next)
-    {
-      GdkWaylandExported *exported = l->data;
-
-      if (exported->handle && strcmp (exported->handle, handle) == 0)
-        {
-          wayland_toplevel->exported = g_list_delete_link (wayland_toplevel->exported, l);
-          destroy_exported (exported);
-          return;
-        }
-    }
-
-  g_warn_if_reached ();
+  g_clear_pointer (&wayland_toplevel->xdg_exported_v2, zxdg_exported_v2_destroy);
+  g_clear_pointer (&wayland_toplevel->xdg_exported, zxdg_exported_v1_destroy);
 }
 
 static gboolean
@@ -2287,32 +2255,6 @@ gdk_wayland_toplevel_set_dbus_properties (GdkToplevel *toplevel,
   maybe_set_gtk_surface_dbus_properties (wayland_toplevel);
 }
 
-void
-gdk_wayland_toplevel_destroy (GdkToplevel *toplevel)
-{
-  GdkWaylandToplevel *self = GDK_WAYLAND_TOPLEVEL (toplevel);
-
-  while (self->exported)
-    {
-      GdkWaylandExported *exported = self->exported->data;
-      self->exported = g_list_delete_link (self->exported, self->exported);
-      if (exported->handle == NULL)
-        {
-          GTask *task;
-
-          if (exported->xdg_exported_v2)
-            task = G_TASK (wl_proxy_get_user_data ((struct wl_proxy *) exported->xdg_exported_v2));
-          else
-            task = G_TASK (wl_proxy_get_user_data ((struct wl_proxy *) exported->xdg_exported));
-
-          g_task_return_new_error (task, G_IO_ERROR, G_IO_ERROR_FAILED, "Surface was destroyed");
-          g_object_unref (task);
-        }
-
-      destroy_exported (exported);
-    }
-}
-
 /* }}} */
 /* {{{ Toplevel API */
 
@@ -2455,6 +2397,12 @@ gdk_wayland_toplevel_uninhibit_idle (GdkToplevel *toplevel)
  * marking surfaces as transient for out-of-process surfaces.
  */
 
+static gboolean
+gdk_wayland_toplevel_is_exported (GdkWaylandToplevel *toplevel)
+{
+  return toplevel->xdg_exported != NULL || toplevel->xdg_exported_v2 != NULL;
+}
+
 typedef struct {
   GdkWaylandToplevelExported callback;
   gpointer user_data;
@@ -2502,12 +2450,6 @@ export_handle_done (GObject      *source,
  * from another surface as transient for this one, see
  * [method@GdkWayland.WaylandToplevel.set_transient_for_exported].
  *
- * Before 4.12, this API could not safely be used multiple times,
- * since there was no reference counting for handles. Starting with
- * 4.12, every call to this function obtains a new handle, and every
- * call to [method@GdkWayland.WaylandToplevel.drop_exported_handle] drops
- * just the handle that it is given.
- *
  * Note that this API depends on an unstable Wayland protocol,
  * and thus may require changes in the future.
  *
@@ -2544,53 +2486,15 @@ gdk_wayland_toplevel_export_handle (GdkToplevel                *toplevel,
  * It is an error to call this function on a surface that
  * does not have a handle.
  *
- * Since 4.12, this function does nothing. Use
- * [method@GdkWayland.WaylandToplevel.drop_exported_handle] instead to drop a
- * handle that was obtained with [method@GdkWayland.WaylandToplevel.export_handle].
- *
  * Note that this API depends on an unstable Wayland protocol,
  * and thus may require changes in the future.
- *
- * Deprecated: 4.12: Use [method@GdkWayland.WaylandToplevel.drop_exported_handle]
- *   instead, this function does nothing
  */
 void
 gdk_wayland_toplevel_unexport_handle (GdkToplevel *toplevel)
 {
-  GdkWaylandToplevel *wayland_toplevel = GDK_WAYLAND_TOPLEVEL (toplevel);
+  g_return_if_fail (GDK_IS_WAYLAND_TOPLEVEL (toplevel));
 
-  if (wayland_toplevel->exported != NULL &&
-      wayland_toplevel->exported->next == NULL)
-    {
-      GdkWaylandExported *exported = wayland_toplevel->exported->data;
-
-      if (exported->handle)
-        {
-          gdk_toplevel_unexport_handle (toplevel, exported->handle);
-          return;
-        }
-    }
-
-  g_warning ("Use gdk_wayland_toplevel_drop_exported_handle()");
-}
-
-/**
- * gdk_wayland_toplevel_drop_exported_handle:
- * @toplevel: (type GdkWaylandToplevel): the `GdkToplevel` that was exported
- * @handle: the handle to drop
- *
- * Destroy a handle that was obtained with gdk_wayland_toplevel_export_handle().
- *
- * Note that this API depends on an unstable Wayland protocol,
- * and thus may require changes in the future.
- *
- * Since: 4.12
- */
-void
-gdk_wayland_toplevel_drop_exported_handle (GdkToplevel *toplevel,
-                                           const char  *handle)
-{
-  gdk_toplevel_unexport_handle (toplevel, handle);
+  gdk_toplevel_unexport_handle (toplevel);
 }
 
 static void

gdk/wayland/gdkwaylandtoplevel.h

@@ -52,13 +52,9 @@ gboolean                 gdk_wayland_toplevel_export_handle (GdkToplevel
                                                              gpointer                 user_data,
                                                              GDestroyNotify           destroy_func);
 
-GDK_DEPRECATED_IN_4_12_FOR(gdk_wayland_toplevel_drop_exported_handle)
+GDK_AVAILABLE_IN_ALL
 void                     gdk_wayland_toplevel_unexport_handle (GdkToplevel *toplevel);
 
-GDK_AVAILABLE_IN_4_12
-void                     gdk_wayland_toplevel_drop_exported_handle (GdkToplevel *toplevel,
-                                                                    const char  *handle);
-
 GDK_AVAILABLE_IN_ALL
 gboolean                 gdk_wayland_toplevel_set_transient_for_exported (GdkToplevel *toplevel,
                                                                          const char   *parent_handle_str);

gdk/win32/gdkclipdrop-win32.c

@@ -1436,7 +1436,7 @@ register_clipboard_notification ()
 
   wclass.lpszClassName = "GdkClipboardNotification";
   wclass.lpfnWndProc = _clipboard_window_procedure;
-  wclass.hInstance = this_module ();
+  wclass.hInstance = _gdk_dll_hinstance;
   wclass.cbWndExtra = sizeof (GdkWin32ClipboardThread *);
 
   klass = RegisterClass (&wclass);
@@ -1446,7 +1446,7 @@ register_clipboard_notification ()
   clipboard_thread_data->clipboard_window = CreateWindow (MAKEINTRESOURCE (klass),
                                                 NULL, WS_POPUP,
                                                 0, 0, 0, 0, NULL, NULL,
-                                                this_module (), NULL);
+                                                _gdk_dll_hinstance, NULL);
 
   if (clipboard_thread_data->clipboard_window == NULL)
     goto failed;
@@ -1471,7 +1471,7 @@ register_clipboard_notification ()
 
 failed:
   g_critical ("Failed to install clipboard viewer");
-  UnregisterClass (MAKEINTRESOURCE (klass), this_module ());
+  UnregisterClass (MAKEINTRESOURCE (klass), _gdk_dll_hinstance);
   return FALSE;
 }
 

gdk/win32/gdkcursor-win32.c

@@ -417,12 +417,13 @@ hcursor_from_x_cursor (int          i,
 #undef SET_BIT
 #undef RESET_BIT
 
-      rv = CreateCursor (NULL, cursors[i].hotx, cursors[i].hoty,
+      rv = CreateCursor (_gdk_app_hmodule, cursors[i].hotx, cursors[i].hoty,
 			 w, h, and_plane, xor_plane);
     }
   else
     {
-      rv = CreateCursor (NULL, 0, 0, w, h, and_plane, xor_plane);
+      rv = CreateCursor (_gdk_app_hmodule, 0, 0,
+			 w, h, and_plane, xor_plane);
     }
 
   if (rv == NULL)
@@ -465,7 +466,7 @@ win32_cursor_create_win32hcursor (GdkWin32Display *display,
         break;
       case GDK_WIN32_CURSOR_LOAD_FROM_RESOURCE_THIS:
         result = gdk_win32_hcursor_new (display,
-                                        LoadImageA (GetModuleHandle (NULL),
+                                        LoadImageA (_gdk_app_hmodule,
                                                     (const char *) cursor->resource_name,
                                                     IMAGE_CURSOR,
                                                     cursor->width,
@@ -475,7 +476,7 @@ win32_cursor_create_win32hcursor (GdkWin32Display *display,
         break;
       case GDK_WIN32_CURSOR_LOAD_FROM_RESOURCE_GTK:
         result = gdk_win32_hcursor_new (display,
-                                        LoadImageA (this_module (),
+                                        LoadImageA (_gdk_dll_hinstance,
                                                     (const char *) cursor->resource_name,
                                                     IMAGE_CURSOR,
                                                     cursor->width,
@@ -857,7 +858,9 @@ create_blank_win32hcursor (GdkWin32Display *display)
   xor_plane = g_malloc ((w/8) * h);
   memset (xor_plane, 0, (w/8) * h);
 
-  rv = CreateCursor (NULL, 0, 0, w, h, and_plane, xor_plane);
+  rv = CreateCursor (_gdk_app_hmodule, 0, 0,
+                     w, h, and_plane, xor_plane);
+
   if (rv == NULL)
     WIN32_API_FAILED ("CreateCursor");
 
@@ -868,7 +871,6 @@ static GdkWin32HCursor *
 gdk_win32hcursor_create_for_name (GdkWin32Display  *display,
                                   const char *name)
 {
-  const HINSTANCE hinstance = GetModuleHandle (NULL);
   GdkWin32HCursor *win32hcursor = NULL;
 
   /* Blank cursor case */
@@ -883,7 +885,7 @@ gdk_win32hcursor_create_for_name (GdkWin32Display  *display,
   /* Allow to load named cursor resources linked into the executable.
    * Cursors obtained with LoadCursor() cannot be destroyed.
    */
-  return gdk_win32_hcursor_new (display, LoadCursor (hinstance, name), FALSE);
+  return gdk_win32_hcursor_new (display, LoadCursor (_gdk_app_hmodule, name), FALSE);
 }
 
 static HICON
@@ -1450,6 +1452,27 @@ pixbuf_to_hicon (GdkPixbuf *pixbuf,
   return icon;
 }
 
+HICON
+_gdk_win32_texture_to_hicon (GdkTexture *texture)
+{
+  cairo_surface_t *surface;
+  GdkPixbuf *pixbuf;
+  int width, height;
+  HICON icon;
+  
+  surface = gdk_texture_download_surface (texture);
+  width = cairo_image_surface_get_width (surface);
+  height = cairo_image_surface_get_height (surface);
+  
+  pixbuf = gdk_pixbuf_get_from_surface (surface, 0, 0, width, height);
+  
+  icon = pixbuf_to_hicon (pixbuf, TRUE, 0, 0);
+  
+  g_object_unref (pixbuf);
+  
+  return icon;
+}
+
 /**
  * gdk_win32_display_get_win32hcursor:
  * @display: (type GdkWin32Display): a `GdkDisplay`

gdk/win32/gdkdisplay-win32.c

@@ -292,7 +292,6 @@ _gdk_win32_display_init_monitors (GdkWin32Display *win32_display)
       if (!w32_ex_monitor->remove)
         continue;
 
-      w32_ex_monitor->hmonitor = NULL;
       g_list_store_remove (G_LIST_STORE (win32_display->monitors), i);
       gdk_monitor_invalidate (ex_monitor);
     }
@@ -481,7 +480,7 @@ register_display_change_notification (GdkDisplay *display)
 
   wclass.lpszClassName = "GdkDisplayChange";
   wclass.lpfnWndProc = display_change_window_procedure;
-  wclass.hInstance = this_module ();
+  wclass.hInstance = _gdk_app_hmodule;
   wclass.style = CS_OWNDC;
 
   klass = RegisterClass (&wclass);
@@ -490,10 +489,10 @@ register_display_change_notification (GdkDisplay *display)
       display_win32->hwnd = CreateWindow (MAKEINTRESOURCE (klass),
                                           NULL, WS_POPUP,
                                           0, 0, 0, 0, NULL, NULL,
-                                          this_module (), NULL);
+                                          _gdk_app_hmodule, NULL);
       if (!display_win32->hwnd)
         {
-          UnregisterClass (MAKEINTRESOURCE (klass), this_module ());
+          UnregisterClass (MAKEINTRESOURCE (klass), _gdk_app_hmodule);
         }
     }
 }

gdk/win32/gdkevents-win32.c

@@ -413,7 +413,8 @@ set_up_low_level_keyboard_hook (void)
 
   hook_handle = SetWindowsHookEx (WH_KEYBOARD_LL,
                                   (HOOKPROC) low_level_keyboard_proc,
-                                  this_module (), 0);
+                                  _gdk_dll_hinstance,
+                                  0);
 
   if (hook_handle != NULL)
     keyboard_hook = hook_handle;

gdk/win32/gdkglcontext-win32-wgl.c

@@ -261,7 +261,7 @@ create_dummy_gl_window (void)
 
   wclass.lpszClassName = "GdkGLDummyWindow";
   wclass.lpfnWndProc = DefWindowProc;
-  wclass.hInstance = this_module ();
+  wclass.hInstance = _gdk_app_hmodule;
   wclass.style = CS_OWNDC;
 
   klass = RegisterClass (&wclass);
@@ -270,10 +270,10 @@ create_dummy_gl_window (void)
       hwnd = CreateWindow (MAKEINTRESOURCE (klass),
                            NULL, WS_POPUP,
                            0, 0, 0, 0, NULL, NULL,
-                           this_module (), NULL);
+                           _gdk_app_hmodule, NULL);
       if (!hwnd)
         {
-          UnregisterClass (MAKEINTRESOURCE (klass), this_module ());
+          UnregisterClass (MAKEINTRESOURCE (klass), _gdk_app_hmodule);
         }
     }
 

gdk/win32/gdkglobals-win32.c

@@ -30,6 +30,10 @@
 GdkDisplay	 *_gdk_display = NULL;
 GdkDeviceManagerWin32 *_gdk_device_manager = NULL;
 
+HDC		  _gdk_display_hdc;
+HINSTANCE	  _gdk_dll_hinstance;
+HINSTANCE	  _gdk_app_hmodule;
+
 int		  _gdk_input_ignore_core;
 
 HKL		  _gdk_input_locale;

gdk/win32/gdkinput-winpointer.c

@@ -1003,7 +1003,7 @@ winpointer_notif_window_create (void)
   wndclassex.cbSize = sizeof (wndclassex);
   wndclassex.lpszClassName = L"GdkWin32WinpointerNotificationsWindowClass";
   wndclassex.lpfnWndProc = winpointer_notifications_window_procedure;
-  wndclassex.hInstance = this_module ();
+  wndclassex.hInstance = _gdk_dll_hinstance;
 
   if ((notifications_window_class = RegisterClassExW (&wndclassex)) == 0)
     {
@@ -1018,7 +1018,7 @@ winpointer_notif_window_create (void)
                                                        0, 0, 0, 0,
                                                        HWND_MESSAGE,
                                                        NULL,
-                                                       this_module (),
+                                                       _gdk_dll_hinstance,
                                                        NULL)))
     {
       WIN32_API_FAILED ("CreateWindowExW");

gdk/win32/gdkkeys-win32.c

@@ -576,6 +576,19 @@ gdk_mod_mask_to_mod_bits (GdkModifierType mod_mask)
   return result;
 }
 
+
+/* keypad decimal mark depends on active keyboard layout
+ * return current decimal mark as unicode character
+ */
+guint32
+_gdk_win32_keymap_get_decimal_mark (GdkWin32Keymap *keymap)
+{
+  guint32 c = MapVirtualKeyW (VK_DECIMAL, MAPVK_VK_TO_CHAR);
+  if (!c)
+    c = (guint32) '.';
+  return c;
+}
+
 static void
 update_keymap (GdkWin32Keymap *keymap)
 {

gdk/win32/gdkmain-win32.c

@@ -45,6 +45,9 @@
 #include <wintab.h>
 #include <imm.h>
 
+/* for CFSTR_SHELLIDLIST */
+#include <shlobj.h>
+
 static gboolean gdk_synchronize = FALSE;
 
 /* Whether GDK initialized COM */
@@ -63,6 +66,8 @@ _gdk_win32_surfaceing_init (void)
   if (gdk_synchronize)
     GdiSetBatchLimit (1);
 
+  _gdk_app_hmodule = GetModuleHandle (NULL);
+  _gdk_display_hdc = CreateDC ("DISPLAY", NULL, NULL, NULL);
   _gdk_input_locale = GetKeyboardLayout (0);
   _gdk_win32_keymap_set_active_layout (win32_keymap, _gdk_input_locale);
 
@@ -182,6 +187,135 @@ static_printf (const char *format,
   return retval;
 }
 
+void
+_gdk_win32_print_paletteentries (const PALETTEENTRY *pep,
+				const int           nentries)
+{
+  char buf[20];
+  int i;
+
+  for (i = 0; i < nentries; i++)
+    g_print ("  %3d %02x:  %02x %02x %02x%s\n",
+	     i, i,
+	     pep[i].peRed, pep[i].peGreen, pep[i].peBlue,
+	     (pep[i].peFlags == 0 ? "" :
+	      (pep[i].peFlags == PC_EXPLICIT ? " PC_EXPLICIT" :
+	       (pep[i].peFlags == PC_NOCOLLAPSE ? " PC_NOCOLLAPSE" :
+		(pep[i].peFlags == PC_RESERVED ? " PC_RESERVED" :
+		 (g_sprintf (buf, " %d", pep[i].peFlags), buf))))));
+}
+
+void
+_gdk_win32_print_system_palette (void)
+{
+  PALETTEENTRY *pe;
+  int k;
+
+  k = GetSystemPaletteEntries (_gdk_display_hdc, 0, 0, NULL);
+  pe = g_new (PALETTEENTRY, k);
+  k = GetSystemPaletteEntries (_gdk_display_hdc, 0, k, pe);
+
+  if (!k)
+    g_print ("GetSystemPaletteEntries failed: %s\n",
+	     g_win32_error_message (GetLastError ()));
+  else
+    {
+      g_print ("System palette: %d entries\n", k);
+      _gdk_win32_print_paletteentries (pe, k);
+    }
+  g_free (pe);
+}
+
+static int
+palette_size (HPALETTE hpal)
+{
+  WORD npal = 0;
+
+  if (!GetObject (hpal, sizeof (npal), &npal))
+    WIN32_GDI_FAILED ("GetObject (HPALETTE)");
+
+  return npal;
+}
+
+void
+_gdk_win32_print_hpalette (HPALETTE hpal)
+{
+  PALETTEENTRY *pe;
+  int n, npal;
+
+  npal = palette_size (hpal);
+  pe = g_new (PALETTEENTRY, npal);
+  n = GetPaletteEntries (hpal, 0, npal, pe);
+
+  if (!n)
+    g_print ("HPALETTE %p: GetPaletteEntries failed: %s\n",
+	     hpal, g_win32_error_message (GetLastError ()));
+  else
+    {
+      g_print ("HPALETTE %p: %d (%d) entries\n", hpal, n, npal);
+      _gdk_win32_print_paletteentries (pe, n);
+    }
+  g_free (pe);
+}
+
+void
+_gdk_win32_print_dc (HDC hdc)
+{
+  HGDIOBJ obj;
+  LOGBRUSH logbrush;
+  EXTLOGPEN extlogpen;
+  HRGN hrgn;
+  RECT rect;
+  int flag;
+
+  g_print ("%p:\n", hdc);
+  obj = GetCurrentObject (hdc, OBJ_BRUSH);
+  GetObject (obj, sizeof (LOGBRUSH), &logbrush);
+  g_print ("brush: %s color=%06lx hatch=%p\n",
+	   _gdk_win32_lbstyle_to_string (logbrush.lbStyle),
+	   logbrush.lbColor, (gpointer) logbrush.lbHatch);
+  obj = GetCurrentObject (hdc, OBJ_PEN);
+  GetObject (obj, sizeof (EXTLOGPEN), &extlogpen);
+  g_print ("pen: %s %s %s %s w=%d %s\n",
+	   _gdk_win32_pstype_to_string (extlogpen.elpPenStyle),
+	   _gdk_win32_psstyle_to_string (extlogpen.elpPenStyle),
+	   _gdk_win32_psendcap_to_string (extlogpen.elpPenStyle),
+	   _gdk_win32_psjoin_to_string (extlogpen.elpPenStyle),
+	   (int) extlogpen.elpWidth,
+	   _gdk_win32_lbstyle_to_string (extlogpen.elpBrushStyle));
+  g_print ("rop2: %s textcolor=%06lx\n",
+	   _gdk_win32_rop2_to_string (GetROP2 (hdc)),
+	   GetTextColor (hdc));
+  hrgn = CreateRectRgn (0, 0, 0, 0);
+  if ((flag = GetClipRgn (hdc, hrgn)) == -1)
+    WIN32_API_FAILED ("GetClipRgn");
+  else if (flag == 0)
+    g_print ("no clip region\n");
+  else if (flag == 1)
+    {
+      GetRgnBox (hrgn, &rect);
+      g_print ("clip region: %p bbox: %s\n",
+	       hrgn, _gdk_win32_rect_to_string (&rect));
+    }
+  DeleteObject (hrgn);
+}
+
+char *
+_gdk_win32_drag_protocol_to_string (GdkDragProtocol protocol)
+{
+  switch (protocol)
+    {
+#define CASE(x) case GDK_DRAG_PROTO_##x: return #x
+      CASE (NONE);
+      CASE (WIN32_DROPFILES);
+      CASE (OLE2);
+#undef CASE
+    default: return static_printf ("illegal_%d", protocol);
+    }
+  /* NOTREACHED */
+  return NULL;
+}
+
 char *
 _gdk_win32_surface_state_to_string (GdkToplevelState state)
 {
@@ -344,7 +478,7 @@ _gdk_win32_drag_action_to_string (GdkDragAction actions)
   return static_printf ("%s", buf);
 }
 
-static char *
+char *
 _gdk_win32_rop2_to_string (int rop2)
 {
   switch (rop2)
@@ -373,7 +507,7 @@ _gdk_win32_rop2_to_string (int rop2)
   return NULL;
 }
 
-static char *
+char *
 _gdk_win32_lbstyle_to_string (UINT brush_style)
 {
   switch (brush_style)
@@ -392,7 +526,7 @@ _gdk_win32_lbstyle_to_string (UINT brush_style)
   return NULL;
 }
 
-static char *
+char *
 _gdk_win32_pstype_to_string (DWORD pen_style)
 {
   switch (pen_style & PS_TYPE_MASK)
@@ -405,7 +539,7 @@ _gdk_win32_pstype_to_string (DWORD pen_style)
   return NULL;
 }
 
-static char *
+char *
 _gdk_win32_psstyle_to_string (DWORD pen_style)
 {
   switch (pen_style & PS_STYLE_MASK)
@@ -427,7 +561,7 @@ _gdk_win32_psstyle_to_string (DWORD pen_style)
   return NULL;
 }
 
-static char *
+char *
 _gdk_win32_psendcap_to_string (DWORD pen_style)
 {
   switch (pen_style & PS_ENDCAP_MASK)
@@ -443,7 +577,7 @@ _gdk_win32_psendcap_to_string (DWORD pen_style)
   return NULL;
 }
 
-static char *
+char *
 _gdk_win32_psjoin_to_string (DWORD pen_style)
 {
   switch (pen_style & PS_JOIN_MASK)
@@ -459,56 +593,6 @@ _gdk_win32_psjoin_to_string (DWORD pen_style)
   return NULL;
 }
 
-void
-_gdk_win32_print_dc (HDC hdc)
-{
-  HGDIOBJ obj;
-  LOGBRUSH logbrush;
-  EXTLOGPEN extlogpen;
-  HRGN hrgn;
-  RECT rect;
-  int flag;
-
-  g_print ("%p:\n", hdc);
-
-  obj = GetCurrentObject (hdc, OBJ_BRUSH);
-  GetObject (obj, sizeof (LOGBRUSH), &logbrush);
-
-  g_print ("brush: %s color=%06lx hatch=%p\n",
-           _gdk_win32_lbstyle_to_string (logbrush.lbStyle),
-           logbrush.lbColor, (gpointer) logbrush.lbHatch);
-
-  obj = GetCurrentObject (hdc, OBJ_PEN);
-  GetObject (obj, sizeof (EXTLOGPEN), &extlogpen);
-
-  g_print ("pen: %s %s %s %s w=%d %s\n",
-           _gdk_win32_pstype_to_string (extlogpen.elpPenStyle),
-           _gdk_win32_psstyle_to_string (extlogpen.elpPenStyle),
-           _gdk_win32_psendcap_to_string (extlogpen.elpPenStyle),
-           _gdk_win32_psjoin_to_string (extlogpen.elpPenStyle),
-           (int) extlogpen.elpWidth,
-           _gdk_win32_lbstyle_to_string (extlogpen.elpBrushStyle));
-
-  g_print ("rop2: %s textcolor=%06lx\n",
-           _gdk_win32_rop2_to_string (GetROP2 (hdc)),
-           GetTextColor (hdc));
-
-  hrgn = CreateRectRgn (0, 0, 0, 0);
-
-  if ((flag = GetClipRgn (hdc, hrgn)) == -1)
-    WIN32_API_FAILED ("GetClipRgn");
-  else if (flag == 0)
-    g_print ("no clip region\n");
-  else if (flag == 1)
-    {
-      GetRgnBox (hrgn, &rect);
-      g_print ("clip region: %p bbox: %s\n",
-               hrgn, _gdk_win32_rect_to_string (&rect));
-    }
-
-  DeleteObject (hrgn);
-}
-
 char *
 _gdk_win32_message_to_string (UINT msg)
 {
@@ -809,6 +893,26 @@ _gdk_win32_cf_to_string (UINT format)
     }
 }
 
+char *
+_gdk_win32_data_to_string (const guchar *data,
+			   int           nbytes)
+{
+  GString *s = g_string_new ("");
+  int i;
+  char *retval;
+
+  for (i = 0; i < nbytes; i++)
+    if (data[i] >=' ' && data[i] <= '~')
+      g_string_append_printf (s, "%c  ", data[i]);
+    else
+      g_string_append_printf (s, "%02X ", data[i]);
+
+  retval = static_printf ("%s", s->str);
+  g_string_free (s, TRUE);
+
+  return retval;
+}
+
 char *
 _gdk_win32_rect_to_string (const RECT *rect)
 {
@@ -817,4 +921,34 @@ _gdk_win32_rect_to_string (const RECT *rect)
 			rect->left, rect->top);
 }
 
+char *
+_gdk_win32_gdkrectangle_to_string (const GdkRectangle *rect)
+{
+  return static_printf ("%dx%d@%+d%+d",
+			rect->width, rect->height,
+			rect->x, rect->y);
+}
+
+char *
+_gdk_win32_cairo_region_to_string (const cairo_region_t *rgn)
+{
+  cairo_rectangle_int_t extents;
+  cairo_region_get_extents (rgn, &extents);
+  return static_printf ("%dx%d@%+d%+d",
+			extents.width, extents.height,
+			extents.x, extents.y);
+}
+
+char *
+_gdk_win32_surface_description (GdkSurface *d)
+{
+  g_return_val_if_fail (GDK_IS_SURFACE (d), NULL);
+
+  return static_printf ("%s:%p:%dx%d",
+			G_OBJECT_TYPE_NAME (d),
+			GDK_SURFACE_HWND (d),
+			gdk_surface_get_width (GDK_SURFACE (d)),
+                        gdk_surface_get_height (GDK_SURFACE (d)));
+}
+
 #endif /* G_ENABLE_DEBUG */

gdk/win32/gdkmonitor-win32.c

@@ -443,6 +443,9 @@ populate_monitor_devices_from_display_config (GPtrArray *monitors)
       char *path, *path_lower;
       DISPLAYCONFIG_RATIONAL *refresh;
 
+      if ((dispconf_paths[path_index].flags & DISPLAYCONFIG_PATH_ACTIVE) == 0)
+        continue;
+
       tdn.header.type = DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_NAME;
       tdn.header.size = sizeof (tdn);
       tdn.header.adapterId = dispconf_paths[path_index].targetInfo.adapterId;
@@ -478,12 +481,6 @@ populate_monitor_devices_from_display_config (GPtrArray *monitors)
       if (w32mon == NULL)
         continue;
 
-      if ((dispconf_paths[path_index].flags & DISPLAYCONFIG_PATH_ACTIVE) == 0)
-        {
-          w32mon->remove = TRUE;
-          continue;
-        }
-
       mon = GDK_MONITOR (w32mon);
 
       if (!tdn.flags.friendlyNameForced)
@@ -601,8 +598,6 @@ enum_monitor (HMONITOR hmonitor,
 
               if (w32mon == NULL)
                 continue;
-
-              w32mon->hmonitor = hmonitor;
             }
           else
             {

gdk/win32/gdkmonitor-win32.h

@@ -35,9 +35,6 @@ struct _GdkWin32Monitor
   /* Device instance path (used to match GdkWin32Monitor to monitor device) */
   char *instance_path;
 
-  /* MOnitor handle (used to fullscreen windows on monitors) */
-  HMONITOR hmonitor;
-
   /* TRUE if monitor is made up by us
    * (this happens when system has logical monitors, but no physical ones).
    */

gdk/win32/gdkprivate-win32.h

@@ -15,9 +15,14 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#pragma once
+/*
+ * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
+ * file for a list of people on the GTK+ Team.  See the ChangeLog
+ * files for a list of changes.  These files are distributed with
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
+ */
 
-#include "config.h"
+#pragma once
 
 #include <gdk/gdkcursorprivate.h>
 #include <gdk/gdkdebugprivate.h>
@@ -27,6 +32,10 @@
 #include <gdk/win32/gdkwin32keys.h>
 #include <gdk/win32/gdkdevicemanager-win32.h>
 #include <gdk/win32/gdkclipdrop-win32.h>
+//#include <gdk/win32/gdkselection-win32.h>
+
+
+#include "config.h"
 
 
 /* Old debug macros */
@@ -45,6 +54,62 @@
 
 #endif
 
+/* Make up for some minor w32api or MSVC6 header lossage */
+
+#ifndef PS_JOIN_MASK
+#define PS_JOIN_MASK (PS_JOIN_BEVEL|PS_JOIN_MITER|PS_JOIN_ROUND)
+#endif
+
+#ifndef FS_VIETNAMESE
+#define FS_VIETNAMESE 0x100
+#endif
+
+#ifndef WM_GETOBJECT
+#define WM_GETOBJECT 0x3D
+#endif
+#ifndef WM_NCXBUTTONDOWN
+#define WM_NCXBUTTONDOWN 0xAB
+#endif
+#ifndef WM_NCXBUTTONUP
+#define WM_NCXBUTTONUP 0xAC
+#endif
+#ifndef WM_NCXBUTTONDBLCLK
+#define WM_NCXBUTTONDBLCLK 0xAD
+#endif
+#ifndef WM_CHANGEUISTATE
+#define WM_CHANGEUISTATE 0x127
+#endif
+#ifndef WM_UPDATEUISTATE
+#define WM_UPDATEUISTATE 0x128
+#endif
+#ifndef WM_QUERYUISTATE
+#define WM_QUERYUISTATE 0x129
+#endif
+#ifndef WM_XBUTTONDOWN
+#define WM_XBUTTONDOWN 0x20B
+#endif
+#ifndef WM_XBUTTONUP
+#define WM_XBUTTONUP 0x20C
+#endif
+#ifndef WM_XBUTTONDBLCLK
+#define WM_XBUTTONDBLCLK 0x20D
+#endif
+#ifndef WM_NCMOUSEHOVER
+#define WM_NCMOUSEHOVER 0x2A0
+#endif
+#ifndef WM_NCMOUSELEAVE
+#define WM_NCMOUSELEAVE 0x2A2
+#endif
+#ifndef WM_APPCOMMAND
+#define WM_APPCOMMAND 0x319
+#endif
+#ifndef WM_MOUSEHWHEEL
+#define WM_MOUSEHWHEEL 0x20E
+#endif
+#ifndef WM_DPICHANGED
+#define WM_DPICHANGED 0x02E0
+#endif
+
 /* According to
  * http://blog.airesoft.co.uk/2009/11/wm_messages/
  * this is the actual internal name MS uses for this undocumented message.
@@ -57,6 +122,11 @@
 #define WM_SYSMENU 0x313
 #endif
 
+#ifndef CF_DIBV5
+#define CF_DIBV5 17
+#endif
+
+
 /* Define some combinations of GdkDebugFlags */
 #define GDK_DEBUG_EVENTS_OR_INPUT (GDK_DEBUG_EVENTS|GDK_DEBUG_INPUT)
 #define GDK_DEBUG_MISC_OR_EVENTS (GDK_DEBUG_MISC|GDK_DEBUG_EVENTS)
@@ -70,6 +140,22 @@ GdkWin32Screen *GDK_SURFACE_SCREEN(GObject *win);
  */
 #define SWP_NOZORDER_SPECIFIED HWND_TOP
 
+typedef struct _GdkWin32SingleFont      GdkWin32SingleFont;
+
+struct _GdkWin32SingleFont
+{
+  HFONT hfont;
+  UINT charset;
+  UINT codepage;
+  FONTSIGNATURE fs;
+};
+
+typedef enum {
+  GDK_WIN32_PE_STATIC,
+  GDK_WIN32_PE_AVAILABLE,
+  GDK_WIN32_PE_INUSE
+} GdkWin32PalEntryState;
+
 typedef enum
 {
   GDK_DRAG_PROTO_NONE = 0,
@@ -77,23 +163,51 @@ typedef enum
   GDK_DRAG_PROTO_OLE2,
 } GdkDragProtocol;
 
+GType _gdk_gc_win32_get_type (void);
+
 gulong _gdk_win32_get_next_tick (gulong suggested_tick);
+
 BOOL _gdk_win32_get_cursor_pos (LPPOINT lpPoint);
 
+void _gdk_surface_init_position     (GdkSurface *window);
+void _gdk_surface_move_resize_child (GdkSurface *window,
+                                     int        x,
+                                     int        y,
+                                     int        width,
+                                     int        height);
+
 gboolean _gdk_win32_surface_enable_transparency (GdkSurface *window);
 
+
+/* GdkSurfaceImpl methods */
+void _gdk_win32_surface_scroll (GdkSurface *window,
+                                int        dx,
+                                int        dy);
+void _gdk_win32_surface_move_region (GdkSurface       *window,
+                                     const cairo_region_t *region,
+                                     int              dx,
+                                     int              dy);
+
+
+void _gdk_win32_selection_init (void);
 void _gdk_win32_dnd_exit (void);
 
 void     gdk_win32_handle_table_insert  (HANDLE   *handle,
                                          gpointer data);
 void     gdk_win32_handle_table_remove  (HANDLE handle);
 
+HRGN      _gdk_win32_cairo_region_to_hrgn (const cairo_region_t *region,
+                                           int                   x_origin,
+                                           int                   y_origin);
+
 cairo_region_t *_gdk_win32_hrgn_to_region    (HRGN  hrgn,
                                               guint scale);
 
 void    _gdk_win32_adjust_client_rect   (GdkSurface *window,
                                          RECT      *RECT);
 
+void    _gdk_selection_property_delete (GdkSurface *);
+
 void       _gdk_push_modal_window   (GdkSurface *window);
 void       _gdk_remove_modal_window (GdkSurface *window);
 GdkSurface *_gdk_modal_current       (void);
@@ -103,22 +217,41 @@ gboolean gdk_win32_ensure_com (void);
 gboolean gdk_win32_ensure_ole (void);
 
 #ifdef G_ENABLE_DEBUG
+void   _gdk_win32_print_paletteentries (const PALETTEENTRY *pep,
+                                        const int           nentries);
+void   _gdk_win32_print_system_palette (void);
+void   _gdk_win32_print_hpalette       (HPALETTE     hpal);
 void   _gdk_win32_print_dc             (HDC          hdc);
 
+char *_gdk_win32_drag_protocol_to_string (GdkDragProtocol protocol);
 char *_gdk_win32_surface_state_to_string (GdkToplevelState state);
 char *_gdk_win32_surface_style_to_string (LONG style);
 char *_gdk_win32_surface_exstyle_to_string (LONG style);
 char *_gdk_win32_surface_pos_bits_to_string (UINT flags);
 char *_gdk_win32_drag_action_to_string (GdkDragAction actions);
+char *_gdk_win32_surface_description (GdkSurface *d);
 
+char *_gdk_win32_rop2_to_string       (int          rop2);
+char *_gdk_win32_lbstyle_to_string    (UINT         brush_style);
+char *_gdk_win32_pstype_to_string     (DWORD        pen_style);
+char *_gdk_win32_psstyle_to_string    (DWORD        pen_style);
+char *_gdk_win32_psendcap_to_string   (DWORD        pen_style);
+char *_gdk_win32_psjoin_to_string     (DWORD        pen_style);
 char *_gdk_win32_message_to_string    (UINT         msg);
 char *_gdk_win32_key_to_string        (LONG         lParam);
 char *_gdk_win32_cf_to_string         (UINT         format);
+char *_gdk_win32_data_to_string       (const guchar*data,
+                                        int          nbytes);
 char *_gdk_win32_rect_to_string       (const RECT  *rect);
 
+char *_gdk_win32_gdkrectangle_to_string (const GdkRectangle *rect);
+char *_gdk_win32_cairo_region_to_string (const cairo_region_t    *box);
+
 void   _gdk_win32_print_event            (GdkEvent     *event);
+
 #endif
 
+char   *_gdk_win32_last_error_string (void);
 void    _gdk_win32_api_failed        (const char *where,
                                       const char *api);
 void    _gdk_other_api_failed        (const char *where,
@@ -151,6 +284,10 @@ extern GdkDisplay       *_gdk_display;
 
 extern GdkDeviceManagerWin32 *_gdk_device_manager;
 
+extern HDC               _gdk_display_hdc;
+extern HINSTANCE         _gdk_dll_hinstance;
+extern HINSTANCE         _gdk_app_hmodule;
+
 extern int               _gdk_input_ignore_core;
 
 /* These are thread specific, but GDK/win32 works OK only when invoked
@@ -167,6 +304,8 @@ extern GdkWin32Clipdrop *_win32_clipdrop;
 /* Used to identify the main thread */
 extern GThread          *_win32_main_thread;
 
+void _gdk_win32_dnd_do_dragdrop (void);
+
 typedef enum {
   GDK_WIN32_MODAL_OP_NONE = 0x0,
   GDK_WIN32_MODAL_OP_SIZE = 0x1 << 0,
@@ -185,9 +324,16 @@ extern HWND             _modal_move_resize_window;
 void  _gdk_win32_begin_modal_call (GdkWin32ModalOpKind kind);
 void  _gdk_win32_end_modal_call (GdkWin32ModalOpKind kind);
 
+/* Convert a pixbuf to an HICON (or HCURSOR).  Supports alpha under
+ * Windows XP, thresholds alpha otherwise.
+ */
+HICON _gdk_win32_texture_to_hicon  (GdkTexture *texture);
+
 void _gdk_win32_display_init_cursors (GdkWin32Display     *display);
 void _gdk_win32_display_finalize_cursors (GdkWin32Display *display);
 void _gdk_win32_display_update_cursors (GdkWin32Display   *display);
+GdkCursor *_gdk_win32_display_get_cursor_for_name (GdkDisplay   *display, const char * cursor_name);
+GdkCursor *gdk_win32_display_cursor_from_hcursor (GdkDisplay *display, HCURSOR     hcursor);
 
 typedef struct _Win32CursorTheme Win32CursorTheme;
 
@@ -221,6 +367,9 @@ Win32Cursor *     win32_cursor_theme_get_cursor       (Win32CursorTheme *theme,
 void              win32_cursor_theme_destroy          (Win32CursorTheme *theme);
 Win32CursorTheme *_gdk_win32_display_get_cursor_theme (GdkWin32Display  *win32_display);
 
+/* GdkDisplay member functions */
+GList *_gdk_win32_display_list_devices (GdkDisplay *dpy);
+
 gboolean _gdk_win32_display_has_pending (GdkDisplay *display);
 void _gdk_win32_display_queue_events (GdkDisplay *display);
 
@@ -246,11 +395,16 @@ GdkDrag *_gdk_win32_surface_drag_begin (GdkSurface         *window,
 /* Stray GdkWin32Screen members */
 gboolean _gdk_win32_get_setting (const char *name, GValue *value);
 void _gdk_win32_screen_on_displaychange_event (GdkWin32Screen *screen);
+GdkSurface *gdk_win32_screen_get_root_window (GdkWin32Screen *screen);
+GdkSurface *gdk_win32_display_get_root_window (GdkDisplay *display);
 
 /* Distributed display manager implementation */
 GdkDisplay *_gdk_win32_display_open (const char *display_name);
 void _gdk_win32_append_event (GdkEvent *event);
 
+
+guint32 _gdk_win32_keymap_get_decimal_mark (GdkWin32Keymap *keymap);
+
 void     _gdk_win32_surface_handle_aerosnap      (GdkSurface            *window,
                                                   GdkWin32AeroSnapCombo combo);
 
@@ -295,15 +449,8 @@ gboolean _gdk_win32_check_processor (GdkWin32ProcessorCheckType check_type);
 GdkPixbuf    *gdk_win32_icon_to_pixbuf_libgtk_only (HICON hicon,
                                                     double *x_hot,
                                                     double *y_hot);
+HICON         gdk_win32_pixbuf_to_hicon_libgtk_only (GdkPixbuf *pixbuf);
 void          gdk_win32_set_modal_dialog_libgtk_only (HWND window);
 
 gpointer      gdk_win32_handle_table_lookup_       (HWND handle);
 
-extern IMAGE_DOS_HEADER __ImageBase;
-
-static inline HMODULE
-this_module (void)
-{
-  return (HMODULE) &__ImageBase;
-}
-

gdk/win32/gdkproperty-win32.c

@@ -113,15 +113,7 @@ _gdk_win32_get_setting (const char *name,
     }
   else if (strcmp ("gtk-font-name", name) == 0)
     {
-      char *font_name = NULL;
-      HDC hdc = NULL;
-
-      if ((hdc = GetDC (HWND_DESKTOP)) != NULL)
-        {
-          font_name = _get_system_font_name (hdc);
-          ReleaseDC (HWND_DESKTOP, hdc);
-          hdc = NULL;
-        }
+      char *font_name = _get_system_font_name (_gdk_display_hdc);
 
       if (font_name)
         {

gdk/win32/gdksurface-win32.c

@@ -50,7 +50,6 @@
 #include "gdkdisplay-win32.h"
 #include "gdkdevice-win32.h"
 #include "gdkcairocontext-win32.h"
-#include "gdkmonitor-win32.h"
 
 #include <cairo-win32.h>
 #include <dwmapi.h>
@@ -339,7 +338,7 @@ RegisterGdkClass (GType wtype)
   wcl.lpfnWndProc = _gdk_win32_surface_procedure;
   wcl.cbClsExtra = 0;
   wcl.cbWndExtra = 0;
-  wcl.hInstance = this_module ();
+  wcl.hInstance = _gdk_dll_hinstance;
   wcl.hIcon = 0;
   wcl.hIconSm = 0;
 
@@ -356,7 +355,7 @@ RegisterGdkClass (GType wtype)
           if (0 == hAppIcon && 0 == hAppIconSm)
             {
               // fallback : load icon from GTK DLL
-              if (0 != GetModuleFileName (this_module (), sLoc, MAX_PATH))
+              if (0 != GetModuleFileName (_gdk_dll_hinstance, sLoc, MAX_PATH))
 		{
 		  ExtractIconEx (sLoc, 0, &hAppIcon, &hAppIconSm, 1);
 		}
@@ -493,7 +492,7 @@ gdk_win32_surface_constructed (GObject *object)
                                   CW_USEDEFAULT, CW_USEDEFAULT,
                                   owner,
                                   NULL,
-                                  this_module (),
+                                  _gdk_dll_hinstance,
                                   surface);
   if (impl->handle == NULL)
     {
@@ -626,8 +625,7 @@ get_outer_rect (GdkSurface *window,
 }
 
 static void
-gdk_win32_surface_fullscreen (GdkSurface *window,
-                              GdkMonitor *monitor);
+gdk_win32_surface_fullscreen (GdkSurface *window);
 
 static void
 show_window_internal (GdkSurface *window,
@@ -791,7 +789,11 @@ show_window_internal (GdkSurface *window,
     }
 
 
-  if (window->state & GDK_TOPLEVEL_STATE_MAXIMIZED)
+  if (window->state & GDK_TOPLEVEL_STATE_FULLSCREEN)
+    {
+      gdk_win32_surface_fullscreen (window);
+    }
+  else if (window->state & GDK_TOPLEVEL_STATE_MAXIMIZED)
     {
       GtkShowWindow (window, SW_MAXIMIZE);
     }
@@ -2404,7 +2406,7 @@ RegisterGdkDumbClass ()
   wcl.lpfnWndProc = DefWindowProcW;
   wcl.cbClsExtra = 0;
   wcl.cbWndExtra = 0;
-  wcl.hInstance = this_module ();
+  wcl.hInstance = _gdk_dll_hinstance;
   wcl.hIcon = 0;
   wcl.hIconSm = 0;
   wcl.lpszMenuName = NULL;
@@ -2445,7 +2447,7 @@ ensure_snap_indicator_exists (GdkW32DragMoveResizeContext *context)
                                 0, 0,
                                 NULL,
                                 NULL,
-                                this_module (),
+                                _gdk_dll_hinstance,
                                 NULL);
 
       context->shape_indicator = handle;
@@ -4006,12 +4008,11 @@ gdk_win32_surface_unmaximize (GdkSurface *surface)
 }
 
 static void
-gdk_win32_surface_fullscreen (GdkSurface *window,
-                              GdkMonitor *monitor)
+gdk_win32_surface_fullscreen (GdkSurface *window)
 {
   int x, y, width, height;
   FullscreenInfo *fi;
-  HMONITOR hmonitor = NULL;
+  HMONITOR monitor;
   MONITORINFO mi;
 
   g_return_if_fail (GDK_IS_SURFACE (window));
@@ -4024,14 +4025,9 @@ gdk_win32_surface_fullscreen (GdkSurface *window,
     {
       GdkWin32Surface *impl = GDK_WIN32_SURFACE (window);
 
-      if (monitor && GDK_IS_WIN32_MONITOR (monitor))
-        hmonitor = GDK_WIN32_MONITOR (monitor)->hmonitor;
-
-      if (!hmonitor)
-        hmonitor = MonitorFromWindow (GDK_SURFACE_HWND (window), MONITOR_DEFAULTTONEAREST);
-
+      monitor = MonitorFromWindow (GDK_SURFACE_HWND (window), MONITOR_DEFAULTTONEAREST);
       mi.cbSize = sizeof (mi);
-      if (hmonitor && GetMonitorInfo (hmonitor, &mi))
+      if (monitor && GetMonitorInfo (monitor, &mi))
 	{
 	  x = mi.rcMonitor.left;
 	  y = mi.rcMonitor.top;
@@ -4873,16 +4869,9 @@ gdk_win32_toplevel_present (GdkToplevel       *toplevel,
   if (gdk_toplevel_layout_get_fullscreen (layout, &fullscreen))
     {
       if (fullscreen)
-        {
-          GdkMonitor *monitor;
-
-          monitor = gdk_toplevel_layout_get_fullscreen_monitor (layout);
-          gdk_win32_surface_fullscreen (surface, monitor);
-        }
+        gdk_win32_surface_fullscreen (surface);
       else
-        {
-          gdk_win32_surface_unfullscreen (surface);
-        }
+        gdk_win32_surface_unfullscreen (surface);
     }
 
   gdk_win32_surface_show (surface, FALSE);

gdk/win32/gdkvulkancontext-win32.c

@@ -30,6 +30,8 @@
 #include "gdkprivate-win32.h"
 #include "gdkwin32misc.h"
 
+extern HINSTANCE	 _gdk_dll_hinstance;
+
 G_DEFINE_TYPE (GdkWin32VulkanContext, gdk_win32_vulkan_context, GDK_TYPE_VULKAN_CONTEXT)
 
 static VkResult
@@ -45,7 +47,7 @@ gdk_win32_vulkan_context_create_surface (GdkVulkanContext *context,
   info.sType = VK_STRUCTURE_TYPE_WIN32_SURFACE_CREATE_INFO_KHR;
   info.pNext = NULL;
   info.flags = 0;
-  info.hinstance = this_module ();
+  info.hinstance = _gdk_dll_hinstance;
   info.hwnd = GDK_SURFACE_HWND (window);
 
   /* This is necessary so that Vulkan sees the Window.

gdk/x11/gdkdisplay-x11.h

@@ -144,8 +144,7 @@ struct _GdkX11Display
   guint server_time_is_monotonic_time : 1;
 
   /* GLX extensions we check */
-  guint has_glx_sgi_swap_control : 1;
-  guint has_glx_swap_control : 1;
+  guint has_glx_swap_interval : 1;
   guint has_glx_create_context : 1;
   guint has_glx_texture_from_pixmap : 1;
   guint has_glx_video_sync : 1;

gdk/x11/gdkdrag-x11.c

@@ -134,6 +134,35 @@ struct _GdkX11DragClass
   GdkDragClass parent_class;
 };
 
+typedef struct {
+  int keysym;
+  int modifiers;
+} GrabKey;
+
+static GrabKey grab_keys[] = {
+  { XK_Escape, 0 },
+  { XK_space, 0 },
+  { XK_KP_Space, 0 },
+  { XK_Return, 0 },
+  { XK_KP_Enter, 0 },
+  { XK_Up, 0 },
+  { XK_Up, Mod1Mask },
+  { XK_Down, 0 },
+  { XK_Down, Mod1Mask },
+  { XK_Left, 0 },
+  { XK_Left, Mod1Mask },
+  { XK_Right, 0 },
+  { XK_Right, Mod1Mask },
+  { XK_KP_Up, 0 },
+  { XK_KP_Up, Mod1Mask },
+  { XK_KP_Down, 0 },
+  { XK_KP_Down, Mod1Mask },
+  { XK_KP_Left, 0 },
+  { XK_KP_Left, Mod1Mask },
+  { XK_KP_Right, 0 },
+  { XK_KP_Right, Mod1Mask }
+};
+
 /* Forward declarations */
 
 static GdkSurfaceCache *gdk_surface_cache_ref   (GdkSurfaceCache *cache);
@@ -1832,15 +1861,20 @@ drag_grab (GdkDrag *drag)
 {
   GdkX11Drag *x11_drag = GDK_X11_DRAG (drag);
   GdkSeatCapabilities capabilities;
+  GdkDisplay *display;
+  Window root;
   GdkSeat *seat;
+  int keycode, i;
   GdkCursor *cursor;
 
   if (!x11_drag->ipc_surface)
     return FALSE;
 
+  display = gdk_drag_get_display (drag);
+  root = GDK_DISPLAY_XROOTWIN (display);
   seat = gdk_device_get_seat (gdk_drag_get_device (drag));
 
-  capabilities = GDK_SEAT_CAPABILITY_ALL_POINTING;
+  capabilities = GDK_SEAT_CAPABILITY_ALL_POINTING | GDK_SEAT_CAPABILITY_KEYBOARD;
 
   cursor = gdk_drag_get_cursor (drag, x11_drag->current_action);
   g_set_object (&x11_drag->cursor, cursor);
@@ -1852,6 +1886,46 @@ drag_grab (GdkDrag *drag)
 
   g_set_object (&x11_drag->grab_seat, seat);
 
+  gdk_x11_display_error_trap_push (display);
+
+  for (i = 0; i < G_N_ELEMENTS (grab_keys); ++i)
+    {
+      int deviceid = gdk_x11_device_get_id (gdk_seat_get_keyboard (seat));
+      unsigned char mask[XIMaskLen(XI_LASTEVENT)];
+      XIGrabModifiers mods;
+      XIEventMask evmask;
+      int num_mods;
+
+      keycode = XKeysymToKeycode (GDK_DISPLAY_XDISPLAY (display),
+                                  grab_keys[i].keysym);
+      if (keycode == NoSymbol)
+        continue;
+
+      memset (mask, 0, sizeof (mask));
+      XISetMask (mask, XI_KeyPress);
+      XISetMask (mask, XI_KeyRelease);
+
+      evmask.deviceid = deviceid;
+      evmask.mask_len = sizeof (mask);
+      evmask.mask = mask;
+
+      num_mods = 1;
+      mods.modifiers = grab_keys[i].modifiers;
+
+      XIGrabKeycode (GDK_DISPLAY_XDISPLAY (display),
+                     deviceid,
+                     keycode,
+                     root,
+                     GrabModeAsync,
+                     GrabModeAsync,
+                     False,
+                     &evmask,
+                     num_mods,
+                     &mods);
+    }
+
+  gdk_x11_display_error_trap_pop_ignored (display);
+
   return TRUE;
 }
 
@@ -1859,13 +1933,41 @@ static void
 drag_ungrab (GdkDrag *drag)
 {
   GdkX11Drag *x11_drag = GDK_X11_DRAG (drag);
+  GdkDisplay *display;
+  GdkDevice *keyboard;
+  Window root;
+  int keycode, i;
 
   if (!x11_drag->grab_seat)
     return;
 
   gdk_seat_ungrab (x11_drag->grab_seat);
 
+  display = gdk_drag_get_display (drag);
+  keyboard = gdk_seat_get_keyboard (x11_drag->grab_seat);
+  root = GDK_DISPLAY_XROOTWIN (display);
   g_clear_object (&x11_drag->grab_seat);
+
+  for (i = 0; i < G_N_ELEMENTS (grab_keys); ++i)
+    {
+      XIGrabModifiers mods;
+      int num_mods;
+
+      keycode = XKeysymToKeycode (GDK_DISPLAY_XDISPLAY (display),
+                                  grab_keys[i].keysym);
+      if (keycode == NoSymbol)
+        continue;
+
+      num_mods = 1;
+      mods.modifiers = grab_keys[i].modifiers;
+
+      XIUngrabKeycode (GDK_DISPLAY_XDISPLAY (display),
+                       gdk_x11_device_get_id (keyboard),
+                       keycode,
+                       root,
+                       num_mods,
+                       &mods);
+    }
 }
 
 GdkDrag *
@@ -2089,6 +2191,103 @@ gdk_dnd_handle_motion_event (GdkDrag  *drag,
   return TRUE;
 }
 
+static gboolean
+gdk_dnd_handle_key_event (GdkDrag  *drag,
+                          GdkEvent *event)
+{
+  GdkX11Drag *x11_drag = GDK_X11_DRAG (drag);
+  GdkModifierType state;
+  GdkDevice *pointer;
+  GdkSeat *seat;
+  int dx, dy;
+
+  dx = dy = 0;
+  state = gdk_event_get_modifier_state (event);
+  seat = gdk_event_get_seat (event);
+  pointer = gdk_seat_get_pointer (seat);
+
+  if (event->event_type == GDK_KEY_PRESS)
+    {
+      guint keyval = gdk_key_event_get_keyval (event);
+
+      switch (keyval)
+        {
+        case GDK_KEY_Escape:
+          gdk_drag_cancel (drag, GDK_DRAG_CANCEL_USER_CANCELLED);
+          return TRUE;
+
+        case GDK_KEY_space:
+        case GDK_KEY_Return:
+        case GDK_KEY_ISO_Enter:
+        case GDK_KEY_KP_Enter:
+        case GDK_KEY_KP_Space:
+          if ((gdk_drag_get_selected_action (drag) != 0) &&
+              (x11_drag->proxy_xid != None))
+            {
+              g_signal_emit_by_name (drag, "drop-performed");
+            }
+          else
+            gdk_drag_cancel (drag, GDK_DRAG_CANCEL_NO_TARGET);
+
+          return TRUE;
+
+        case GDK_KEY_Up:
+        case GDK_KEY_KP_Up:
+          dy = (state & GDK_ALT_MASK) ? -BIG_STEP : -SMALL_STEP;
+          break;
+
+        case GDK_KEY_Down:
+        case GDK_KEY_KP_Down:
+          dy = (state & GDK_ALT_MASK) ? BIG_STEP : SMALL_STEP;
+          break;
+
+        case GDK_KEY_Left:
+        case GDK_KEY_KP_Left:
+          dx = (state & GDK_ALT_MASK) ? -BIG_STEP : -SMALL_STEP;
+          break;
+
+        case GDK_KEY_Right:
+        case GDK_KEY_KP_Right:
+          dx = (state & GDK_ALT_MASK) ? BIG_STEP : SMALL_STEP;
+          break;
+
+        default:
+          break;
+        }
+    }
+
+  /* The state is not yet updated in the event, so we need
+   * to query it here. We could use XGetModifierMapping, but
+   * that would be overkill.
+   */
+  gdk_x11_device_xi2_query_state (pointer, NULL, NULL, NULL, &state);
+
+  if (dx != 0 || dy != 0)
+    {
+      GdkDisplay *display;
+      Display *xdisplay;
+      GdkX11Screen *screen;
+      Window dest;
+
+      x11_drag->last_x += dx;
+      x11_drag->last_y += dy;
+
+      display = gdk_event_get_display ((GdkEvent *)event);
+      xdisplay = GDK_DISPLAY_XDISPLAY (display);
+      screen = GDK_X11_DISPLAY (display)->screen;
+      dest = GDK_SCREEN_XROOTWIN (screen);
+
+      XWarpPointer (xdisplay, None, dest, 0, 0, 0, 0,
+                   round (x11_drag->last_x * screen->surface_scale),
+                   round (x11_drag->last_y * screen->surface_scale));
+    }
+
+  gdk_drag_update (drag, x11_drag->last_x, x11_drag->last_y, state,
+                   gdk_event_get_time (event));
+
+  return TRUE;
+}
+
 static gboolean
 gdk_dnd_handle_grab_broken_event (GdkDrag  *drag,
                                   GdkEvent *event)
@@ -2155,6 +2354,10 @@ gdk_x11_drag_handle_event (GdkDrag        *drag,
     case GDK_BUTTON_RELEASE:
       return gdk_dnd_handle_button_event (drag, event);
 
+    case GDK_KEY_PRESS:
+    case GDK_KEY_RELEASE:
+      return gdk_dnd_handle_key_event (drag, event);
+
     case GDK_GRAB_BROKEN:
       return gdk_dnd_handle_grab_broken_event (drag, event);
 

gdk/x11/gdkglcontext-glx.c

@@ -162,7 +162,7 @@ gdk_x11_gl_context_glx_end_frame (GdkDrawContext *draw_context,
       if (display_x11->has_glx_video_sync)
         glXGetVideoSyncSGI (&end_frame_counter);
 
-      if (self->do_frame_sync && !display_x11->has_glx_sgi_swap_control && !display_x11->has_glx_swap_control)
+      if (self->do_frame_sync && !display_x11->has_glx_swap_interval)
         {
           glFinish ();
 
@@ -249,7 +249,7 @@ gdk_x11_gl_context_glx_make_current (GdkGLContext *context,
   if (!glXMakeContextCurrent (dpy, drawable, drawable, self->glx_context))
     return FALSE;
 
-  if (!surfaceless)
+  if (!surfaceless && GDK_X11_DISPLAY (display)->has_glx_swap_interval)
     {
       /* If the WM is compositing there is no particular need to delay
        * the swap when drawing on the offscreen, rendering to the screen
@@ -257,35 +257,14 @@ gdk_x11_gl_context_glx_make_current (GdkGLContext *context,
        * to the vblank. */
       do_frame_sync = ! gdk_display_is_composited (display);
 
-      if (GDK_X11_DISPLAY (display)->has_glx_swap_control)
+      if (do_frame_sync != self->do_frame_sync)
         {
-          if (do_frame_sync != self->do_frame_sync)
-            {
-              self->do_frame_sync = do_frame_sync;
+          self->do_frame_sync = do_frame_sync;
 
-              if (do_frame_sync)
-                glXSwapIntervalEXT (dpy, drawable, 1);
-              else
-                glXSwapIntervalEXT (dpy, drawable, 0);
-            }
-        }
-      else if (GDK_X11_DISPLAY (display)->has_glx_sgi_swap_control)
-        {
-          /* If the WM is compositing there is no particular need to delay
-           * the swap when drawing on the offscreen, rendering to the screen
-           * happens later anyway, and its up to the compositor to sync that
-           * to the vblank. */
-          do_frame_sync = ! gdk_display_is_composited (display);
-
-          if (do_frame_sync != self->do_frame_sync)
-            {
-              self->do_frame_sync = do_frame_sync;
-
-              if (do_frame_sync)
-                glXSwapIntervalSGI (1);
-              else
-                glXSwapIntervalSGI (0);
-            }
+          if (do_frame_sync)
+            glXSwapIntervalSGI (1);
+          else
+            glXSwapIntervalSGI (0);
         }
     }
 
@@ -308,20 +287,29 @@ gdk_x11_gl_context_glx_get_damage (GdkGLContext *context)
       glXQueryDrawable (dpy, gdk_x11_gl_context_glx_get_drawable (self),
                         GLX_BACK_BUFFER_AGE_EXT, &buffer_age);
 
-      if (buffer_age > 0 && buffer_age <= GDK_GL_MAX_TRACKED_BUFFERS)
+      switch (buffer_age)
         {
-          cairo_region_t *damage = cairo_region_create ();
-          int i;
+          case 1:
+            return cairo_region_create ();
+            break;
 
-          for (i = 0; i < buffer_age - 1; i++)
-            {
-              if (context->old_updated_area[i] == NULL)
-                return GDK_GL_CONTEXT_CLASS (gdk_x11_gl_context_glx_parent_class)->get_damage (context);
+          case 2:
+            if (context->old_updated_area[0])
+              return cairo_region_copy (context->old_updated_area[0]);
+            break;
 
-              cairo_region_union (damage, context->old_updated_area[i]);
-            }
+          case 3:
+            if (context->old_updated_area[0] &&
+                context->old_updated_area[1])
+              {
+                cairo_region_t *damage = cairo_region_copy (context->old_updated_area[0]);
+                cairo_region_union (damage, context->old_updated_area[1]);
+                return damage;
+              }
+            break;
 
-          return damage;
+          default:
+            ;
         }
     }
 
@@ -543,14 +531,14 @@ gdk_x11_context_create_glx_context (GdkGLContext *context,
   if (share != NULL)
     share_glx = GDK_X11_GL_CONTEXT_GLX (share);
 
+  gdk_x11_display_error_trap_push (display);
+
   supported_versions = gdk_gl_versions_get_for_api (api);
   for (j = 0; gdk_gl_version_greater_equal (&supported_versions[j], &version); j++)
     {
       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 +556,22 @@ 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)
         break;
     }
 
+  if (ctx == NULL)
+    {
+      gdk_x11_display_error_trap_pop_ignored (display);
+      return 0;
+    }
+
+  if (gdk_x11_display_error_trap_pop (display))
+    {
+      glXDestroyContext (dpy, ctx);
+      return 0;
+    }
+
   GDK_DISPLAY_DEBUG (display, OPENGL,
                      "Realized GLX context[%p], %s, version: %d.%d",
                      context_glx->glx_context,
@@ -954,10 +945,8 @@ gdk_x11_display_init_glx (GdkX11Display  *display_x11,
     epoxy_has_glx_extension (dpy, screen_num, "GLX_ARB_create_context_profile");
   display_x11->has_glx_create_es2_context =
     epoxy_has_glx_extension (dpy, screen_num, "GLX_EXT_create_context_es2_profile");
-  display_x11->has_glx_sgi_swap_control =
+  display_x11->has_glx_swap_interval =
     epoxy_has_glx_extension (dpy, screen_num, "GLX_SGI_swap_control");
-  display_x11->has_glx_swap_control =
-    epoxy_has_glx_extension (dpy, screen_num, "GLX_EXT_swap_control");
   display_x11->has_glx_texture_from_pixmap =
     epoxy_has_glx_extension (dpy, screen_num, "GLX_EXT_texture_from_pixmap");
   display_x11->has_glx_video_sync =
@@ -1018,7 +1007,6 @@ gdk_x11_display_init_glx (GdkX11Display  *display_x11,
                        "\t* GLX_ARB_create_context_profile: %s\n"
                        "\t* GLX_EXT_create_context_es2_profile: %s\n"
                        "\t* GLX_SGI_swap_control: %s\n"
-                       "\t* GLX_EXT_swap_control: %s\n"
                        "\t* GLX_EXT_texture_from_pixmap: %s\n"
                        "\t* GLX_SGI_video_sync: %s\n"
                        "\t* GLX_EXT_buffer_age: %s\n"
@@ -1030,8 +1018,7 @@ gdk_x11_display_init_glx (GdkX11Display  *display_x11,
                      glXGetClientString (dpy, GLX_VENDOR),
                      display_x11->has_glx_create_context ? "yes" : "no",
                      display_x11->has_glx_create_es2_context ? "yes" : "no",
-                     display_x11->has_glx_sgi_swap_control ? "yes" : "no",
-                     display_x11->has_glx_swap_control ? "yes" : "no",
+                     display_x11->has_glx_swap_interval ? "yes" : "no",
                      display_x11->has_glx_texture_from_pixmap ? "yes" : "no",
                      display_x11->has_glx_video_sync ? "yes" : "no",
                      display_x11->has_glx_buffer_age ? "yes" : "no",

gdk/x11/gdkscreen-x11.c

@@ -685,13 +685,8 @@ init_randr13 (GdkX11Screen *x11_screen)
   for (i = 0; i < resources->noutput; ++i)
     {
       RROutput output = resources->outputs[i];
-      XRROutputInfo *output_info;
-
-      gdk_x11_display_error_trap_push (display);
-      output_info = XRRGetOutputInfo (x11_screen->xdisplay, resources, output);
-
-      if (gdk_x11_display_error_trap_pop (display))
-        continue;
+      XRROutputInfo *output_info =
+        XRRGetOutputInfo (x11_screen->xdisplay, resources, output);
 
       if (output_info->connection == RR_Disconnected)
         {
@@ -702,22 +697,13 @@ init_randr13 (GdkX11Screen *x11_screen)
       if (output_info->crtc)
 	{
 	  GdkX11Monitor *monitor;
-          XRRCrtcInfo *crtc;
+	  XRRCrtcInfo *crtc = XRRGetCrtcInfo (x11_screen->xdisplay, resources, output_info->crtc);
           char *name;
           GdkRectangle geometry;
           GdkRectangle newgeo;
           int j;
           int refresh_rate = 0;
 
-          gdk_x11_display_error_trap_push (display);
-          crtc = XRRGetCrtcInfo (x11_screen->xdisplay, resources, output_info->crtc);
-
-          if (gdk_x11_display_error_trap_pop (display))
-            {
-              XRRFreeOutputInfo (output_info);
-              continue;
-            }
-
           for (j = 0; j < resources->nmode; j++)
             {
               XRRModeInfo *xmode = &resources->modes[j];
@@ -789,10 +775,8 @@ init_randr13 (GdkX11Screen *x11_screen)
     }
 
   x11_display->primary_monitor = 0;
-  gdk_x11_display_error_trap_push (display);
   primary_output = XRRGetOutputPrimary (x11_screen->xdisplay,
                                         x11_screen->xroot_window);
-  gdk_x11_display_error_trap_pop_ignored (display);
 
   for (i = 0; i < g_list_model_get_n_items (G_LIST_MODEL (x11_display->monitors)); i++)
     {

gdk/x11/gdkselectioninputstream-x11.c

@@ -89,7 +89,7 @@ gdk_x11_selection_input_stream_fill_buffer (GdkX11SelectionInputStream *stream,
     if (size == 0)
       {
         /* EOF marker, put it back */
-        g_async_queue_push_front_unlocked (priv->chunks, g_steal_pointer (&bytes));
+        g_async_queue_push_front_unlocked (priv->chunks, bytes);
         break;
       }
     else if (size > count)
@@ -107,7 +107,7 @@ gdk_x11_selection_input_stream_fill_buffer (GdkX11SelectionInputStream *stream,
           memcpy (buffer, g_bytes_get_data (bytes, NULL), size);
       }
 
-    g_bytes_unref (g_steal_pointer (&bytes));
+    g_bytes_unref (bytes);
     result += size;
     if (buffer)
       buffer += size;
@@ -165,7 +165,9 @@ gdk_x11_selection_input_stream_complete (GdkX11SelectionInputStream *stream)
   GDK_X11_DISPLAY (priv->display)->streams = g_slist_remove (GDK_X11_DISPLAY (priv->display)->streams, stream);
   g_signal_handlers_disconnect_by_func (priv->display,
                                         gdk_x11_selection_input_stream_xevent,
-                                        g_steal_pointer (&stream));
+                                        stream);
+
+  g_object_unref (stream);
 }
 
 static gssize
@@ -414,7 +416,7 @@ gdk_x11_selection_input_stream_xevent (GdkDisplay   *display,
                              "%s:%s: got PropertyNotify erroring out of INCR",
                              priv->selection, priv->target);
           /* error, should we signal one? */
-          g_clear_pointer (&stream, gdk_x11_selection_input_stream_complete);
+          gdk_x11_selection_input_stream_complete (stream);
         }
       else if (g_bytes_get_size (bytes) == 0 || type == None)
         {
@@ -422,7 +424,7 @@ gdk_x11_selection_input_stream_xevent (GdkDisplay   *display,
                              "%s:%s: got PropertyNotify ending INCR",
                              priv->selection, priv->target);
           g_bytes_unref (bytes);
-          g_clear_pointer (&stream, gdk_x11_selection_input_stream_complete);
+          gdk_x11_selection_input_stream_complete (stream);
         }
       else
         {
@@ -465,7 +467,7 @@ gdk_x11_selection_input_stream_xevent (GdkDisplay   *display,
                                      G_IO_ERROR,
                                      G_IO_ERROR_NOT_FOUND,
                                      _("Format %s not supported"), priv->target);
-            g_clear_pointer (&stream, gdk_x11_selection_input_stream_complete);
+            gdk_x11_selection_input_stream_complete (stream);
           }
         else
           {
@@ -476,7 +478,7 @@ gdk_x11_selection_input_stream_xevent (GdkDisplay   *display,
 
             if (bytes == NULL)
               {
-                g_clear_pointer (&stream, gdk_x11_selection_input_stream_complete);
+                gdk_x11_selection_input_stream_complete (stream);
               }
             else
               {
@@ -498,7 +500,7 @@ gdk_x11_selection_input_stream_xevent (GdkDisplay   *display,
                                        g_bytes_get_size (bytes));
                     g_async_queue_push (priv->chunks, bytes);
 
-                    g_clear_pointer (&stream, gdk_x11_selection_input_stream_complete);
+                    gdk_x11_selection_input_stream_complete (stream);
                   }
               }
 
@@ -539,10 +541,7 @@ gdk_x11_selection_input_stream_new_async (GdkDisplay          *display,
   priv->property = g_strdup_printf ("GDK_SELECTION_%p", stream); 
   priv->xproperty = gdk_x11_get_xatom_by_name_for_display (display, priv->property);
 
-  g_signal_connect_data (display, "xevent",
-                         G_CALLBACK (gdk_x11_selection_input_stream_xevent),
-                         g_steal_pointer (&stream),
-                         (GClosureNotify) g_object_unref, 0);
+  g_signal_connect (display, "xevent", G_CALLBACK (gdk_x11_selection_input_stream_xevent), stream);
 
   XConvertSelection (GDK_DISPLAY_XDISPLAY (display),
                      priv->xselection,
@@ -578,6 +577,7 @@ gdk_x11_selection_input_stream_new_finish (GAsyncResult  *result,
         *type = priv->type;
       if (format)
         *format = priv->format;
+      g_object_ref (stream);
     }
 
   return G_INPUT_STREAM (stream);

gdk/x11/gdksurface-x11.c

@@ -5318,8 +5318,7 @@ gdk_x11_toplevel_export_handle_finish (GdkToplevel   *toplevel,
 }
 
 static void
-gdk_x11_toplevel_unexport_handle (GdkToplevel *toplevel,
-                                  const char  *handle)
+gdk_x11_toplevel_unexport_handle (GdkToplevel *toplevel)
 {
 }
 

gsk/gl/gskglcommandqueue.c

@@ -579,7 +579,7 @@ discard_batch (GskGLCommandQueue *self)
   self->batches.len--;
 }
 
-gboolean
+void
 gsk_gl_command_queue_begin_draw (GskGLCommandQueue   *self,
                                  GskGLUniformProgram *program,
                                  guint                width,
@@ -596,7 +596,7 @@ gsk_gl_command_queue_begin_draw (GskGLCommandQueue   *self,
    * of batches we can have in one frame.
    */
   if (will_ignore_batch (self))
-    return FALSE;
+    return;
 
   self->program_info = program;
 
@@ -617,8 +617,6 @@ gsk_gl_command_queue_begin_draw (GskGLCommandQueue   *self,
   self->fbo_max = MAX (self->fbo_max, batch->draw.framebuffer);
 
   self->in_draw = TRUE;
-
-  return TRUE;
 }
 
 void
@@ -723,10 +721,6 @@ gsk_gl_command_queue_split_draw (GskGLCommandQueue *self)
 
   g_assert (GSK_IS_GL_COMMAND_QUEUE (self));
   g_assert (self->batches.len > 0);
-
-  if (will_ignore_batch (self))
-    return;
-
   g_assert (self->in_draw == TRUE);
 
   program = self->program_info;
@@ -1447,7 +1441,6 @@ gsk_gl_command_queue_create_framebuffer (GskGLCommandQueue *self)
   return fbo_id;
 }
 
-
 static GdkMemoryFormat
 memory_format_gl_format (GdkMemoryFormat  data_format,
                          gboolean         use_es,
@@ -1455,8 +1448,7 @@ memory_format_gl_format (GdkMemoryFormat  data_format,
                          guint            minor,
                          guint           *gl_internalformat,
                          guint           *gl_format,
-                         guint           *gl_type,
-                         GLint          (*gl_swizzle)[4])
+                         guint           *gl_type)
 {
   if (gdk_memory_format_gl_format (data_format,
                                    use_es,
@@ -1464,9 +1456,7 @@ memory_format_gl_format (GdkMemoryFormat  data_format,
                                    minor,
                                    gl_internalformat,
                                    gl_format,
-                                   gl_type,
-                                   gl_swizzle) &&
-      gdk_memory_format_alpha (data_format) != GDK_MEMORY_ALPHA_STRAIGHT)
+                                   gl_type))
     return data_format;
 
   if (gdk_memory_format_prefers_high_depth (data_format))
@@ -1478,8 +1468,7 @@ memory_format_gl_format (GdkMemoryFormat  data_format,
                                        minor,
                                        gl_internalformat,
                                        gl_format,
-                                       gl_type,
-                                       gl_swizzle))
+                                       gl_type))
         return data_format;
     }
 
@@ -1490,8 +1479,7 @@ memory_format_gl_format (GdkMemoryFormat  data_format,
                                     minor,
                                     gl_internalformat,
                                     gl_format,
-                                    gl_type,
-                                    gl_swizzle))
+                                    gl_type))
     {
       g_assert_not_reached ();
     }
@@ -1514,7 +1502,6 @@ gsk_gl_command_queue_do_upload_texture_chunk (GskGLCommandQueue *self,
   GLenum gl_internalformat;
   GLenum gl_format;
   GLenum gl_type;
-  GLint gl_swizzle[4];
   gsize bpp;
   gboolean use_es;
   int major, minor;
@@ -1531,8 +1518,7 @@ gsk_gl_command_queue_do_upload_texture_chunk (GskGLCommandQueue *self,
                                          minor,
                                          &gl_internalformat,
                                          &gl_format,
-                                         &gl_type,
-                                         &gl_swizzle);
+                                         &gl_type);
 
   gdk_texture_downloader_init (&downloader, texture);
   gdk_texture_downloader_set_format (&downloader, data_format);
@@ -1567,18 +1553,6 @@ gsk_gl_command_queue_do_upload_texture_chunk (GskGLCommandQueue *self,
 
   glPixelStorei (GL_UNPACK_ALIGNMENT, 4);
 
-  /* Only apply swizzle if really needed, might not even be
-   * supported if default values are set
-   */
-  if (gl_swizzle[0] != GL_RED || gl_swizzle[1] != GL_GREEN || gl_swizzle[2] != GL_BLUE)
-    {
-      /* Set each channel independently since GLES 3.0 doesn't support the iv method */
-      glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_R, gl_swizzle[0]);
-      glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_G, gl_swizzle[1]);
-      glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_B, gl_swizzle[2]);
-      glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_A, gl_swizzle[3]);
-    }
-
   g_bytes_unref (bytes);
 }
 
@@ -1593,7 +1567,6 @@ gsk_gl_command_queue_upload_texture_chunks (GskGLCommandQueue    *self,
   GLenum gl_internalformat;
   GLenum gl_format;
   GLenum gl_type;
-  GLint gl_swizzle[4];
   gboolean use_es;
   int texture_id;
   int major, minor;
@@ -1632,14 +1605,13 @@ gsk_gl_command_queue_upload_texture_chunks (GskGLCommandQueue    *self,
   use_es = gdk_gl_context_get_use_es (self->context);
   gdk_gl_context_get_version (self->context, &major, &minor);
   data_format = gdk_texture_get_format (chunks[0].texture);
-  data_format = memory_format_gl_format (data_format,
-                                         use_es,
-                                         major,
-                                         minor,
-                                         &gl_internalformat,
-                                         &gl_format,
-                                         &gl_type,
-                                         &gl_swizzle);
+  memory_format_gl_format (data_format,
+                           use_es,
+                           major,
+                           minor,
+                           &gl_internalformat,
+                           &gl_format,
+                           &gl_type);
 
   glTexImage2D (GL_TEXTURE_2D, 0, gl_internalformat, width, height, 0, gl_format, gl_type, NULL);
 

gsk/gl/gskglcommandqueueprivate.h

@@ -331,7 +331,7 @@ void                gsk_gl_command_queue_delete_program       (GskGLCommandQueue
 void                gsk_gl_command_queue_clear                (GskGLCommandQueue    *self,
                                                                guint                 clear_bits,
                                                                const graphene_rect_t *viewport);
-gboolean            gsk_gl_command_queue_begin_draw           (GskGLCommandQueue    *self,
+void                gsk_gl_command_queue_begin_draw           (GskGLCommandQueue    *self,
                                                                GskGLUniformProgram  *program_info,
                                                                guint                 width,
                                                                guint                 height);

gsk/gl/gskglcompiler.c

@@ -124,7 +124,7 @@ gsk_gl_compiler_new (GskGLDriver *driver,
   self->driver = g_object_ref (driver);
   self->debug_shaders = !!debug_shaders;
 
-  context = gsk_gl_driver_get_context (self->driver);
+  context = gsk_gl_command_queue_get_context (self->driver->shared_command_queue);
 
   if (gdk_gl_context_get_use_es (context))
     {

gsk/gl/gskgldriver.c

@@ -761,8 +761,7 @@ gsk_gl_driver_load_texture (GskGLDriver *self,
       GdkGLContext *texture_context = gdk_gl_texture_get_context (gl_texture);
 
       if (gdk_gl_context_is_shared (context, texture_context) &&
-          (!ensure_mipmap || gdk_gl_texture_has_mipmap (gl_texture)) &&
-          gdk_memory_format_alpha (gdk_texture_get_format (texture)) != GDK_MEMORY_ALPHA_STRAIGHT)
+          (!ensure_mipmap || gdk_gl_texture_has_mipmap (gl_texture)))
         {
           /* A GL texture from the same GL context is a simple task... */
           return gdk_gl_texture_get_id (gl_texture);
@@ -1132,7 +1131,7 @@ gsk_gl_driver_lookup_shader (GskGLDriver  *self,
   return program;
 }
 
-#if 0
+#ifdef G_ENABLE_DEBUG
 void
 gsk_gl_driver_save_texture_to_png (GskGLDriver       *driver,
                                    int                texture_id,

gsk/gl/gskgldriverprivate.h

@@ -175,7 +175,7 @@ GskGLProgram      * gsk_gl_driver_lookup_shader          (GskGLDriver         *s
                                                           GskGLShader         *shader,
                                                           GError             **error);
 
-#if 0
+#ifdef G_ENABLE_DEBUG
 void                gsk_gl_driver_save_texture_to_png    (GskGLDriver         *self,
                                                           int                  texture_id,
                                                           int                  width,

gsk/gl/gskgltexturelibrary.c

@@ -88,7 +88,7 @@ gsk_gl_texture_library_real_compact (GskGLTextureLibrary *self,
       GskGLTextureAtlasEntry *entry;
       GHashTableIter iter;
       guint dropped = 0;
-      G_GNUC_UNUSED guint atlased = 0;
+      guint atlased = 0;
 
       g_hash_table_iter_init (&iter, self->hash_table);
       while (g_hash_table_iter_next (&iter, NULL, (gpointer *)&entry))

gsk/gskrenderer.c

@@ -372,8 +372,6 @@ 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);
 

gsk/gskrendernodeimpl.c

@@ -3956,29 +3956,27 @@ 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,
-                                          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);
-
+                                          ceilf (self->child_bounds.size.width),
+                                          ceilf (self->child_bounds.size.height));
   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);
@@ -4415,11 +4413,6 @@ gsk_shadow_node_draw (GskRenderNode *node,
   pattern = cairo_pop_group (cr);
   cairo_restore (cr);
 
-  cairo_save (cr);
-  /* clip so the blur area stays small */
-  gsk_cairo_rectangle (cr, &node->bounds);
-  cairo_clip (cr);
-
   for (i = 0; i < self->n_shadows; i++)
     {
       GskShadow *shadow = &self->shadows[i];
@@ -4441,7 +4434,6 @@ gsk_shadow_node_draw (GskRenderNode *node,
 
   cairo_set_source (cr, pattern);
   cairo_paint (cr);
-  cairo_restore (cr);
 
   cairo_pattern_destroy (pattern);
 }

gsk/gskrendernodeparser.c

@@ -1081,21 +1081,20 @@ parse_declarations (GtkCssParser      *parser,
         {
           if (gtk_css_parser_try_ident (parser, declarations[i].name))
             {
-              if (parsed & (1 << i))
-                {
-                  gtk_css_parser_warn_syntax (parser, "Variable \"%s\" defined multiple times", declarations[i].name);
-                  /* Unset, just to be sure */
-                  parsed &= ~(1 << i);
-                  if (declarations[i].clear_func)
-                    declarations[i].clear_func (declarations[i].result);
-                }
-
               if (!gtk_css_parser_try_token (parser, GTK_CSS_TOKEN_COLON))
                 {
                   gtk_css_parser_error_syntax (parser, "Expected ':' after variable declaration");
                 }
               else
                 {
+                  if (parsed & (1 << i))
+                    {
+                      gtk_css_parser_warn_syntax (parser, "Variable \"%s\" defined multiple times", declarations[i].name);
+                      /* Unset, just to be sure */
+                      parsed &= ~(1 << i);
+                      if (declarations[i].clear_func)
+                        declarations[i].clear_func (declarations[i].result);
+                    }
                   if (!declarations[i].parse_func (parser, context, declarations[i].result))
                     {
                       /* nothing to do */
@@ -2892,14 +2891,6 @@ append_texture_param (Printer    *p,
     case GDK_MEMORY_R16G16B16:
     case GDK_MEMORY_R16G16B16A16_PREMULTIPLIED:
     case GDK_MEMORY_R16G16B16A16:
-    case GDK_MEMORY_G8A8_PREMULTIPLIED:
-    case GDK_MEMORY_G8A8:
-    case GDK_MEMORY_G8:
-    case GDK_MEMORY_G16A16_PREMULTIPLIED:
-    case GDK_MEMORY_G16A16:
-    case GDK_MEMORY_G16:
-    case GDK_MEMORY_A8:
-    case GDK_MEMORY_A16:
       bytes = gdk_texture_save_to_png_bytes (texture);
       g_string_append (p->str, "url(\"data:image/png;base64,");
       break;

gsk/gskroundedrect.c

@@ -689,132 +689,228 @@ 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)
+static inline void
+rect_corner (const graphene_rect_t *r,
+             unsigned int           i,
+             graphene_point_t      *p)
 {
-  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))
+  switch (i)
     {
-      result->corner[corner] = in->corner[corner];
-      return TRUE;
+    case GSK_CORNER_TOP_LEFT:
+      graphene_rect_get_top_left (r, p);
+      break;
+    case GSK_CORNER_TOP_RIGHT:
+      graphene_rect_get_top_right (r, p);
+      break;
+    case GSK_CORNER_BOTTOM_RIGHT:
+      graphene_rect_get_bottom_right (r, p);
+      break;
+    case GSK_CORNER_BOTTOM_LEFT:
+      graphene_rect_get_bottom_left (r, p);
+      break;
+    default:
+      g_assert_not_reached ();
     }
+}
 
-  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)
+static inline void
+corner_rect (const GskRoundedRect *s,
+             unsigned int          i,
+             graphene_rect_t      *r)
+{
+  switch (i)
     {
-      result->corner[corner] = out->corner[corner];
-      return TRUE;
+    case GSK_CORNER_TOP_LEFT:
+      graphene_rect_init (r,
+                          s->bounds.origin.x,
+                          s->bounds.origin.y,
+                          s->corner[i].width,
+                          s->corner[i].height);
+      break;
+    case GSK_CORNER_TOP_RIGHT:
+      graphene_rect_init (r,
+                          s->bounds.origin.x + s->bounds.size.width - s->corner[i].width,
+                          s->bounds.origin.y,
+                          s->corner[i].width,
+                          s->corner[i].height);
+      break;
+    case GSK_CORNER_BOTTOM_RIGHT:
+      graphene_rect_init (r,
+                          s->bounds.origin.x + s->bounds.size.width - s->corner[i].width,
+                          s->bounds.origin.y + s->bounds.size.height - s->corner[i].height,
+                          s->corner[i].width,
+                          s->corner[i].height);
+      break;
+    case GSK_CORNER_BOTTOM_LEFT:
+      graphene_rect_init (r,
+                          s->bounds.origin.x,
+                          s->bounds.origin.y + s->bounds.size.height - s->corner[i].height,
+                          s->corner[i].width,
+                          s->corner[i].height);
+      break;
+    default:
+      g_assert_not_reached ();
+    }
+}
+
+static inline gboolean
+point_in_interior (const graphene_point_t *p,
+                   const graphene_rect_t  *r)
+{
+  if (graphene_rect_contains_point (r, p))
+    {
+      if (p->x > r->origin.x && p->x < r->origin.x + r->size.width)
+        return TRUE;
+
+      if (p->y > r->origin.y && p->y < r->origin.y + r->size.height)
+        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)
+gsk_rounded_rect_intersect (const GskRoundedRect *self,
+                            const GskRoundedRect *other,
+                            GskRoundedRect       *result)
 {
-  float top, left, bottom, right;
-
-  if (!graphene_rect_intersection (&a->bounds, &b->bounds, &result->bounds))
+  if (!graphene_rect_intersection (&self->bounds, &other->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;
+  for (unsigned int i = 0; i < 4; i++)
+    {
+      graphene_point_t p, p1, p2;
 
-  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;
+      rect_corner (&self->bounds, i, &p1);
+      rect_corner (&other->bounds, i, &p2);
+      rect_corner (&result->bounds, i, &p);
 
-  return GSK_INTERSECTION_NOT_REPRESENTABLE;
+      if (graphene_point_equal (&p, &p1))
+        {
+          if (graphene_point_equal (&p, &p2))
+            {
+              graphene_rect_t c;
+              graphene_rect_t d;
+
+              corner_rect (self, i, &c);
+              corner_rect (other, i, &d);
+
+              /* corners coincide */
+              if (graphene_rect_contains_rect (&c, &d))
+                {
+                  graphene_point_t q1, q2;
+
+                  rect_corner (&c, (i + 1) % 4, &q1);
+                  rect_corner (&c, (i + 3) % 4, &q2);
+
+                  if (gsk_rounded_rect_contains_point (other, &q1) &&
+                      gsk_rounded_rect_contains_point (other, &q2))
+                    result->corner[i] = self->corner[i];
+                  else
+                    return GSK_INTERSECTION_NOT_REPRESENTABLE;
+                }
+              else if (graphene_rect_contains_rect (&d, &c))
+                {
+                  graphene_point_t q1, q2;
+
+                  rect_corner (&d, (i + 1) % 4, &q1);
+                  rect_corner (&d, (i + 3) % 4, &q2);
+
+                  if (gsk_rounded_rect_contains_point (self, &q1) &&
+                      gsk_rounded_rect_contains_point (self, &q2))
+                    result->corner[i] = other->corner[i];
+                  else
+                    return GSK_INTERSECTION_NOT_REPRESENTABLE;
+                }
+              else
+                return GSK_INTERSECTION_NOT_REPRESENTABLE;
+            }
+          else
+            {
+              graphene_rect_t c;
+              graphene_point_t q1, q2;
+
+              corner_rect (self, i, &c);
+
+              rect_corner (&c, (i + 1) % 4, &q1);
+              rect_corner (&c, (i + 3) % 4, &q2);
+
+              if (gsk_rounded_rect_contains_point (other, &q1) &&
+                  gsk_rounded_rect_contains_point (other, &q2))
+                {
+                  if (gsk_rounded_rect_contains_point (other, &p))
+                    result->corner[i] = self->corner[i];
+                  else
+#if 1
+                    return GSK_INTERSECTION_NEEDS_QUARTIC;
+#else
+                  if (/* no intersection for i */)
+                    result->corner[i] = self->corner[i];
+                  else
+                    return GSK_INTERSECTION_NOT_REPRESENTABLE;
+#endif
+                }
+              else
+                return GSK_INTERSECTION_NOT_REPRESENTABLE;
+            }
+        }
+      else if (graphene_point_equal (&p, &p2))
+        {
+          graphene_rect_t d;
+          graphene_point_t q1, q2;
+
+          corner_rect (other, i, &d);
+
+          rect_corner (&d, (i + 1) % 4, &q1);
+          rect_corner (&d, (i + 3) % 4, &q2);
+
+          if (gsk_rounded_rect_contains_point (self, &q1) &&
+              gsk_rounded_rect_contains_point (self, &q2))
+            {
+              if (gsk_rounded_rect_contains_point (self, &p))
+                result->corner[i] = other->corner[i];
+              else
+#if 1
+                return GSK_INTERSECTION_NEEDS_QUARTIC;
+#else
+              if (/* no intersection for i */
+                result->corner[i] = other->corner[i];
+              else
+                return GSK_INTERSECTION_NOT_REPRESENTABLE;
+#endif
+            }
+          else
+            return GSK_INTERSECTION_NOT_REPRESENTABLE;
+        }
+      else
+        {
+          graphene_rect_t c, d;
+
+          corner_rect (self, (i + 2) % 4, &c);
+          if (graphene_rect_contains_point (&c, &p) &&
+              !gsk_rounded_rect_contains_point (self, &p))
+            return GSK_INTERSECTION_EMPTY;
+
+          corner_rect (other, (i + 2) % 4, &d);
+          if (graphene_rect_contains_point (&d, &p) &&
+              !gsk_rounded_rect_contains_point (other, &p))
+            return GSK_INTERSECTION_EMPTY;
+
+          for (unsigned int j = 0; j < 4; j++)
+            {
+              corner_rect (self, j, &c);
+              corner_rect (other, j, &d);
+
+              if (point_in_interior (&p, &c) ||
+                  point_in_interior (&p, &d))
+                return GSK_INTERSECTION_NOT_REPRESENTABLE;
+            }
+
+          result->corner[i] = (graphene_size_t) { 0, 0 };
+        }
+    }
+
+  return GSK_INTERSECTION_NONEMPTY;
 }
 
 static void
@@ -894,14 +990,13 @@ 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,
-                           const graphene_point_t *offset,
-                           float                   rect[12])
+gsk_rounded_rect_to_float (const GskRoundedRect *self,
+                           float                 rect[12])
 {
   guint i;
 
-  rect[0] = self->bounds.origin.x + offset->x;
-  rect[1] = self->bounds.origin.y + offset->y;
+  rect[0] = self->bounds.origin.x;
+  rect[1] = self->bounds.origin.y;
   rect[2] = self->bounds.size.width;
   rect[3] = self->bounds.size.height;
 

gsk/gskroundedrectprivate.h

@@ -6,24 +6,6 @@
 
 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 = { \
@@ -46,7 +28,6 @@ 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,
@@ -56,16 +37,17 @@ char *                   gsk_rounded_rect_to_string             (const GskRounde
 typedef enum {
   GSK_INTERSECTION_EMPTY,
   GSK_INTERSECTION_NONEMPTY,
-  GSK_INTERSECTION_NOT_REPRESENTABLE
+  GSK_INTERSECTION_NOT_REPRESENTABLE,
+  GSK_INTERSECTION_NEEDS_QUARTIC
 } GskRoundedRectIntersection;
 
 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);
 
+GskRoundedRectIntersection gsk_rounded_rect_intersect (const GskRoundedRect *self,
+                                                       const GskRoundedRect *other,
+                                                       GskRoundedRect       *result) G_GNUC_PURE;
 
 G_END_DECLS
 

gsk/vulkan/gskvulkanblendmodepipeline.c

@@ -12,12 +12,8 @@ typedef struct _GskVulkanBlendModeInstance GskVulkanBlendModeInstance;
 struct _GskVulkanBlendModeInstance
 {
   float 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];
+  float start_tex_rect[4];
+  float end_tex_rect[4];
   guint32 blend_mode;
 };
 
@@ -44,42 +40,18 @@ 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, top_rect),
+          .offset = G_STRUCT_OFFSET (GskVulkanBlendModeInstance, start_tex_rect),
       },
       {
           .location = 2,
           .binding = 0,
           .format = VK_FORMAT_R32G32B32A32_SFLOAT,
-          .offset = G_STRUCT_OFFSET (GskVulkanBlendModeInstance, bottom_rect),
+          .offset = G_STRUCT_OFFSET (GskVulkanBlendModeInstance, end_tex_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),
       }
   };
@@ -126,50 +98,37 @@ 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,
-                                                    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)
+                                                    guchar                *data,
+                                                    const graphene_rect_t *bounds,
+                                                    const graphene_rect_t *start_tex_rect,
+                                                    const graphene_rect_t *end_tex_rect,
+                                                    GskBlendMode blend_mode)
 {
   GskVulkanBlendModeInstance *instance = (GskVulkanBlendModeInstance *) data;
 
-  instance->rect[0] = bounds->origin.x + offset->x;
-  instance->rect[1] = bounds->origin.y + offset->y;
+  instance->rect[0] = bounds->origin.x;
+  instance->rect[1] = bounds->origin.y;
   instance->rect[2] = bounds->size.width;
   instance->rect[3] = bounds->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->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->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->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->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;
 }
 

gsk/vulkan/gskvulkanblendmodepipelineprivate.h

@@ -18,16 +18,12 @@ 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      *top_bounds,
-                                                                        const graphene_rect_t      *bottom_bounds,
-                                                                        const graphene_rect_t      *top_tex_rect,
-                                                                        const graphene_rect_t      *bottom_tex_rect,
+                                                                        const graphene_rect_t      *start_bounds,
+                                                                        const graphene_rect_t      *end_bounds,
                                                                         GskBlendMode                blend_mode);
 gsize               gsk_vulkan_blend_mode_pipeline_draw                (GskVulkanBlendModePipeline *pipeline,
                                                                         VkCommandBuffer             command_buffer,

gsk/vulkan/gskvulkanblurpipeline.c

@@ -14,7 +14,6 @@ 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)
@@ -47,12 +46,6 @@ 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 = {
@@ -98,19 +91,23 @@ 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,
-                                              guint32                 tex_id[2],
-                                              const graphene_point_t *offset,
-                                              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,
+                                              const graphene_rect_t *rect,
+                                              const graphene_rect_t *tex_rect,
+                                              double                 blur_radius)
 {
   GskVulkanBlurInstance *instance = (GskVulkanBlurInstance *) data;
 
-  instance->rect[0] = rect->origin.x + offset->x;
-  instance->rect[1] = rect->origin.y + offset->y;
+  instance->rect[0] = rect->origin.x;
+  instance->rect[1] = rect->origin.y;
   instance->rect[2] = rect->size.width;
   instance->rect[3] = rect->size.height;
   instance->tex_rect[0] = tex_rect->origin.x;
@@ -118,8 +115,6 @@ 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

gsk/vulkan/gskvulkanblurpipelineprivate.h

@@ -17,10 +17,9 @@ 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);

gsk/vulkan/gskvulkanborderpipeline.c

@@ -123,10 +123,15 @@ 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])
@@ -134,7 +139,7 @@ gsk_vulkan_border_pipeline_collect_vertex_data (GskVulkanBorderPipeline *pipelin
   GskVulkanBorderInstance *instance = (GskVulkanBorderInstance *) data;
   guint i;
 
-  gsk_rounded_rect_to_float (rect, offset, instance->rect);
+  gsk_rounded_rect_to_float (rect, instance->rect);
   for (i = 0; i < 4; i++)
     {
       instance->widths[i] = widths[i];

gsk/vulkan/gskvulkanborderpipelineprivate.h

@@ -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]);

gsk/vulkan/gskvulkanboxshadowpipeline.c

@@ -119,10 +119,15 @@ 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,
@@ -132,7 +137,7 @@ gsk_vulkan_box_shadow_pipeline_collect_vertex_data (GskVulkanBoxShadowPipeline *
 {
   GskVulkanBoxShadowInstance *instance = (GskVulkanBoxShadowInstance *) data;
 
-  gsk_rounded_rect_to_float (outline, offset, instance->outline);
+  gsk_rounded_rect_to_float (outline, instance->outline);
   instance->color[0] = color->red;
   instance->color[1] = color->green;
   instance->color[2] = color->blue;

gsk/vulkan/gskvulkanboxshadowpipelineprivate.h

@@ -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,

gsk/vulkan/gskvulkanclip.c

@@ -13,15 +13,7 @@ gsk_vulkan_clip_init_empty (GskVulkanClip         *clip,
   gsk_rounded_rect_init_from_rect (&clip->rect, rect, 0);
 }
 
-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
+static void
 gsk_vulkan_clip_init_copy (GskVulkanClip *self,
                            const GskVulkanClip *src)
 {
@@ -29,30 +21,11 @@ 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);
@@ -84,10 +57,22 @@ 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:
-      res = gsk_rounded_rect_intersect_with_rect (&src->rect, rect, &dest->rect);
-      if (!gsk_vulkan_clip_init_after_intersection (dest, res))
-        return FALSE;
+      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;
+        }
       break;
 
     default:
@@ -103,8 +88,6 @@ 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);
@@ -123,21 +106,34 @@ gsk_vulkan_clip_intersect_rounded_rect (GskVulkanClip        *dest,
       break;
 
     case GSK_VULKAN_CLIP_NONE:
-      dest->type = GSK_VULKAN_CLIP_ROUNDED;
+      dest->type = gsk_rounded_rect_is_circular (&dest->rect) ? GSK_VULKAN_CLIP_ROUNDED_CIRCULAR : GSK_VULKAN_CLIP_ROUNDED;
       gsk_rounded_rect_init_copy (&dest->rect, rounded);
       break;
 
     case GSK_VULKAN_CLIP_RECT:
-      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;
+      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;
 
+    case GSK_VULKAN_CLIP_ROUNDED_CIRCULAR:
     case GSK_VULKAN_CLIP_ROUNDED:
-      res = gsk_rounded_rect_intersection (&src->rect, rounded, &dest->rect);
-      if (!gsk_vulkan_clip_init_after_intersection (dest, res))
-        return FALSE;
-      break;
+      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;
 
     default:
       g_assert_not_reached ();
@@ -147,19 +143,6 @@ 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,
@@ -181,6 +164,7 @@ 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))
         {
@@ -236,14 +220,9 @@ gsk_vulkan_clip_transform (GskVulkanClip         *dest,
 }
 
 gboolean
-gsk_vulkan_clip_intersects_rect (const GskVulkanClip    *self,
-                                 const graphene_point_t *offset,
-                                 const graphene_rect_t  *rect)
+gsk_vulkan_clip_contains_rect (const GskVulkanClip   *self,
+                               const graphene_rect_t *rect)
 {
-  graphene_rect_t r = *rect;
-  r.origin.x += offset->x;
-  r.origin.y += offset->y;
-
   switch (self->type)
     {
     default:
@@ -255,36 +234,10 @@ gsk_vulkan_clip_intersects_rect (const GskVulkanClip    *self,
       return TRUE;
 
     case GSK_VULKAN_CLIP_RECT:
-      return graphene_rect_intersection (&self->rect.bounds, &r, NULL);
+      return graphene_rect_contains_rect (&self->rect.bounds, rect);
 
+    case GSK_VULKAN_CLIP_ROUNDED_CIRCULAR:
     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:
-      g_assert_not_reached();
-    case GSK_VULKAN_CLIP_ALL_CLIPPED:
-      return FALSE;
-
-    case GSK_VULKAN_CLIP_NONE:
-      return TRUE;
-
-    case GSK_VULKAN_CLIP_RECT:
-      return graphene_rect_contains_rect (&self->rect.bounds, &r);
-
-    case GSK_VULKAN_CLIP_ROUNDED:
-      return gsk_rounded_rect_contains_rect (&self->rect, &r);
+      return gsk_rounded_rect_contains_rect (&self->rect, rect);
     }
 }

gsk/vulkan/gskvulkanclipprivate.h

@@ -18,6 +18,10 @@ 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;
@@ -32,10 +36,6 @@ 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,20 +43,12 @@ 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

gsk/vulkan/gskvulkancolorpipeline.c

@@ -84,17 +84,22 @@ 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 + offset->x;
-  instance->rect[1] = rect->origin.y + offset->y;
+  instance->rect[0] = rect->origin.x;
+  instance->rect[1] = rect->origin.y;
   instance->rect[2] = rect->size.width;
   instance->rect[3] = rect->size.height;
   instance->color[0] = color->red;

gsk/vulkan/gskvulkancolorpipelineprivate.h

@@ -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,

gsk/vulkan/gskvulkancolortextpipeline.c

@@ -13,7 +13,6 @@ 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)
@@ -41,12 +40,6 @@ 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,
@@ -91,12 +84,18 @@ 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,
@@ -141,9 +140,6 @@ 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;

gsk/vulkan/gskvulkancolortextpipelineprivate.h

@@ -18,11 +18,12 @@ 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,

gsk/vulkan/gskvulkancrossfadepipeline.c

@@ -12,12 +12,8 @@ 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;
 };
 
@@ -44,40 +40,16 @@ 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_rect),
+          .offset = G_STRUCT_OFFSET (GskVulkanCrossFadeInstance, start_tex_rect),
       },
       {
           .location = 2,
           .binding = 0,
           .format = VK_FORMAT_R32G32B32A32_SFLOAT,
-          .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,
+          .location = 3,
           .binding = 0,
           .format = VK_FORMAT_R32_SFLOAT,
           .offset = G_STRUCT_OFFSET (GskVulkanCrossFadeInstance, progress),
@@ -126,36 +98,27 @@ 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,
-                                                    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)
+                                                    guchar                *data,
+                                                    const graphene_rect_t *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 + offset->x;
-  instance->rect[1] = bounds->origin.y + offset->y;
+  instance->rect[0] = bounds->origin.x;
+  instance->rect[1] = bounds->origin.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;
@@ -166,10 +129,6 @@ 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;
 }
 

gsk/vulkan/gskvulkancrossfadepipelineprivate.h

@@ -17,16 +17,12 @@ 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,

gsk/vulkan/gskvulkaneffectpipeline.c

@@ -15,7 +15,6 @@ 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)
@@ -72,12 +71,6 @@ 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 = {
@@ -123,11 +116,15 @@ 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,
@@ -135,8 +132,8 @@ gsk_vulkan_effect_pipeline_collect_vertex_data (GskVulkanEffectPipeline *pipelin
 {
   GskVulkanEffectInstance *instance = (GskVulkanEffectInstance *) data;
 
-  instance->rect[0] = rect->origin.x + offset->x;
-  instance->rect[1] = rect->origin.y + offset->y;
+  instance->rect[0] = rect->origin.x;
+  instance->rect[1] = rect->origin.y;
   instance->rect[2] = rect->size.width;
   instance->rect[3] = rect->size.height;
   instance->tex_rect[0] = tex_rect->origin.x;
@@ -145,8 +142,6 @@ 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

gsk/vulkan/gskvulkaneffectpipelineprivate.h

@@ -17,10 +17,9 @@ 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,

gsk/vulkan/gskvulkanglyphcache.c

@@ -450,7 +450,7 @@ gsk_vulkan_glyph_cache_begin_frame (GskVulkanGlyphCache *cache)
   GHashTableIter iter;
   GlyphCacheKey *key;
   GskVulkanCachedGlyph *value;
-  G_GNUC_UNUSED guint dropped = 0;
+  guint dropped = 0;
 
   cache->timestamp++;
 

gsk/vulkan/gskvulkanimage.c

@@ -209,8 +209,6 @@ gsk_vulkan_image_new (GdkVulkanContext      *context,
   VkMemoryRequirements requirements;
   GskVulkanImage *self;
 
-  g_assert (width > 0 && height > 0);
-
   self = g_object_new (GSK_TYPE_VULKAN_IMAGE, NULL);
 
   self->vulkan = g_object_ref (context);
@@ -608,9 +606,9 @@ gsk_vulkan_image_new_for_atlas (GdkVulkanContext *context,
 }
 
 GskVulkanImage *
-gsk_vulkan_image_new_for_offscreen (GdkVulkanContext *context,
-                                    gsize             width,
-                                    gsize             height)
+gsk_vulkan_image_new_for_texture (GdkVulkanContext *context,
+                                  gsize             width,
+                                  gsize             height)
 {
   GskVulkanImage *self;
 
@@ -622,7 +620,7 @@ gsk_vulkan_image_new_for_offscreen (GdkVulkanContext *context,
                                VK_IMAGE_USAGE_SAMPLED_BIT |
                                VK_IMAGE_USAGE_TRANSFER_SRC_BIT,
                                VK_IMAGE_LAYOUT_UNDEFINED,
-                               VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT,
+                               0,
                                VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT);
 
   gsk_vulkan_image_ensure_view (self, VK_FORMAT_B8G8R8A8_UNORM);

gsk/vulkan/gskvulkanimageprivate.h

@@ -49,7 +49,7 @@ GskVulkanImage *        gsk_vulkan_image_new_for_framebuffer            (GdkVulk
 GskVulkanImage *        gsk_vulkan_image_new_for_atlas                  (GdkVulkanContext       *context,
                                                                          gsize                   width,
                                                                          gsize                   height);
-GskVulkanImage *        gsk_vulkan_image_new_for_offscreen              (GdkVulkanContext       *context,
+GskVulkanImage *        gsk_vulkan_image_new_for_texture                (GdkVulkanContext       *context,
                                                                          gsize                   width,
                                                                          gsize                   height);
 

gsk/vulkan/gskvulkanlineargradientpipeline.c

@@ -167,10 +167,15 @@ 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_point_t    *offset,
                                                          const graphene_rect_t     *rect,
                                                          const graphene_point_t    *start,
                                                          const graphene_point_t    *end,
@@ -186,14 +191,14 @@ gsk_vulkan_linear_gradient_pipeline_collect_vertex_data (GskVulkanLinearGradient
       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 + offset->x;
-  instance->rect[1] = rect->origin.y + offset->y;
+  instance->rect[0] = rect->origin.x;
+  instance->rect[1] = rect->origin.y;
   instance->rect[2] = rect->size.width;
   instance->rect[3] = rect->size.height;
-  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->start[0] = start->x;
+  instance->start[1] = start->y;
+  instance->end[0] = end->x;
+  instance->end[1] = end->y;
   instance->repeating = repeating;
   instance->stop_count = n_stops;
   for (i = 0; i < n_stops; i++)

gsk/vulkan/gskvulkanlineargradientpipelineprivate.h

@@ -20,10 +20,11 @@ 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,