gsk: Always use RGBA on big-endian architectures

The memorytexture test started failing on big-endian CPUs while using
"desktop" GL (not GLES) in commit b0e26873 "gsk: Use has_bgra in more
places". The subsequent commit f5812808 "gsk: Restore bigendian support"
was meant to fix this, but it seems it did not.

Always taking the RGBA code-path on big-endian might not be optimal,
but it seems to result in the test passing again.

Signed-off-by: Simon McVittie <smcv@debian.org>
Resolves: https://gitlab.gnome.org/GNOME/gtk/-/issues/6260

.gitlab-ci/flatpak-build.sh

@@ -19,7 +19,6 @@ flatpak build ${builddir} meson \
                 --buildtype=debugoptimized \
                 -Dx11-backend=true \
                 -Dwayland-backend=true \
-                -Dvulkan=disabled \
                 -Dbuild-tests=false \
                 -Dbuild-testsuite=false \
                 -Dbuild-examples=false \
@@ -28,7 +27,7 @@ flatpak build ${builddir} meson \
                 -Ddemo-profile=devel \
                 _flatpak_build
 
-flatpak build --env=CI_COMMIT_SHORT_SHA=$CI_COMMIT_SHORT_SHA ${builddir} ninja -C _flatpak_build install
+flatpak build ${builddir} ninja -C _flatpak_build install
 
 flatpak-builder \
         --user --disable-rofiles-fuse \

.gitlab-ci/test-msvc.bat

@@ -6,7 +6,7 @@ call "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliar
 
 :: FIXME: make warnings fatal
 pip3 install --upgrade --user meson~=0.64 || goto :error
-meson setup -Dbackend_max_links=1 -Ddebug=false -Dmedia-gstreamer=disabled -Dvulkan=disabled _build || goto :error
+meson setup -Dbackend_max_links=1 -Ddebug=false -Dmedia-gstreamer=disabled _build || goto :error
 ninja -C _build || goto :error
 
 goto :EOF

.gitlab-ci/test-msys2.sh

@@ -33,8 +33,7 @@ pacman --noconfirm -S --needed \
     mingw-w64-$MSYS2_ARCH-gst-plugins-bad-libs \
     mingw-w64-$MSYS2_ARCH-shared-mime-info \
     mingw-w64-$MSYS2_ARCH-python-gobject \
-    mingw-w64-$MSYS2_ARCH-shaderc \
-    mingw-w64-$MSYS2_ARCH-vulkan
+    mingw-w64-$MSYS2_ARCH-shaderc
 
 mkdir -p _ccache
 export CCACHE_BASEDIR="$(pwd)"
@@ -48,6 +47,7 @@ meson \
     -Dx11-backend=false \
     -Dwayland-backend=false \
     -Dwin32-backend=true \
+    -Dvulkan=disabled \
     -Dintrospection=enabled \
     -Dgtk:werror=true \
     _build

CONTRIBUTING.md

@@ -213,7 +213,7 @@ Closes #1234
  `git commit -a --author "Joe Coder <joe@coder.org>"` and `--signoff`.
 
  - If your commit is addressing an issue, use the
- [GitLab syntax](https://docs.gitlab.com/ee/user/project/issues/managing_issues.html#closing-issues-automatically)
+ [GitLab syntax](https://docs.gitlab.com/ce/user/project/issues/automatic_issue_closing.html)
  to automatically close the issue when merging the commit with the upstream
  repository:
 

NEWS

@@ -1,112 +1,6 @@
-Overview of Changes in 4.13.6, xx-xx-xxxx
+Overview of Changes in 4.13.4, xx-xx-xxxx
 =========================================
 
-Overview of Changes in 4.13.5, 07-01-2024
-=========================================
-
-This release adds two new GSK renderers called vulkan and ngl,
-that are built from the same sources. The new renderers can
-handle many corner cases correctly that the current gl renderer
-does not handle, and they offer advantages such as antialiasing
-and supersampled gradients.
-
-The new renderers are still considered experimental, and GTK
-will only use them if they are explicitly selected using the
-GSK_RENDERER environment variable.
-
-As part of this work, the GSK include files have been rearranged.
-It is no longer necessary to include renderer-specific headers for
-ngl and vulkan (and doing so will trigger deprecation warnings),
-and their constructors are always available.
-
-The previously available experimental GdkVulkanContext APIs and
-the old Vulkan renderer have been removed.
-
-Vulkan is now enabled by default, and Linux distributions should
-build GTK with Vulkan support. This requires the glslc shader
-compiler as a new dependency.
-
-Vulkan is now also used for dmabuf support.
-
-* GtkDropdown:
- - Fix display of initial selection
-
-* GtkShortcutsWindow:
- - Make the window adapt to smaller screen widths
-
-* GtkTextView:
- - Fix a possible NULL dereference in history
-
-* GDK:
- - Make the png loader safer against overflows
-
-* GL:
- - Fix some errors in handling of texture formats and mipmaps
-
-
-Overview of Changes in 4.13.4, 30-12-2023
-=========================================
-
-* GtkFileDialog:
- - Return an error if no file is selected
-
-* GtkFileLauncher:
- - Add a writable property
-
-* GtkFileChooserNative:
- - Make closing portal file dialogs work
-
-* GtkEmojiChooser:
- - Update Emoji data to CLDR v43
-
-* GtkStringList:
- - Add item-type and n-itmes properties
-
-* Input:
- - Respect GTK grabs on DND events
- - Fix crossing event generation for enter/leave
-
-* Wayland:
- - Avoid recreating wl_buffers needlessly
- - Be more careful when loading cursors
-
-* Dmabuf:
- - Add support for all Dmabuf formats
- - Tweak the offload code a bit, allow offloading translucent
-   textures, as long as they are raised. Decline to offload
-   with fractional scales.
-
-* Accessibility:
- - Add a few more accessible roles
-
-* GL:
- - Use GLES by default
- - Tweak GDK_DEBUG values. The new values are
-   gl-disable-gl, gl-disable-gles and gl-prefer-gl.
-   The gl-legacy and nograbs values have been dropped.
-
-* Css:
- - Reduce memory consumption during theme loading
- - Fix opacity handling
-
-* Theme:
- - Refresh some of the included symbolic icons
-
-* MacOs:
- - Silence secure-restore message
-
-* Build:
- - Require Vulkan 1.3
-
-* Translation updates:
- Chinese (China)
- Czech
- Hebrew
- Icelandic
- Polish
- Russian
-
-
 Overview of Changes in 4.13.3, 15-11-2023
 =========================================
 
@@ -522,7 +416,7 @@ Overview of Changes in 4.11.4, 03-07-2023
  - Center newly created transient windows
 
 * Vulkan:
- - Add antialiasing for gradients
+ - Add antialising for gradients
  - Do less work on clipped away nodes
  - Redo image uploading
  - Support different image depths and formats
@@ -1506,7 +1400,7 @@ Overview of Changes in 4.7.0, 07-05-2022
  - Event handling fixes
  - Fix keyboard input on popovers
  - Support OpenGL-based video playback
- - Support fullscreen
+ - Suport fullscreen
  - Improve native filechoooser size allocation
  - Use CALayer and IOSurface for rendering
  - Use a per-monitor CVDisplayLink
@@ -1903,7 +1797,7 @@ Overview of Changes in 4.4.0
  - Activate when moving focus
 
 * GtkLabel:
- - Properly ignore double underscores for mnemonics
+ - Propertly ignore double underscores for mnemonics
 
 * GtkPopoverMenu:
  - Fix focus cycling
@@ -2450,7 +2344,7 @@ Overview of Changes in 4.1.0
  - Set sort arrows in CSS
  - Set menu button arrows in CSS
  - Make scrollbars larger
- - Support circular menubuttons
+ - Supprt circular menubuttons
 
 * CSS:
  - Implement transform-origin

demos/gtk-demo/application.c

@@ -35,7 +35,7 @@ show_action_dialog (GSimpleAction *action)
 {
   GtkAlertDialog *dialog;
 
-  dialog = gtk_alert_dialog_new ("You activated action: \"%s\"",
+  dialog = gtk_alert_dialog_new ("You activated action: \"%s\n",
                                  g_action_get_name (G_ACTION (action)));
   gtk_alert_dialog_show (dialog, NULL);
   g_object_unref (dialog);

demos/gtk-demo/bluroverlay.h

@@ -18,7 +18,8 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#pragma once
+#ifndef __BLUR_OVERLAY_H__
+#define __BLUR_OVERLAY_H__
 
 #include <gtk/gtk.h>
 
@@ -59,3 +60,5 @@ void       blur_overlay_set_child   (BlurOverlay *overlay,
                                      GtkWidget   *widget);
 
 G_END_DECLS
+
+#endif /* __BLUR_OVERLAY_H__ */

demos/gtk-demo/demotaggedentry.h

@@ -18,7 +18,8 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#pragma once
+#ifndef __DEMO_TAGGED_ENTRY_H__
+#define __DEMO_TAGGED_ENTRY_H__
 
 #include <gtk/gtk.h>
 
@@ -56,3 +57,5 @@ void            demo_tagged_entry_tag_set_has_close_button (DemoTaggedEntryTag *
                                                             gboolean            has_close_button);
 
 G_END_DECLS
+
+#endif /* __DEMO_TAGGED_ENTRY_H__ */

demos/gtk-demo/font_features.c

@@ -1586,7 +1586,7 @@ update_font_variations (void)
         }
 
       gtk_grid_attach (GTK_GRID (demo->variations_grid), combo, 1, -1, 3, 1);
-      g_signal_connect (combo, "notify::selected", G_CALLBACK (instance_changed), NULL);
+      g_signal_connect (combo, "notify::selecte", G_CALLBACK (instance_changed), NULL);
       demo->instance_combo = combo;
    }
 

demos/gtk-demo/fontplane.h

@@ -15,7 +15,8 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#pragma once
+#ifndef __GTK_FONT_PLANE_H__
+#define __GTK_FONT_PLANE_H__
 
 #include <gtk/gtk.h>
 
@@ -59,3 +60,5 @@ GtkWidget * gtk_font_plane_new      (GtkAdjustment *width_adj,
                                      GtkAdjustment *weight_adj);
 
 G_END_DECLS
+
+#endif /* __GTK_FONT_PLANE_H__ */

demos/gtk-demo/gskshaderpaintable.h

@@ -17,7 +17,8 @@
  * Authors: Matthias Clasen <mclasen@redhat.com>
  */
 
-#pragma once
+#ifndef __GSK_SHADER_PAINTABLE_H__
+#define __GSK_SHADER_PAINTABLE_H__
 
 #include <gdk/gdk.h>
 #include <gsk/gsk.h>
@@ -41,3 +42,5 @@ void             gsk_shader_paintable_update_time      (GskShaderPaintable *self
                                                         int                 time_idx,
                                                         gint64              frame_time);
 G_END_DECLS
+
+#endif /* __GSK_SHADER_PAINTABLE_H__ */

demos/gtk-demo/gtkfishbowl.h

@@ -15,7 +15,8 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#pragma once
+#ifndef __GTK_FISHBOWL_H__
+#define __GTK_FISHBOWL_H__
 
 #include <gtk/gtk.h>
 
@@ -64,3 +65,5 @@ void       gtk_fishbowl_set_creation_func (GtkFishbowl       *fishbowl,
                                            GtkFishCreationFunc creation_func);
 
 G_END_DECLS
+
+#endif /* __GTK_FISHBOWL_H__ */

demos/gtk-demo/gtkgears.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTK_GEARS_H__
+#define __GTK_GEARS_H__
 
 #include <gtk/gtk.h>
 
@@ -43,3 +44,5 @@ void       gtk_gears_set_fps_label (GtkGears *gears,
 
 
 G_END_DECLS
+
+#endif /* __GTK_GEARS_H__ */

demos/gtk-demo/gtkshaderbin.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTK_SHADER_BIN_H__
+#define __GTK_SHADER_BIN_H__
 
 #include <gtk/gtk.h>
 
@@ -18,3 +19,5 @@ void       gtk_shader_bin_set_child   (GtkShaderBin *self,
 GtkWidget *gtk_shader_bin_get_child   (GtkShaderBin *self);
 
 G_END_DECLS
+
+#endif /* __GTK_SHADER_BIN_H__ */

demos/gtk-demo/gtkshaderstack.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTK_SHADER_STACK_H__
+#define __GTK_SHADER_STACK_H__
 
 #include <gtk/gtk.h>
 
@@ -18,3 +19,5 @@ void        gtk_shader_stack_set_active   (GtkShaderStack *self,
                                            int             index);
 
 G_END_DECLS
+
+#endif /* __GTK_SHADER_STACK_H__ */

demos/gtk-demo/gtkshadertoy.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __GTK_SHADERTOY_H__
+#define __GTK_SHADERTOY_H__
 
 #include <gtk/gtk.h>
 
@@ -29,3 +30,5 @@ void        gtk_shadertoy_set_image_shader (GtkShadertoy *shadertoy,
                                             const char   *shader);
 
 G_END_DECLS
+
+#endif /* __GTK_SHADERTOY_H__ */

demos/gtk-demo/language-names.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef LANGUAGE_NAMES_H
+#define LANGUAGE_NAMES_H
 
 #include <pango/pango.h>
 
@@ -8,3 +9,5 @@ const char * get_language_name (PangoLanguage *language);
 const char * get_language_name_for_tag (guint32 tag);
 
 G_END_DECLS
+
+#endif

demos/gtk-demo/main.c

@@ -24,7 +24,7 @@
 #include "demos.h"
 #include "fontify.h"
 
-#include "profile_conf.h"
+#include "demo_conf.h"
 
 static GtkWidget *info_view;
 static GtkWidget *source_view;

demos/gtk-demo/meson.build

@@ -236,7 +236,7 @@ foreach flag: common_cflags
   endif
 endforeach
 
-gtkdemo_deps += [ profile_conf_h ]
+gtkdemo_deps += [ demo_conf_h ]
 
 executable('gtk4-demo',
   sources: [demos, demos_h, extra_demo_sources, gtkdemo_resources],

demos/gtk-demo/paintable.c

@@ -53,9 +53,7 @@ gtk_nuclear_snapshot (GtkSnapshot   *snapshot,
                       double         rotation)
 {
 #define RADIUS 0.3
-  GskPathBuilder *builder;
-  GskPath *path;
-  GskStroke *stroke;
+  cairo_t *cr;
   double size;
 
   gtk_snapshot_append_color (snapshot,
@@ -63,29 +61,24 @@ gtk_nuclear_snapshot (GtkSnapshot   *snapshot,
                              &GRAPHENE_RECT_INIT (0, 0, width, height));
 
   size = MIN (width, height);
+  cr = gtk_snapshot_append_cairo (snapshot,
+                                  &GRAPHENE_RECT_INIT ((width - size) / 2.0,
+                                                       (height - size) / 2.0,
+                                                       size, size));
+  gdk_cairo_set_source_rgba (cr, foreground);
+  cairo_translate (cr, width / 2.0, height / 2.0);
+  cairo_scale (cr, size, size);
+  cairo_rotate (cr, rotation);
 
-  gtk_snapshot_save (snapshot);
+  cairo_arc (cr, 0, 0, 0.1, - G_PI, G_PI);
+  cairo_fill (cr);
 
-  gtk_snapshot_translate (snapshot, &GRAPHENE_POINT_INIT (width / 2.0, height / 2.0));
-  gtk_snapshot_scale (snapshot, size, size);
-  gtk_snapshot_rotate (snapshot, rotation);
+  cairo_set_line_width (cr, RADIUS);
+  cairo_set_dash (cr, (double[1]) { RADIUS * G_PI / 3 }, 1, 0.0);
+  cairo_arc (cr, 0, 0, RADIUS, - G_PI, G_PI);
+  cairo_stroke (cr);
 
-  builder = gsk_path_builder_new ();
-  gsk_path_builder_add_circle (builder, graphene_point_zero (), 0.1);
-  path = gsk_path_builder_free_to_path (builder);
-  gtk_snapshot_append_fill (snapshot, path, GSK_FILL_RULE_WINDING, foreground);
-  gsk_path_unref (path);
-
-  stroke = gsk_stroke_new (RADIUS);
-  gsk_stroke_set_dash (stroke, (float[1]) { RADIUS * G_PI / 3 }, 1);
-  builder = gsk_path_builder_new ();
-  gsk_path_builder_add_circle (builder, graphene_point_zero(), RADIUS);
-  path = gsk_path_builder_free_to_path (builder);
-  gtk_snapshot_append_stroke (snapshot, path, stroke, foreground);
-  gsk_path_unref (path);
-  gsk_stroke_free (stroke);
-
-  gtk_snapshot_restore (snapshot);
+  cairo_destroy (cr);
 }
 
 /* Here, we implement the functionality required by the GdkPaintable interface */

demos/gtk-demo/paintable.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __PAINTABLE_H__
+#define __PAINTABLE_H__
 
 #include <gtk/gtk.h>
 
@@ -12,3 +13,5 @@ void            gtk_nuclear_snapshot           (GtkSnapshot     *snapshot,
 GdkPaintable *  gtk_nuclear_icon_new            (double          rotation);
 GdkPaintable *  gtk_nuclear_animation_new       (gboolean        draw_background);
 GtkMediaStream *gtk_nuclear_media_stream_new    (void);
+
+#endif /* __PAINTABLE_H__ */

demos/gtk-demo/paintable_animated.c

@@ -70,7 +70,7 @@ gtk_nuclear_animation_snapshot (GdkPaintable *paintable,
                           ? &(GdkRGBA) { 0.9, 0.75, 0.15, 1.0 } /* yellow */
                           : &(GdkRGBA) { 0, 0, 0, 0 }, /* transparent */
                         width, height,
-                        360 * nuclear->progress / MAX_PROGRESS);
+                        2 * G_PI * nuclear->progress / MAX_PROGRESS);
 }
 
 static GdkPaintable *
@@ -85,7 +85,7 @@ gtk_nuclear_animation_get_current_image (GdkPaintable *paintable)
    * Luckily we added the rotation property to the nuclear icon
    * object previously, so we can just return an instance of that one.
    */
-  return gtk_nuclear_icon_new (360 * nuclear->progress / MAX_PROGRESS);
+  return gtk_nuclear_icon_new (2 * G_PI * nuclear->progress / MAX_PROGRESS);
 }
 
 static GdkPaintableFlags

demos/gtk-demo/paintable_mediastream.c

@@ -76,7 +76,7 @@ gtk_nuclear_media_stream_snapshot (GdkPaintable *paintable,
                         &(GdkRGBA) { 0, 0, 0, 1 }, /* black */
                         &(GdkRGBA) { 0.9, 0.75, 0.15, 1.0 }, /* yellow */
                         width, height,
-                        360 * nuclear->progress / DURATION);
+                        2 * G_PI * nuclear->progress / DURATION);
 }
 
 static GdkPaintable *
@@ -85,7 +85,7 @@ gtk_nuclear_media_stream_get_current_image (GdkPaintable *paintable)
   GtkNuclearMediaStream *nuclear = GTK_NUCLEAR_MEDIA_STREAM (paintable);
 
   /* Same thing as with the animation */
-  return gtk_nuclear_icon_new (360 * nuclear->progress / DURATION);
+  return gtk_nuclear_icon_new (2 * G_PI * nuclear->progress / DURATION);
 }
 
 static GdkPaintableFlags

demos/gtk-demo/puzzlepiece.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __PUZZLE_PIECE_H__
+#define __PUZZLE_PIECE_H__
 
 #include <gtk/gtk.h>
 
@@ -18,3 +19,5 @@ GdkPaintable *  gtk_puzzle_piece_new            (GdkPaintable           *puzzle,
 GdkPaintable *  gtk_puzzle_piece_get_puzzle     (GtkPuzzlePiece         *self);
 guint           gtk_puzzle_piece_get_x          (GtkPuzzlePiece         *self);
 guint           gtk_puzzle_piece_get_y          (GtkPuzzlePiece         *self);
+
+#endif /* __PUZZLE_PIECE_H__ */

demos/gtk-demo/script-names.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef SCRIPT_NAMES_H
+#define SCRIPT_NAMES_H
 
 #include <glib.h>
 
@@ -8,3 +9,5 @@ const char * get_script_name (GUnicodeScript script);
 const char * get_script_name_for_tag (guint32 tag);
 
 G_END_DECLS
+
+#endif

demos/icon-browser/iconbrowserapp.c

@@ -4,7 +4,7 @@
 #include "iconbrowserapp.h"
 #include "iconbrowserwin.h"
 
-#include "profile_conf.h"
+#include "demo_conf.h"
 
 struct _IconBrowserApp
 {

demos/icon-browser/iconbrowserapp.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __ICON_BROWSER_APP_H
+#define __ICON_BROWSER_APP_H
 
 #include <gtk/gtk.h>
 
@@ -13,3 +14,6 @@ typedef struct _IconBrowserAppClass  IconBrowserAppClass;
 
 GType           icon_browser_app_get_type    (void);
 IconBrowserApp *icon_browser_app_new         (void);
+
+
+#endif /* __ICON_BROWSER_APP_H */

demos/icon-browser/iconbrowserwin.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __ICON_BROWSER_WIN_H
+#define __ICON_BROWSER_WIN_H
 
 #include <gtk/gtk.h>
 #include "iconbrowserapp.h"
@@ -14,3 +15,6 @@ typedef struct _IconBrowserWindowClass    IconBrowserWindowClass;
 
 GType              icon_browser_window_get_type     (void);
 IconBrowserWindow *icon_browser_window_new          (IconBrowserApp    *app);
+
+
+#endif /* __ICON_BROWSER_WIN_H */

demos/icon-browser/meson.build

@@ -14,7 +14,7 @@ iconbrowser_resources = gnome.compile_resources('iconbrowser_resources',
 executable('gtk4-icon-browser',
   sources: [iconbrowser_sources, iconbrowser_resources],
   c_args: common_cflags,
-  dependencies: [ libgtk_dep, profile_conf_h ],
+  dependencies: [ libgtk_dep, demo_conf_h ],
   include_directories: confinc,
   win_subsystem: 'windows',
   link_args: extra_demo_ldflags,

demos/meson.build

@@ -1,3 +1,16 @@
+gen_demo_header = find_program('../build-aux/meson/gen-demo-header.py')
+demo_profile = get_option('demo-profile')
+
+demo_conf_h = declare_dependency(
+  sources: custom_target('demo-header',
+    command: [gen_demo_header, meson.project_source_root(), demo_profile],
+    capture: true,
+    output: 'demo_conf.h',
+    build_by_default: true,
+    build_always_stale: true,
+  )
+)
+
 # appdata
 
 appdata_config = configuration_data()

demos/node-editor/gtkrendererpaintableprivate.h

@@ -17,7 +17,8 @@
  * Authors: Benjamin Otte <otte@gnome.org>
  */
 
-#pragma once
+#ifndef __GTK_RENDERER_PAINTABLE_H__
+#define __GTK_RENDERER_PAINTABLE_H__
 
 #include <gsk/gsk.h>
 
@@ -38,3 +39,5 @@ void            gtk_renderer_paintable_set_paintable      (GtkRendererPaintable
 GdkPaintable *  gtk_renderer_paintable_get_paintable      (GtkRendererPaintable *self) G_GNUC_PURE;
 
 G_END_DECLS
+
+#endif /* __GTK_RENDERER_PAINTABLE_H__ */

demos/node-editor/meson.build

@@ -12,7 +12,7 @@ node_editor_resources = gnome.compile_resources('node_editor_resources',
 
 executable('gtk4-node-editor',
   sources: [node_editor_sources, node_editor_resources],
-  dependencies: [ libgtk_dep, profile_conf_h ],
+  dependencies: [ libgtk_dep, demo_conf_h ],
   include_directories: confinc,
   c_args: common_cflags,
   win_subsystem: 'windows',

demos/node-editor/node-editor-application.c

@@ -19,13 +19,11 @@
 
 #include "config.h"
 
-#include <glib/gstdio.h>
-
 #include "node-editor-application.h"
 
 #include "node-editor-window.h"
 
-#include "profile_conf.h"
+#include "demo_conf.h"
 
 static const char *css =
 "textview.editor {"
@@ -249,63 +247,11 @@ node_editor_application_class_init (NodeEditorApplicationClass *class)
   application_class->open = node_editor_application_open;
 }
 
-static void
-print_version (void)
-{
-  g_print ("gtk4-node-editor %s%s%s\n",
-           PACKAGE_VERSION,
-           g_strcmp0 (PROFILE, "devel") == 0 ? "-" : "",
-           g_strcmp0 (PROFILE, "devel") == 0 ? VCS_TAG : "");
-}
-
-static int
-local_options (GApplication *app,
-               GVariantDict *options,
-               gpointer      data)
-{
-  gboolean version = FALSE;
-  gboolean reset = FALSE;
-
-  g_variant_dict_lookup (options, "version", "b", &version);
-
-  if (version)
-    {
-      print_version ();
-      return 0;
-    }
-
-  g_variant_dict_lookup (options, "reset", "b", &reset);
-
-  if (reset)
-    {
-      char *path;
-
-      path = get_autosave_path ("-unsafe");
-      g_remove (path);
-      g_free (path);
-      path = get_autosave_path (NULL);
-      g_remove (path);
-      g_free (path);
-    }
-
-  return -1;
-}
-
-
 NodeEditorApplication *
 node_editor_application_new (void)
 {
-  NodeEditorApplication *app;
-
-  app = g_object_new (NODE_EDITOR_APPLICATION_TYPE,
-                      "application-id", "org.gtk.gtk4.NodeEditor",
-                      "flags", G_APPLICATION_HANDLES_OPEN,
-                      NULL);
-
-  g_application_add_main_option (G_APPLICATION (app), "version", 0, 0,G_OPTION_ARG_NONE, "Show program version", NULL);
-  g_application_add_main_option (G_APPLICATION (app), "reset", 0, 0,G_OPTION_ARG_NONE, "Remove autosave content", NULL);
-
-  g_signal_connect (app, "handle-local-options", G_CALLBACK (local_options), NULL);
-
-  return app;
+  return g_object_new (NODE_EDITOR_APPLICATION_TYPE,
+                       "application-id", "org.gtk.gtk4.NodeEditor",
+                       "flags", G_APPLICATION_HANDLES_OPEN,
+                       NULL);
 }

demos/node-editor/node-editor-application.h

@@ -17,7 +17,8 @@
  * Authors: Benjamin Otte <otte@gnome.org>
  */
 
-#pragma once
+#ifndef __NODE_EDITOR_APPLICATION_H__
+#define __NODE_EDITOR_APPLICATION_H__
 
 #include <gtk/gtk.h>
 
@@ -32,3 +33,6 @@ typedef struct _NodeEditorApplicationClass  NodeEditorApplicationClass;
 
 GType           node_editor_application_get_type    (void);
 NodeEditorApplication *node_editor_application_new         (void);
+
+
+#endif /* __NODE_EDITOR_APPLICATION_H__ */

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

@@ -24,11 +24,13 @@
 #include "gtkrendererpaintableprivate.h"
 
 #include "gsk/gskrendernodeparserprivate.h"
+#include "gsk/gl/gskglrenderer.h"
 #ifdef GDK_WINDOWING_BROADWAY
 #include "gsk/broadway/gskbroadwayrenderer.h"
 #endif
-
-#include <glib/gstdio.h>
+#ifdef GDK_RENDERING_VULKAN
+#include "gsk/vulkan/gskvulkanrenderer.h"
+#endif
 
 #include <cairo.h>
 #ifdef CAIRO_HAS_SVG_SURFACE
@@ -57,7 +59,6 @@ struct _NodeEditorWindow
   GtkWidget *testcase_name_entry;
   GtkWidget *testcase_save_button;
   GtkWidget *scale_scale;
-  GtkWidget *crash_warning;
 
   GtkWidget *renderer_listbox;
   GListStore *renderers;
@@ -67,9 +68,6 @@ struct _NodeEditorWindow
   GFileMonitor *file_monitor;
 
   GArray *errors;
-
-  guint update_timeout;
-  gboolean auto_reload;
 };
 
 struct _NodeEditorWindowClass
@@ -77,13 +75,6 @@ struct _NodeEditorWindowClass
   GtkApplicationWindowClass parent_class;
 };
 
-enum {
-  PROP_AUTO_RELOAD = 1,
-  NUM_PROPERTIES
-};
-
-static GParamSpec *properties[NUM_PROPERTIES] = { NULL, };
-
 G_DEFINE_TYPE(NodeEditorWindow, node_editor_window, GTK_TYPE_APPLICATION_WINDOW);
 
 static void
@@ -176,84 +167,19 @@ text_iter_skip_whitespace_backward (GtkTextIter *iter)
 }
 
 static void
-highlight_text (NodeEditorWindow *self)
-{
-  GtkTextIter iter;
-  GtkTextIter start, end;
-
-  gtk_text_buffer_get_start_iter (self->text_buffer, &iter);
-
-  while (!gtk_text_iter_is_end (&iter))
-    {
-      gunichar c = gtk_text_iter_get_char (&iter);
-
-      if (c == '{')
-        {
-          GtkTextIter word_end = iter;
-          GtkTextIter word_start;
-
-          gtk_text_iter_backward_char (&word_end);
-          text_iter_skip_whitespace_backward (&word_end);
-
-          word_start = word_end;
-          gtk_text_iter_backward_word_start (&word_start);
-          text_iter_skip_alpha_backward (&word_start);
-
-          gtk_text_buffer_apply_tag_by_name (self->text_buffer, "nodename", &word_start, &word_end);
-        }
-      else if (c == ':')
-        {
-          GtkTextIter word_end = iter;
-          GtkTextIter word_start;
-
-          gtk_text_iter_backward_char (&word_end);
-          text_iter_skip_whitespace_backward (&word_end);
-
-          word_start = word_end;
-          gtk_text_iter_backward_word_start (&word_start);
-          text_iter_skip_alpha_backward (&word_start);
-
-          gtk_text_buffer_apply_tag_by_name (self->text_buffer, "propname", &word_start, &word_end);
-        }
-      else if (c == '"')
-        {
-          GtkTextIter string_start = iter;
-          GtkTextIter string_end = iter;
-
-          gtk_text_iter_forward_char (&iter);
-          while (!gtk_text_iter_is_end (&iter))
-            {
-              c = gtk_text_iter_get_char (&iter);
-
-              if (c == '"')
-                {
-                  gtk_text_iter_forward_char (&iter);
-                  string_end = iter;
-                  break;
-                }
-
-              gtk_text_iter_forward_char (&iter);
-            }
-
-          gtk_text_buffer_apply_tag_by_name (self->text_buffer, "string", &string_start, &string_end);
-        }
-
-      gtk_text_iter_forward_char (&iter);
-    }
-
-  gtk_text_buffer_get_bounds (self->text_buffer, &start, &end);
-  gtk_text_buffer_apply_tag_by_name (self->text_buffer, "no-hyphens", &start, &end);
-}
-
-static void
-reload (NodeEditorWindow *self)
+text_changed (GtkTextBuffer    *buffer,
+              NodeEditorWindow *self)
 {
   char *text;
   GBytes *bytes;
+  GtkTextIter iter;
+  GtkTextIter start, end;
   float scale;
   GskRenderNode *big_node;
 
+  g_array_remove_range (self->errors, 0, self->errors->len);
   text = get_current_text (self->text_buffer);
+  text_buffer_remove_all_tags (self->text_buffer);
   bytes = g_bytes_new_take (text, strlen (text));
 
   g_clear_pointer (&self->node, gsk_render_node_unref);
@@ -314,19 +240,73 @@ reload (NodeEditorWindow *self)
     }
 
   g_clear_pointer (&big_node, gsk_render_node_unref);
-}
 
-static void
-text_changed (GtkTextBuffer    *buffer,
-              NodeEditorWindow *self)
-{
-  g_array_remove_range (self->errors, 0, self->errors->len);
-  text_buffer_remove_all_tags (self->text_buffer);
+  gtk_text_buffer_get_start_iter (self->text_buffer, &iter);
 
-  if (self->auto_reload)
-    reload (self);
+  while (!gtk_text_iter_is_end (&iter))
+    {
+      gunichar c = gtk_text_iter_get_char (&iter);
 
-  highlight_text (self);
+      if (c == '{')
+        {
+          GtkTextIter word_end = iter;
+          GtkTextIter word_start;
+
+          gtk_text_iter_backward_char (&word_end);
+          text_iter_skip_whitespace_backward (&word_end);
+
+          word_start = word_end;
+          gtk_text_iter_backward_word_start (&word_start);
+          text_iter_skip_alpha_backward (&word_start);
+
+          gtk_text_buffer_apply_tag_by_name (self->text_buffer, "nodename",
+                                             &word_start, &word_end);
+        }
+      else if (c == ':')
+        {
+          GtkTextIter word_end = iter;
+          GtkTextIter word_start;
+
+          gtk_text_iter_backward_char (&word_end);
+          text_iter_skip_whitespace_backward (&word_end);
+
+          word_start = word_end;
+          gtk_text_iter_backward_word_start (&word_start);
+          text_iter_skip_alpha_backward (&word_start);
+
+          gtk_text_buffer_apply_tag_by_name (self->text_buffer, "propname",
+                                             &word_start, &word_end);
+        }
+      else if (c == '"')
+        {
+          GtkTextIter string_start = iter;
+          GtkTextIter string_end = iter;
+
+          gtk_text_iter_forward_char (&iter);
+          while (!gtk_text_iter_is_end (&iter))
+            {
+              c = gtk_text_iter_get_char (&iter);
+
+              if (c == '"')
+                {
+                  gtk_text_iter_forward_char (&iter);
+                  string_end = iter;
+                  break;
+                }
+
+              gtk_text_iter_forward_char (&iter);
+            }
+
+          gtk_text_buffer_apply_tag_by_name (self->text_buffer, "string",
+                                             &string_start, &string_end);
+        }
+
+      gtk_text_iter_forward_char (&iter);
+    }
+
+  gtk_text_buffer_get_bounds (self->text_buffer, &start, &end);
+  gtk_text_buffer_apply_tag_by_name (self->text_buffer, "no-hyphens",
+                                     &start, &end);
 }
 
 static void
@@ -814,7 +794,7 @@ create_cairo_texture (NodeEditorWindow *self)
     return NULL;
 
   renderer = gsk_cairo_renderer_new ();
-  gsk_renderer_realize_for_display (renderer, gtk_widget_get_display (GTK_WIDGET (self)), NULL);
+  gsk_renderer_realize (renderer, NULL, NULL);
 
   texture = gsk_renderer_render_texture (renderer, node, NULL);
   gsk_render_node_unref (node);
@@ -886,11 +866,11 @@ export_image_response_cb (GObject      *source,
       GskRenderer *renderer;
 
       renderer = gsk_gl_renderer_new ();
-      if (!gsk_renderer_realize_for_display (renderer, gdk_display_get_default (), NULL))
+      if (!gsk_renderer_realize (renderer, NULL, NULL))
         {
           g_object_unref (renderer);
           renderer = gsk_cairo_renderer_new ();
-          if (!gsk_renderer_realize_for_display (renderer, gdk_display_get_default (), NULL))
+          if (!gsk_renderer_realize (renderer, NULL, NULL))
             {
               g_assert_not_reached ();
             }
@@ -1125,9 +1105,6 @@ node_editor_window_finalize (GObject *object)
 {
   NodeEditorWindow *self = (NodeEditorWindow *)object;
 
-  if (self->update_timeout)
-    g_source_remove (self->update_timeout);
-
   g_array_free (self->errors, TRUE);
 
   g_clear_pointer (&self->node, gsk_render_node_unref);
@@ -1144,11 +1121,8 @@ node_editor_window_add_renderer (NodeEditorWindow *self,
                                  const char       *description)
 {
   GdkPaintable *paintable;
-  GdkDisplay *display;
 
-  display = gtk_widget_get_display (GTK_WIDGET (self));
-
-  if (!gsk_renderer_realize_for_display (renderer, display, NULL))
+  if (!gsk_renderer_realize (renderer, NULL, NULL))
     {
       GdkSurface *surface = gtk_native_get_surface (GTK_NATIVE (self));
       g_assert (surface != NULL);
@@ -1183,9 +1157,6 @@ node_editor_window_realize (GtkWidget *widget)
   node_editor_window_add_renderer (self,
                                    gsk_gl_renderer_new (),
                                    "OpenGL");
-  node_editor_window_add_renderer (self,
-                                   gsk_ngl_renderer_new (),
-                                   "NGL");
 #ifdef GDK_RENDERING_VULKAN
   node_editor_window_add_renderer (self,
                                    gsk_vulkan_renderer_new (),
@@ -1567,79 +1538,6 @@ edit_action_cb (GtkWidget  *widget,
   node_editor_window_edit (self, &start);
 }
 
-static void
-node_editor_window_map (GtkWidget *widget)
-{
-  char *path;
-
-  GTK_WIDGET_CLASS (node_editor_window_parent_class)->map (widget);
-
-  path = get_autosave_path (NULL);
-  if (g_file_test (path, G_FILE_TEST_EXISTS))
-    {
-      g_free (path);
-      return;
-    }
-
-  g_free (path);
-}
-
-static void
-node_editor_window_set_property (GObject      *object,
-                                 guint         prop_id,
-                                 const GValue *value,
-                                 GParamSpec   *pspec)
-{
-  NodeEditorWindow *self = NODE_EDITOR_WINDOW (object);
-
-  switch (prop_id)
-    {
-    case PROP_AUTO_RELOAD:
-      {
-        gboolean auto_reload = g_value_get_boolean (value);
-        if (self->auto_reload != auto_reload)
-          {
-            self->auto_reload = auto_reload;
-
-            if (self->auto_reload)
-              reload (self);
-          }
-      }
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-node_editor_window_get_property (GObject    *object,
-                                 guint       prop_id,
-                                 GValue     *value,
-                                 GParamSpec *pspec)
-{
-  NodeEditorWindow *self = NODE_EDITOR_WINDOW (object);
-
-  switch (prop_id)
-    {
-    case PROP_AUTO_RELOAD:
-      g_value_set_boolean (value, self->auto_reload);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-close_crash_warning (GtkButton        *button,
-                     NodeEditorWindow *self)
-{
-  gtk_revealer_set_reveal_child (GTK_REVEALER (self->crash_warning), FALSE);
-}
-
 static void
 node_editor_window_class_init (NodeEditorWindowClass *class)
 {
@@ -1651,8 +1549,6 @@ node_editor_window_class_init (NodeEditorWindowClass *class)
 
   object_class->dispose = node_editor_window_dispose;
   object_class->finalize = node_editor_window_finalize;
-  object_class->set_property = node_editor_window_set_property;
-  object_class->get_property = node_editor_window_get_property;
 
   gtk_widget_class_set_template_from_resource (widget_class,
                                                "/org/gtk/gtk4/node-editor/node-editor-window.ui");
@@ -1660,14 +1556,6 @@ node_editor_window_class_init (NodeEditorWindowClass *class)
   widget_class->realize = node_editor_window_realize;
   widget_class->unrealize = node_editor_window_unrealize;
 
-  widget_class->map = node_editor_window_map;
-
-  properties[PROP_AUTO_RELOAD] = g_param_spec_boolean ("auto-reload", NULL, NULL,
-                                                       TRUE,
-                                                       G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_STATIC_NAME);
-
-  g_object_class_install_properties (object_class, NUM_PROPERTIES, properties);
-
   gtk_widget_class_bind_template_child (widget_class, NodeEditorWindow, text_view);
   gtk_widget_class_bind_template_child (widget_class, NodeEditorWindow, picture);
   gtk_widget_class_bind_template_child (widget_class, NodeEditorWindow, renderer_listbox);
@@ -1677,7 +1565,6 @@ node_editor_window_class_init (NodeEditorWindowClass *class)
   gtk_widget_class_bind_template_child (widget_class, NodeEditorWindow, testcase_name_entry);
   gtk_widget_class_bind_template_child (widget_class, NodeEditorWindow, testcase_save_button);
   gtk_widget_class_bind_template_child (widget_class, NodeEditorWindow, scale_scale);
-  gtk_widget_class_bind_template_child (widget_class, NodeEditorWindow, crash_warning);
 
   gtk_widget_class_bind_template_callback (widget_class, text_view_query_tooltip_cb);
   gtk_widget_class_bind_template_callback (widget_class, open_cb);
@@ -1690,7 +1577,6 @@ node_editor_window_class_init (NodeEditorWindowClass *class)
   gtk_widget_class_bind_template_callback (widget_class, on_picture_drag_prepare_cb);
   gtk_widget_class_bind_template_callback (widget_class, on_picture_drop_cb);
   gtk_widget_class_bind_template_callback (widget_class, click_gesture_pressed);
-  gtk_widget_class_bind_template_callback (widget_class, close_crash_warning);
 
   gtk_widget_class_install_action (widget_class, "smart-edit", NULL, edit_action_cb);
 
@@ -1742,133 +1628,11 @@ static GActionEntry win_entries[] = {
   { "open", window_open, NULL, NULL, NULL },
 };
 
-char *
-get_autosave_path (const char *suffix)
-{
-  char *path;
-  char *name;
-
-  name = g_strconcat ("autosave", suffix, NULL);
-  path = g_build_filename (g_get_user_cache_dir (), "gtk4-node-editor", name, NULL);
-  g_free (name);
-
-  return path;
-}
-
-static void
-set_initial_text (NodeEditorWindow *self)
-{
-  char *path, *path1;
-  char *initial_text;
-  gsize len;
-
-  path = get_autosave_path (NULL);
-  path1 = get_autosave_path ("-unsafe");
-
-  if (g_file_get_contents (path, &initial_text, &len, NULL))
-    {
-      gtk_text_buffer_set_text (self->text_buffer, initial_text, len);
-      g_free (initial_text);
-    }
-  else if (g_file_get_contents (path1, &initial_text, &len, NULL))
-    {
-      self->auto_reload = FALSE;
-      gtk_revealer_set_reveal_child (GTK_REVEALER (self->crash_warning), TRUE);
-
-      gtk_text_buffer_set_text (self->text_buffer, initial_text, len);
-      g_free (initial_text);
-    }
-  else
-    {
-      /* Default */
-      gtk_text_buffer_set_text (self->text_buffer,
-         "shadow {\n"
-         "  child: texture {\n"
-         "    bounds: 0 0 128 128;\n"
-         "    texture: url(\"resource:///org/gtk/gtk4/node-editor/icons/apps/org.gtk.gtk4.NodeEditor.svg\");\n"
-         "  }\n"
-         "  shadows: rgba(0,0,0,0.5) 0 1 12;\n"
-         "}\n"
-         "\n"
-         "transform {\n"
-         "  child: text {\n"
-         "    color: rgb(46,52,54);\n"
-         "    font: \"Cantarell Bold 11\";\n"
-         "    glyphs: \"GTK Node Editor\";\n"
-         "    offset: 8 14.418;\n"
-         "  }\n"
-         "  transform: translate(0, 140);\n"
-         "}", -1);
-    }
-
-  g_free (path);
-  g_free (path1);
-}
-
-static void
-autosave_contents (NodeEditorWindow *self)
-{
-  char *path = NULL;
-  char *dir = NULL;
-  char *contents;
-  GtkTextIter start, end;
-
-  gtk_text_buffer_get_bounds (self->text_buffer, &start, &end);
-  contents = gtk_text_buffer_get_text (self->text_buffer, &start, &end, TRUE);
-  path = get_autosave_path ("-unsafe");
-  dir = g_path_get_dirname (path);
-  g_mkdir_with_parents (dir, 0755);
-  g_file_set_contents (path, contents, -1, NULL);
-
-  g_free (dir);
-  g_free (path);
-  g_free (contents);
-}
-
-static void
-mark_autosave_as_safe (void)
-{
-  char *path1 = NULL;
-  char *path2 = NULL;
-
-  path1 = get_autosave_path ("-unsafe");
-  path2 = get_autosave_path (NULL);
-
-  g_rename (path1, path2);
-}
-
-static gboolean
-update_timeout_cb (gpointer data)
-{
-  NodeEditorWindow *self = data;
-
-  self->update_timeout = 0;
-
-  mark_autosave_as_safe ();
-
-  return G_SOURCE_REMOVE;
-}
-
-static void
-initiate_autosave (NodeEditorWindow *self)
-{
-  autosave_contents (self);
-
-  if (self->update_timeout != 0)
-    g_source_remove (self->update_timeout);
-
-  self->update_timeout = g_timeout_add (100, update_timeout_cb, self);
-}
-
 static void
 node_editor_window_init (NodeEditorWindow *self)
 {
-  GAction *action;
-
   gtk_widget_init_template (GTK_WIDGET (self));
 
-  self->auto_reload = TRUE;
-
   self->renderers = g_list_store_new (GDK_TYPE_PAINTABLE);
   gtk_list_box_bind_model (GTK_LIST_BOX (self->renderer_listbox),
                            G_LIST_MODEL (self->renderers),
@@ -1881,10 +1645,6 @@ node_editor_window_init (NodeEditorWindow *self)
 
   g_action_map_add_action_entries (G_ACTION_MAP (self), win_entries, G_N_ELEMENTS (win_entries), self);
 
-  action = G_ACTION (g_property_action_new ("auto-reload", self, "auto-reload"));
-  g_action_map_add_action (G_ACTION_MAP (self), action);
-  g_object_unref (action);
-
   self->tag_table = gtk_text_tag_table_new ();
   gtk_text_tag_table_add (self->tag_table,
                           g_object_new (GTK_TYPE_TEXT_TAG,
@@ -1922,9 +1682,25 @@ node_editor_window_init (NodeEditorWindow *self)
   g_signal_connect (self->scale_scale, "notify::value", G_CALLBACK (scale_changed), self);
   gtk_text_view_set_buffer (GTK_TEXT_VIEW (self->text_view), self->text_buffer);
 
-  set_initial_text (self);
-
-  g_signal_connect_swapped (self->text_buffer, "changed", G_CALLBACK (initiate_autosave), self);
+  /* Default */
+  gtk_text_buffer_set_text (self->text_buffer,
+         "shadow {\n"
+         "  child: texture {\n"
+         "    bounds: 0 0 128 128;\n"
+         "    texture: url(\"resource:///org/gtk/gtk4/node-editor/icons/apps/org.gtk.gtk4.NodeEditor.svg\");\n"
+         "  }\n"
+         "  shadows: rgba(0,0,0,0.5) 0 1 12;\n"
+         "}\n"
+         "\n"
+         "transform {\n"
+         "  child: text {\n"
+         "    color: rgb(46,52,54);\n"
+         "    font: \"Cantarell Bold 11\";\n"
+         "    glyphs: \"GTK Node Editor\";\n"
+         "    offset: 8 14.418;\n"
+         "  }\n"
+         "  transform: translate(0, 140);\n"
+         "}", -1);
 
   if (g_getenv ("GSK_RENDERER"))
     {

demos/node-editor/node-editor-window.h

@@ -17,7 +17,8 @@
  * Authors: Benjamin Otte <otte@gnome.org>
  */
 
-#pragma once
+#ifndef __NODE_EDITOR_WINDOW_H__
+#define __NODE_EDITOR_WINDOW_H__
 
 #include <gtk/gtk.h>
 
@@ -38,4 +39,4 @@ NodeEditorWindow *      node_editor_window_new          (NodeEditorApplication
 gboolean                node_editor_window_load         (NodeEditorWindow       *self,
                                                          GFile                  *file);
 
-char *                  get_autosave_path               (const char             *suffix);
+#endif /* __NODE_EDITOR_WINDOW_H__ */

demos/node-editor/node-editor-window.ui

@@ -2,14 +2,6 @@
 <interface>
   <menu id="gear_menu">
     <section>
-      <item>
-        <attribute name="label" translatable="yes">_Reload automatically</attribute>
-        <attribute name="action">win.auto-reload</attribute>
-      </item>
-      <item>
-        <attribute name="label" translatable="yes">_Help</attribute>
-        <attribute name="action">app.help</attribute>
-      </item>
       <item>
         <attribute name="label" translatable="yes">_Help</attribute>
         <attribute name="action">app.help</attribute>
@@ -32,6 +24,7 @@
       </item>
     </section>
   </menu>
+
   <object class="GtkPopover" id="testcase_popover">
     <child>
       <object class="GtkGrid">
@@ -46,7 +39,7 @@
           <object class="GtkEntry" id="testcase_name_entry">
             <property name="hexpand">1</property>
             <property name="activates-default">1</property>
-            <signal name="notify::text" handler="testcase_name_entry_changed_cb"/>
+            <signal name="notify::text" handler="testcase_name_entry_changed_cb" />
           </object>
         </child>
         <child>
@@ -59,6 +52,7 @@
             </layout>
           </object>
         </child>
+
         <child>
           <object class="GtkLabel">
             <property name="wrap">1</property>
@@ -72,6 +66,7 @@
             </layout>
           </object>
         </child>
+
         <child>
           <object class="GtkLabel" id="testcase_error_label">
             <property name="wrap">1</property>
@@ -83,6 +78,7 @@
             </layout>
           </object>
         </child>
+
         <child>
           <object class="GtkButton" id="testcase_save_button">
             <property name="label">Save</property>
@@ -90,9 +86,9 @@
             <property name="halign">end</property>
             <property name="receives-default">1</property>
             <property name="sensitive">0</property>
-            <signal name="clicked" handler="testcase_save_clicked_cb"/>
+            <signal name="clicked" handler="testcase_save_clicked_cb" />
             <style>
-              <class name="suggested-action"/>
+              <class name="suggested-action" />
             </style>
             <layout>
               <property name="row">4</property>
@@ -104,6 +100,7 @@
       </object>
     </child>
   </object>
+
   <template class="NodeEditorWindow" parent="GtkApplicationWindow">
     <property name="title" translatable="yes">GTK Node Editor</property>
     <property name="default-width">1024</property>
@@ -188,128 +185,83 @@
       </object>
     </child>
     <child>
-      <object class="GtkOverlay">
-        <child type="overlay">
-          <object class="GtkRevealer" id="crash_warning">
-            <property name="transition-type">slide-down</property>
-            <property name="halign">center</property>
-            <property name="valign">start</property>
-            <property name="child">
-              <object class="GtkFrame">
+      <object class="GtkPaned">
+        <property name="shrink-start-child">false</property>
+        <property name="shrink-end-child">false</property>
+        <property name="position">400</property>
+        <property name="start-child">
+          <object class="GtkScrolledWindow">
+            <property name="hscrollbar-policy">never</property>
+            <property name="hexpand">1</property>
+            <property name="vexpand">1</property>
+            <child>
+              <object class="GtkTextView" id="text_view">
+                <property name="wrap-mode">word</property>
+                <property name="monospace">1</property>
+                <property name="top-margin">6</property>
+                <property name="left-margin">6</property>
+                <property name="right-margin">6</property>
+                <property name="bottom-margin">6</property>
+                <property name="has-tooltip">1</property>
+                <property name="extra-menu">extra_menu</property>
+                <signal name="query-tooltip" handler="text_view_query_tooltip_cb"/>
                 <style>
-                  <class name="app-notification"/>
+                  <class name="editor" />
                 </style>
-                <property name="child">
-                  <object class="GtkBox">
-                    <property name="orientation">vertical</property>
-                    <property name="spacing">20</property>
-                    <property name="margin-start">10</property>
-                    <property name="margin-end">10</property>
-                    <property name="margin-top">10</property>
-                    <property name="margin-bottom">10</property>
-                    <child>
-                      <object class="GtkLabel">
-                        <property name="hexpand">1</property>
-                        <property name="halign">1</property>
-                        <property name="label" translatable="1">The application may have crashed.
-As a precaution, auto-loading has been turned off.
-</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkButton">
-                        <property name="valign">3</property>
-                        <property name="use-underline">1</property>
-                        <property name="label" translatable="1">_Close</property>
-                        <signal name="clicked" handler="close_crash_warning"/>
-                      </object>
-                    </child>
+                <child>
+                  <object class="GtkGestureClick">
+                    <property name="button">1</property>
+                    <signal name="pressed" handler="click_gesture_pressed"/>
                   </object>
-                </property>
+                </child>
               </object>
-            </property>
+            </child>
           </object>
-        </child>
-        <property name="child">
-          <object class="GtkPaned">
-            <property name="shrink-start-child">false</property>
-            <property name="shrink-end-child">false</property>
-            <property name="position">400</property>
-            <property name="start-child">
+        </property>
+        <property name="end-child">
+          <object class="GtkBox">
+            <child>
               <object class="GtkScrolledWindow">
-                <property name="hscrollbar-policy">never</property>
                 <property name="hexpand">1</property>
                 <property name="vexpand">1</property>
+                <property name="min-content-height">100</property>
+                <property name="min-content-width">100</property>
                 <child>
-                  <object class="GtkTextView" id="text_view">
-                    <property name="wrap-mode">word</property>
-                    <property name="monospace">1</property>
-                    <property name="top-margin">6</property>
-                    <property name="left-margin">6</property>
-                    <property name="right-margin">6</property>
-                    <property name="bottom-margin">6</property>
-                    <property name="has-tooltip">1</property>
-                    <property name="extra-menu">extra_menu</property>
-                    <signal name="query-tooltip" handler="text_view_query_tooltip_cb"/>
-                    <style>
-                      <class name="editor"/>
-                    </style>
+                  <object class="GtkViewport">
                     <child>
-                      <object class="GtkGestureClick">
-                        <property name="button">1</property>
-                        <signal name="pressed" handler="click_gesture_pressed"/>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-              </object>
-            </property>
-            <property name="end-child">
-              <object class="GtkBox">
-                <child>
-                  <object class="GtkScrolledWindow">
-                    <property name="hexpand">1</property>
-                    <property name="vexpand">1</property>
-                    <property name="min-content-height">100</property>
-                    <property name="min-content-width">100</property>
-                    <child>
-                      <object class="GtkViewport">
+                      <object class="GtkPicture" id="picture">
+                        <property name="can-shrink">0</property>
+                        <property name="halign">center</property>
+                        <property name="valign">center</property>
                         <child>
-                          <object class="GtkPicture" id="picture">
-                            <property name="can-shrink">0</property>
-                            <property name="halign">center</property>
-                            <property name="valign">center</property>
-                            <child>
-                              <object class="GtkDragSource">
-                                <property name="actions">copy</property>
-                                <signal name="prepare" handler="on_picture_drag_prepare_cb" swapped="no"/>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkDropTargetAsync">
+                          <object class="GtkDragSource">
                             <property name="actions">copy</property>
-                            <property name="formats">application/x-gtk-render-node</property>
-                            <signal name="drop" handler="on_picture_drop_cb" swapped="no"/>
+                            <signal name="prepare" handler="on_picture_drag_prepare_cb" swapped="no"/>
                           </object>
                         </child>
                       </object>
                     </child>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkScrolledWindow">
-                    <property name="hscrollbar-policy">never</property>
                     <child>
-                      <object class="GtkListBox" id="renderer_listbox">
-                        <property name="selection-mode">none</property>
+                      <object class="GtkDropTargetAsync">
+                        <property name="actions">copy</property>
+                        <property name="formats">application/x-gtk-render-node</property>
+                        <signal name="drop" handler="on_picture_drop_cb" swapped="no"/>
                       </object>
                     </child>
                   </object>
                 </child>
               </object>
-            </property>
+            </child>
+            <child>
+              <object class="GtkScrolledWindow">
+                <property name="hscrollbar-policy">never</property>
+                <child>
+                  <object class="GtkListBox" id="renderer_listbox">
+                    <property name="selection-mode">none</property>
+                  </object>
+                </child>
+              </object>
+            </child>
           </object>
         </property>
       </object>

demos/node-editor/node-format.md

@@ -322,39 +322,27 @@ stroke bounds of the path.
 
 ### text
 
-| property | syntax              | default             | printed     |
-| -------- | ------------------- | ------------------- | ----------- |
-| color    | `<color>`           | black               | non-default |
-| font     | `<string>` `<url>`? | "Cantarell 11"      | always      |
-| glyphs   | `<glyphs>`          | "Hello"             | always      |
-| offset   | `<point>`           | 0 0                 | non-default |
+| property | syntax           | default                | printed     |
+| -------- | ---------------- | ---------------------- | ----------- |
+| color    | `<color>`        | black                  | non-default |
+| font     | `<string>`       | "Cantarell 11"         | always      |
+| glyphs   | `<glyphs>`       | "Hello"                | always      |
+| offset   | `<point>`        | 0 0                    | non-default |
 
 Creates a node like `gsk_text_node_new()` with the given properties.
 
-If a url is specified for the font, it must point to a font file for the
-font that is specified in the string. It can be either a data url containing
-a base64-encoded font file, or a regular url that points to a font file.
-
-Glyphs can be specified as an ASCII string, or as a comma-separated list of
-their glyph ID and advance width. Optionally, x and y offsets and flags can
-be specified as well, like this: 40 10 0 0 color.
-
 If the given font does not exist or the given glyphs are invalid for the given
 font, an error node will be returned.
 
 ### texture
 
-| property | syntax              | default                | printed     |
-| -------- | ------------------- | ---------------------- | ----------- |
-| bounds   | `<rect>`            | 50                     | always      |
-| texture  | `<string>`?`<url>`? | *see below*            | always      |
+| property | syntax           | default                | printed     |
+| -------- | ---------------- | ---------------------- | ----------- |
+| bounds   | `<rect>`         | 50                     | always      |
+| texture  | `<url>`          | *see below*            | always      |
 
 Creates a node like `gsk_texture_node_new()` with the given properties.
 
-If a string is specified for the texture, it will be used as a name for the text.
-Textures can be reused by specifying the name of a previously used texture. In
-that case, the url can be omitted.
-
 The default texture is a 10x10 checkerboard with the top left and bottom right
 5x5 being in the color #FF00CC and the other part being transparent. A possible
 representation for this texture is `url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAABmJLR0QA/wD/AP+gvaeTAAAAKUlEQVQYlWP8z3DmPwMaYGQwYUQXY0IXwAUGUCGGoxkYGBiweXAoeAYAz44F3e3U1xUAAAAASUVORK5CYII=")

demos/print-editor/meson.build

@@ -1,7 +1,7 @@
 executable('gtk4-print-editor',
   sources: ['print-editor.c'],
   c_args: common_cflags,
-  dependencies: [ libgtk_dep, profile_conf_h ],
+  dependencies: [ libgtk_dep, demo_conf_h ],
   include_directories: confinc,
   win_subsystem: 'windows',
   link_args: extra_demo_ldflags,

demos/print-editor/print-editor.c

@@ -4,7 +4,7 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
-#include "profile_conf.h"
+#include "demo_conf.h"
 
 static GtkWidget *main_window;
 static GFile *filename = NULL;

demos/widget-factory/meson.build

@@ -66,7 +66,7 @@ endif
 executable('gtk4-widget-factory',
   sources: ['widget-factory.c', widgetfactory_resources],
   c_args: common_cflags,
-  dependencies: [ libgtk_dep, profile_conf_h ],
+  dependencies: [ libgtk_dep, demo_conf_h ],
   include_directories: confinc,
   win_subsystem: 'windows',
   link_args: extra_demo_ldflags,

demos/widget-factory/widget-factory.c

@@ -25,7 +25,7 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
-#include "profile_conf.h"
+#include "demo_conf.h"
 
 static void
 change_dark_state (GSimpleAction *action,

docs/reference/gtk/css-properties.md

@@ -75,7 +75,7 @@ define colors. Color expressions resemble functions, taking 1 or more colors
 and in some cases a number as arguments.
 
 `lighter(Color)`
- : produces a brighter variant of Color
+ : produces a brigher variant of Color
 
 `darker(Color)`
  : produces a darker variant of Color

docs/reference/gtk/gtk4-node-editor.rst

@@ -11,17 +11,13 @@ Editor render nodes
 SYNOPSIS
 --------
 
-|   **gtk4-node-editor** [OPTIONS...] [FILE]
+|   **gtk4-node-editor** [OPTIONS...]
 
 DESCRIPTION
 -----------
 
 ``gtk4-node-editor`` is a utility to show and edit render node files.
-Such render node files can be obtained e.g. from the GTK inspector or
-as part of the testsuite in the GTK sources.
-
-``gtk4-node-editor`` is used by GTK developers for debugging and testing,
-and it has built-in support for saving testcases as part of the GTK testsuite.
+Such render node files can be obtained e.g. from the GTK inspector.
 
 OPTIONS
 -------
@@ -29,21 +25,3 @@ OPTIONS
 ``-h, --help``
 
   Show the application help.
-
-``--version``
-
-  Show the program version.
-
-``--reset``
-
-  Don't restore autosaved content and remove autosave files.
-
-ENVIRONMENT
------------
-
-``GTK_SOURCE_DIR``
-
-  can be set to point to the location where the GTK sources reside, so that
-  testcases can be saved to the right location. If unsed, `gtk4-node-editor``
-  checks if the current working directory looks like a GTK checkout, and failing
-  that, saves testcase in the the current working directory.

docs/reference/gtk/gtk4-rendernode-tool.rst

@@ -12,10 +12,9 @@ SYNOPSIS
 --------
 |   **gtk4-rendernode-tool** <COMMAND> [OPTIONS...] <FILE>
 |
-|   **gtk4-rendernode-tool** benchmark [OPTIONS...] <FILE>
 |   **gtk4-rendernode-tool** info [OPTIONS...] <FILE>
-|   **gtk4-rendernode-tool** render [OPTIONS...] <FILE> [<FILE>]
 |   **gtk4-rendernode-tool** show [OPTIONS...] <FILE>
+|   **gtk4-rendernode-tool** render [OPTIONS...] <FILE> [<FILE>]
 
 DESCRIPTION
 -----------
@@ -51,31 +50,3 @@ The name of the file to write can be specified as a second FILE argument.
 
   Use the given renderer. Use ``--renderer=help`` to get a information
   about poassible values for the ``RENDERER``.
-
-Benchmark
-^^^^^^^^^
-
-The ``benchmark`` command benchmarks rendering of a node with the existing renderers
-and prints the runtimes.
-
-``--renderer=RENDERER``
-
-  Add the given renderer. This argument can be passed multiple times to test multiple
-  renderers. By default, all major GTK renderers are run.
-
-``--runs=RUNS``
-
-  Number of times to render the node on each renderer. By default, this is 3 times.
-  Keep in mind that the first run is often used to populate caches and might be
-  significantly slower.
-
-``--no-download``
-
-  Do not attempt to download the result. This may cause the measurement to not include
-  the execution of the commands on the GPU. It can be useful to use this flag to test
-  command submission performance.
-
-
-
-
-

docs/reference/gtk/running.md

@@ -62,7 +62,7 @@ are only available when GTK has been configured with `-Ddebug=true`.
 `layout`
 : Layout managers
 
-`accessibility`
+`acccessibility`
 : Accessibility state changs
 
 A number of keys are influencing behavior instead of just logging:
@@ -274,46 +274,49 @@ are only available when GTK has been configured with `-Ddebug=true`.
 `renderer`
 : General renderer information
 
+`cairo`
+: cairo renderer information
+
 `opengl`
 : OpenGL renderer information
 
+`shaders`
+: Shaders
+
+`surface`
+: Surfaces
+
 `vulkan`
 : Vulkan renderer information
 
-`shaders`
-: Information about shaders
-
-`surface`
-: Information about surfaces
-
 `fallback`
-: Information about fallback usage in renderers
+: Information about fallbacks
 
 `glyphcache`
 : Information about glyph caching
 
-`verbose`
-: Print verbose output while rendering
-
 A number of options affect behavior instead of logging:
 
+`diff`
+: Show differences
+
 `geometry`
-: Show borders (when using cairo)
+: Show borders
 
 `full-redraw`
-: Force full redraws
+: Force full redraws for every frame
 
 `sync`
 : Sync after each frame
 
-`staging`
-: Use a staging image for texture upload (Vulkan only)
-
 `offload-disable`
 : Disable graphics offload to subsurfaces
 
-`cairo`
-: Overlay error pattern over cairo drawing (finds fallbacks)
+`vulkan-staging-image`
+: Use a staging image for Vulkan texture upload
+
+`vulkan-staging-buffer`
+: Use a staging buffer for Vulkan texture upload
 
 The special value `all` can be used to turn on all debug options. The special
 value `help` can be used to obtain a list of all supported debug options.
@@ -354,40 +357,6 @@ the default selection of the device that is used for Vulkan rendering.
 The special value `list` can be used to obtain a list of all Vulkan
 devices.
 
-### `GDK_VULKAN_SKIP`
-
-This variable can be set to a list of values, which cause GDK to
-disable features of the Vulkan support.
-Note that these features may already be disabled if the Vulkan driver
-does not support them.
-
-`dmabuf`
-: Never import Dmabufs
-
-`ycbr`
-: Do not support Ycbcr textures
-
-`descriptor-indexing`
-: Force slow descriptor set layout codepath
-
-`dynamic-indexing`
-: Hardcode small number of buffer and texture arrays
-
-`nonuniform-indexing`
-: Split draw calls to ensure uniform texture accesses
-
-`semaphore-export`
-: Disable sync of exported dmabufs
-
-`semaphore-import`
-: Disable sync of imported dmabufs
-
-`incremental-present`
-: Do not send damage regions
-
-The special value `all` can be used to turn on all values. The special
-value `help` can be used to obtain a list of all supported values.
-
 ### `GSK_RENDERER`
 
 If set, selects the GSK renderer to use. The following renderers can
@@ -409,56 +378,22 @@ using and the GDK backend supports them:
 `gl`
 : Selects the "gl" OpenGL renderer
 
-`ngl`
-: Selects the "ngl" OpenGL renderer
-
 `vulkan`
 : Selects the Vulkan renderer
 
+Note that on Windows, if one is running Nahimic 3 on a system with
+nVidia graphics, one needs to stop the "Nahimic service" or insert
+the GTK application into the Nahimic blacklist, as noted in
+https://www.nvidia.com/en-us/geforce/forums/game-ready-drivers/13/297952/nahimic-and-nvidia-drivers-conflict/2334568/, or use the cairo renderer (at the cost of being unable to use
+OpenGL features), or use GDK_DEBUG=gl-gles if you know that GLES
+support is enabled for the build.
 
-::: note
-    If you are running the Nahimic 3 service on a Windows system with
-    nVidia graphics, you need to perform one of the following:
-
-     - stop the "Nahimic service"
-     - insert the GTK application into the Nahimic blocklist, as noted in the
-       [nVidia forums](https://www.nvidia.com/en-us/geforce/forums/game-ready-drivers/13/297952/nahimic-and-nvidia-drivers-conflict/2334568/)
-     - use the cairo renderer (at the cost of being unable to use OpenGL features)
-     - use `GDK_DEBUG=gl-gles`, if you know that GLES support is enabled for the build.
-
-    This is a known issue, as the above link indicates, and affects quite
-    a number of applications—sadly, since this issue lies within the
-    nVidia graphics driver and/or the Nahimic 3 code, we are not able
-    to rememdy this on the GTK side; the best bet before trying the above
-    workarounds is to try to update your graphics drivers and Nahimic
-    installation.
-
-
-### `GSK_GPU_SKIP`
-
-This variable can be set to a list of values, which cause GSK to
-disable certain optimizations of the "ngl" and "vulkan" renderer.
-
-`uber`
-: Don't use the uber shader
-
-`clear`
-: Use shaders instead of vkCmdClearAttachment()/glClear()
-
-`blit`
-: Use shaders instead of vkCmdBlit()/glBlitFramebuffer()
-
-`gradients`
-: Don't supersample gradients
-
-`mipmap`
-: Avoid creating mipmaps
-
-`gl-baseinstance`
-: Assume no ARB/EXT_base_instance support
-
-The special value `all` can be used to turn on all values. The special
-value `help` can be used to obtain a list of all supported values.
+This is a known issue, as the above link indicates, and affects quite
+a number of applications--sadly, since this issue lies within the
+nVidia graphics driver and/or the Nahimic 3 code, we are not able
+to rememdy this on the GTK side; the best bet before trying the above
+workarounds is to try to update your graphics drivers and Nahimic
+installation.
 
 ### `GSK_MAX_TEXTURE_SIZE`
 

docs/reference/gtk/section-accessibility.md

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

examples/application1/exampleapp.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __EXAMPLEAPP_H
+#define __EXAMPLEAPP_H
 
 #include <gtk/gtk.h>
 
@@ -7,3 +8,6 @@
 G_DECLARE_FINAL_TYPE (ExampleApp, example_app, EXAMPLE, APP, GtkApplication)
 
 ExampleApp     *example_app_new         (void);
+
+
+#endif /* __EXAMPLEAPP_H */

examples/application1/exampleappwin.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __EXAMPLEAPPWIN_H
+#define __EXAMPLEAPPWIN_H
 
 #include <gtk/gtk.h>
 #include "exampleapp.h"
@@ -11,3 +12,6 @@ G_DECLARE_FINAL_TYPE (ExampleAppWindow, example_app_window, EXAMPLE, APP_WINDOW,
 ExampleAppWindow       *example_app_window_new          (ExampleApp *app);
 void                    example_app_window_open         (ExampleAppWindow *win,
                                                          GFile            *file);
+
+
+#endif /* __EXAMPLEAPPWIN_H */

examples/application2/exampleapp.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __EXAMPLEAPP_H
+#define __EXAMPLEAPP_H
 
 #include <gtk/gtk.h>
 
@@ -8,3 +9,6 @@ G_DECLARE_FINAL_TYPE (ExampleApp, example_app, EXAMPLE, APP, GtkApplication)
 
 
 ExampleApp     *example_app_new         (void);
+
+
+#endif /* __EXAMPLEAPP_H */

examples/application2/exampleappwin.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __EXAMPLEAPPWIN_H
+#define __EXAMPLEAPPWIN_H
 
 #include <gtk/gtk.h>
 #include "exampleapp.h"
@@ -11,3 +12,6 @@ G_DECLARE_FINAL_TYPE (ExampleAppWindow, example_app_window, EXAMPLE, APP_WINDOW,
 ExampleAppWindow       *example_app_window_new          (ExampleApp *app);
 void                    example_app_window_open         (ExampleAppWindow *win,
                                                          GFile            *file);
+
+
+#endif /* __EXAMPLEAPPWIN_H */

examples/application3/exampleapp.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __EXAMPLEAPP_H
+#define __EXAMPLEAPP_H
 
 #include <gtk/gtk.h>
 
@@ -8,3 +9,6 @@ G_DECLARE_FINAL_TYPE (ExampleApp, example_app, EXAMPLE, APP, GtkApplication)
 
 
 ExampleApp     *example_app_new         (void);
+
+
+#endif /* __EXAMPLEAPP_H */

examples/application3/exampleappwin.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __EXAMPLEAPPWIN_H
+#define __EXAMPLEAPPWIN_H
 
 #include <gtk/gtk.h>
 #include "exampleapp.h"
@@ -11,3 +12,6 @@ G_DECLARE_FINAL_TYPE (ExampleAppWindow, example_app_window, EXAMPLE, APP_WINDOW,
 ExampleAppWindow       *example_app_window_new          (ExampleApp *app);
 void                    example_app_window_open         (ExampleAppWindow *win,
                                                          GFile            *file);
+
+
+#endif /* __EXAMPLEAPPWIN_H */

examples/application4/exampleapp.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __EXAMPLEAPP_H
+#define __EXAMPLEAPP_H
 
 #include <gtk/gtk.h>
 
@@ -8,3 +9,6 @@ G_DECLARE_FINAL_TYPE (ExampleApp, example_app, EXAMPLE, APP, GtkApplication)
 
 
 ExampleApp     *example_app_new         (void);
+
+
+#endif /* __EXAMPLEAPP_H */

examples/application4/exampleappwin.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __EXAMPLEAPPWIN_H
+#define __EXAMPLEAPPWIN_H
 
 #include <gtk/gtk.h>
 #include "exampleapp.h"
@@ -11,3 +12,6 @@ G_DECLARE_FINAL_TYPE (ExampleAppWindow, example_app_window, EXAMPLE, APP_WINDOW,
 ExampleAppWindow       *example_app_window_new          (ExampleApp *app);
 void                    example_app_window_open         (ExampleAppWindow *win,
                                                          GFile            *file);
+
+
+#endif /* __EXAMPLEAPPWIN_H */

examples/application5/exampleapp.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __EXAMPLEAPP_H
+#define __EXAMPLEAPP_H
 
 #include <gtk/gtk.h>
 
@@ -8,3 +9,6 @@ G_DECLARE_FINAL_TYPE (ExampleApp, example_app, EXAMPLE, APP, GtkApplication)
 
 
 ExampleApp     *example_app_new         (void);
+
+
+#endif /* __EXAMPLEAPP_H */

examples/application5/exampleappwin.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __EXAMPLEAPPWIN_H
+#define __EXAMPLEAPPWIN_H
 
 #include <gtk/gtk.h>
 #include "exampleapp.h"
@@ -11,3 +12,6 @@ G_DECLARE_FINAL_TYPE (ExampleAppWindow, example_app_window, EXAMPLE, APP_WINDOW,
 ExampleAppWindow       *example_app_window_new          (ExampleApp *app);
 void                    example_app_window_open         (ExampleAppWindow *win,
                                                          GFile            *file);
+
+
+#endif /* __EXAMPLEAPPWIN_H */

examples/application6/exampleapp.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __EXAMPLEAPP_H
+#define __EXAMPLEAPP_H
 
 #include <gtk/gtk.h>
 
@@ -8,3 +9,6 @@ G_DECLARE_FINAL_TYPE (ExampleApp, example_app, EXAMPLE, APP, GtkApplication)
 
 
 ExampleApp     *example_app_new         (void);
+
+
+#endif /* __EXAMPLEAPP_H */

examples/application6/exampleappprefs.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __EXAMPLEAPPPREFS_H
+#define __EXAMPLEAPPPREFS_H
 
 #include <gtk/gtk.h>
 #include "exampleappwin.h"
@@ -9,3 +10,6 @@ G_DECLARE_FINAL_TYPE (ExampleAppPrefs, example_app_prefs, EXAMPLE, APP_PREFS, Gt
 
 
 ExampleAppPrefs        *example_app_prefs_new          (ExampleAppWindow *win);
+
+
+#endif /* __EXAMPLEAPPPREFS_H */

examples/application6/exampleappwin.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __EXAMPLEAPPWIN_H
+#define __EXAMPLEAPPWIN_H
 
 #include <gtk/gtk.h>
 #include "exampleapp.h"
@@ -11,3 +12,6 @@ G_DECLARE_FINAL_TYPE (ExampleAppWindow, example_app_window, EXAMPLE, APP_WINDOW,
 ExampleAppWindow       *example_app_window_new          (ExampleApp *app);
 void                    example_app_window_open         (ExampleAppWindow *win,
                                                          GFile            *file);
+
+
+#endif /* __EXAMPLEAPPWIN_H */

examples/application7/exampleapp.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __EXAMPLEAPP_H
+#define __EXAMPLEAPP_H
 
 #include <gtk/gtk.h>
 
@@ -8,3 +9,6 @@ G_DECLARE_FINAL_TYPE (ExampleApp, example_app, EXAMPLE, APP, GtkApplication)
 
 
 ExampleApp     *example_app_new         (void);
+
+
+#endif /* __EXAMPLEAPP_H */

examples/application7/exampleappprefs.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __EXAMPLEAPPPREFS_H
+#define __EXAMPLEAPPPREFS_H
 
 #include <gtk/gtk.h>
 #include "exampleappwin.h"
@@ -9,3 +10,6 @@ G_DECLARE_FINAL_TYPE (ExampleAppPrefs, example_app_prefs, EXAMPLE, APP_PREFS, Gt
 
 
 ExampleAppPrefs        *example_app_prefs_new          (ExampleAppWindow *win);
+
+
+#endif /* __EXAMPLEAPPPREFS_H */

examples/application7/exampleappwin.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __EXAMPLEAPPWIN_H
+#define __EXAMPLEAPPWIN_H
 
 #include <gtk/gtk.h>
 #include "exampleapp.h"
@@ -11,3 +12,6 @@ G_DECLARE_FINAL_TYPE (ExampleAppWindow, example_app_window, EXAMPLE, APP_WINDOW,
 ExampleAppWindow       *example_app_window_new          (ExampleApp *app);
 void                    example_app_window_open         (ExampleAppWindow *win,
                                                          GFile            *file);
+
+
+#endif /* __EXAMPLEAPPWIN_H */

examples/application8/exampleapp.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __EXAMPLEAPP_H
+#define __EXAMPLEAPP_H
 
 #include <gtk/gtk.h>
 
@@ -8,3 +9,6 @@ G_DECLARE_FINAL_TYPE (ExampleApp, example_app, EXAMPLE, APP, GtkApplication)
 
 
 ExampleApp     *example_app_new         (void);
+
+
+#endif /* __EXAMPLEAPP_H */

examples/application8/exampleappprefs.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __EXAMPLEAPPPREFS_H
+#define __EXAMPLEAPPPREFS_H
 
 #include <gtk/gtk.h>
 #include "exampleappwin.h"
@@ -9,3 +10,6 @@ G_DECLARE_FINAL_TYPE (ExampleAppPrefs, example_app_prefs, EXAMPLE, APP_PREFS, Gt
 
 
 ExampleAppPrefs        *example_app_prefs_new          (ExampleAppWindow *win);
+
+
+#endif /* __EXAMPLEAPPPREFS_H */

examples/application8/exampleappwin.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __EXAMPLEAPPWIN_H
+#define __EXAMPLEAPPWIN_H
 
 #include <gtk/gtk.h>
 #include "exampleapp.h"
@@ -11,3 +12,6 @@ G_DECLARE_FINAL_TYPE (ExampleAppWindow, example_app_window, EXAMPLE, APP_WINDOW,
 ExampleAppWindow       *example_app_window_new          (ExampleApp *app);
 void                    example_app_window_open         (ExampleAppWindow *win,
                                                          GFile            *file);
+
+
+#endif /* __EXAMPLEAPPWIN_H */

examples/application9/exampleapp.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __EXAMPLEAPP_H
+#define __EXAMPLEAPP_H
 
 #include <gtk/gtk.h>
 
@@ -8,3 +9,6 @@ G_DECLARE_FINAL_TYPE (ExampleApp, example_app, EXAMPLE, APP, GtkApplication)
 
 
 ExampleApp     *example_app_new         (void);
+
+
+#endif /* __EXAMPLEAPP_H */

examples/application9/exampleappprefs.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __EXAMPLEAPPPREFS_H
+#define __EXAMPLEAPPPREFS_H
 
 #include <gtk/gtk.h>
 #include "exampleappwin.h"
@@ -9,3 +10,6 @@ G_DECLARE_FINAL_TYPE (ExampleAppPrefs, example_app_prefs, EXAMPLE, APP_PREFS, Gt
 
 
 ExampleAppPrefs        *example_app_prefs_new          (ExampleAppWindow *win);
+
+
+#endif /* __EXAMPLEAPPPREFS_H */

examples/application9/exampleappwin.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef __EXAMPLEAPPWIN_H
+#define __EXAMPLEAPPWIN_H
 
 #include <gtk/gtk.h>
 #include "exampleapp.h"
@@ -11,3 +12,6 @@ G_DECLARE_FINAL_TYPE (ExampleAppWindow, example_app_window, EXAMPLE, APP_WINDOW,
 ExampleAppWindow       *example_app_window_new          (ExampleApp *app);
 void                    example_app_window_open         (ExampleAppWindow *win,
                                                          GFile            *file);
+
+
+#endif /* __EXAMPLEAPPWIN_H */

gdk/gdkclipboard.c

@@ -529,9 +529,8 @@ gdk_clipboard_get_content (GdkClipboard *clipboard)
  * exit. Depending on the platform, the functionality may not be available
  * unless a "clipboard manager" is running.
  *
- * This function is called automatically when a
- * [GtkApplication](../gtk4/class.Application.html)
- * is shut down, so you likely don't need to call it.
+ * This function is called automatically when a [class@Gtk.Application] is
+ * shut down, so you likely don't need to call it.
  */
 void
 gdk_clipboard_store_async (GdkClipboard        *clipboard,

gdk/gdkcursor.c

@@ -47,8 +47,7 @@
  * Cursors by themselves are not very interesting: they must be bound to a
  * window for users to see them. This is done with [method@Gdk.Surface.set_cursor]
  * or [method@Gdk.Surface.set_device_cursor]. Applications will typically
- * use higher-level GTK functions such as [gtk_widget_set_cursor()](../gtk4/method.Widget.set_cursor.html)
- * instead.
+ * use higher-level GTK functions such as [method@Gtk.Widget.set_cursor] instead.
  *
  * Cursors are not bound to a given [class@Gdk.Display], so they can be shared.
  * However, the appearance of cursors may vary when used on different

gdk/gdkdevice.c

@@ -289,8 +289,7 @@ gdk_device_class_init (GdkDeviceClass *klass)
    */
   device_props[PROP_MODIFIER_STATE] =
       g_param_spec_flags ("modifier-state", NULL, NULL,
-                          GDK_TYPE_MODIFIER_TYPE,
-                          GDK_NO_MODIFIER_MASK,
+                          GDK_TYPE_MODIFIER_TYPE, 0,
                           G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
   g_object_class_install_properties (object_class, LAST_PROP, device_props);

gdk/gdkdisplay.c

@@ -31,7 +31,6 @@
 #include "gdkclipboardprivate.h"
 #include "gdkdeviceprivate.h"
 #include "gdkdisplaymanagerprivate.h"
-#include "gdkdmabufeglprivate.h"
 #include "gdkdmabufformatsbuilderprivate.h"
 #include "gdkdmabufformatsprivate.h"
 #include "gdkdmabuftextureprivate.h"
@@ -40,7 +39,7 @@
 #include "gdkglcontextprivate.h"
 #include "gdkmonitorprivate.h"
 #include "gdkrectangle.h"
-#include "gdkvulkancontextprivate.h"
+#include "gdkvulkancontext.h"
 
 #ifdef HAVE_EGL
 #include <epoxy/egl.h>
@@ -253,13 +252,6 @@ gdk_display_class_init (GdkDisplayClass *class)
                           TRUE,
                           G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
-  /**
-   * GdkDisplay:dmabuf-formats:
-   *
-   * The dma-buf formats that are supported on this display
-   *
-   * Since: 4.14
-   */
   props[PROP_DMABUF_FORMATS] =
     g_param_spec_boxed ("dmabuf-formats", NULL, NULL,
                         GDK_TYPE_DMABUF_FORMATS,
@@ -399,30 +391,14 @@ gdk_display_dispose (GObject *object)
 {
   GdkDisplay *display = GDK_DISPLAY (object);
   GdkDisplayPrivate *priv = gdk_display_get_instance_private (display);
-  gsize i;
-
-  for (i = 0; i < G_N_ELEMENTS (display->dmabuf_downloaders); i++)
-    {
-      if (display->dmabuf_downloaders[i] == NULL)
-        continue;
-
-      gdk_dmabuf_downloader_close (display->dmabuf_downloaders[i]);
-      g_clear_object (&display->dmabuf_downloaders[i]);
-    }
 
   _gdk_display_manager_remove_display (gdk_display_manager_get (), display);
 
   g_queue_clear (&display->queued_events);
 
+  g_clear_object (&display->egl_gsk_renderer);
   g_clear_pointer (&display->egl_dmabuf_formats, gdk_dmabuf_formats_unref);
   g_clear_pointer (&display->egl_external_formats, gdk_dmabuf_formats_unref);
-#ifdef GDK_RENDERING_VULKAN
-  if (display->vk_dmabuf_formats)
-    {
-      gdk_display_unref_vulkan (display);
-      g_assert (display->vk_dmabuf_formats == NULL);
-    }
-#endif
 
   g_clear_object (&priv->gl_context);
 #ifdef HAVE_EGL
@@ -1196,9 +1172,9 @@ _gdk_display_get_next_serial (GdkDisplay *display)
  * Indicates to the GUI environment that the application has
  * finished loading, using a given identifier.
  *
- * GTK will call this function automatically for [GtkWindow](../gtk4/class.Window.html)
+ * GTK will call this function automatically for [class@Gtk.Window]
  * with custom startup-notification identifier unless
- * [gtk_window_set_auto_startup_notification()](../gtk4/method.Window.set_auto_startup_notification.html)
+ * [method@Gtk.Window.set_auto_startup_notification]
  * is called to disable that feature.
  *
  * Deprecated: 4.10: Using [method@Gdk.Toplevel.set_startup_id] is sufficient
@@ -1267,14 +1243,12 @@ gdk_display_get_keymap (GdkDisplay *display)
 /*<private>
  * gdk_display_create_vulkan_context:
  * @self: a `GdkDisplay`
- * @surface: (nullable): the `GdkSurface` to use or %NULL for a surfaceless
- *   context
  * @error: return location for an error
  *
  * Creates a new `GdkVulkanContext` for use with @display.
  *
- * If @surface is NULL, the context can not be used to draw to surfaces,
- * it can only be used for custom rendering or compute.
+ * The context can not be used to draw to surfaces, it can only be
+ * used for custom rendering or compute.
  *
  * If the creation of the `GdkVulkanContext` failed, @error will be set.
  *
@@ -1283,11 +1257,9 @@ gdk_display_get_keymap (GdkDisplay *display)
  */
 GdkVulkanContext *
 gdk_display_create_vulkan_context (GdkDisplay  *self,
-                                   GdkSurface  *surface,
                                    GError     **error)
 {
   g_return_val_if_fail (GDK_IS_DISPLAY (self), NULL);
-  g_return_val_if_fail (surface == NULL || GDK_IS_SURFACE (surface), NULL);
   g_return_val_if_fail (error == NULL || *error == NULL, NULL);
 
   if (gdk_display_get_debug_flags (self) & GDK_DEBUG_VULKAN_DISABLE)
@@ -1304,33 +1276,11 @@ gdk_display_create_vulkan_context (GdkDisplay  *self,
       return FALSE;
     }
 
-  if (surface)
-    {
-      return g_initable_new (GDK_DISPLAY_GET_CLASS (self)->vk_context_type,
-                             NULL,
-                             error,
-                             "surface", surface,
-                             NULL);
-    }
-  else
-    {
-      return g_initable_new (GDK_DISPLAY_GET_CLASS (self)->vk_context_type,
-                             NULL,
-                             error,
-                             "display", self,
-                             NULL);
-    }
-}
-
-gboolean
-gdk_display_has_vulkan_feature (GdkDisplay        *self,
-                                GdkVulkanFeatures  feature)
-{
-#ifdef GDK_RENDERING_VULKAN
-  return !!(self->vulkan_features & feature);
-#else
-  return FALSE;
-#endif
+  return g_initable_new (GDK_DISPLAY_GET_CLASS (self)->vk_context_type,
+                         NULL,
+                         error,
+                         "display", self,
+                         NULL);
 }
 
 static void
@@ -1931,12 +1881,13 @@ gdk_display_get_egl_display (GdkDisplay *self)
 
 #ifdef HAVE_DMABUF
 static void
-gdk_display_add_dmabuf_downloader (GdkDisplay          *display,
-                                   GdkDmabufDownloader *downloader)
+gdk_display_add_dmabuf_downloader (GdkDisplay                *display,
+                                   const GdkDmabufDownloader *downloader,
+                                   GdkDmabufFormatsBuilder   *builder)
 {
   gsize i;
 
-  if (downloader == NULL)
+  if (!downloader->add_formats (downloader, display, builder))
     return;
 
   /* dmabuf_downloaders is NULL-terminated */
@@ -1946,7 +1897,7 @@ gdk_display_add_dmabuf_downloader (GdkDisplay          *display,
         break;
     }
 
-  g_assert (i < G_N_ELEMENTS (display->dmabuf_downloaders) - 1);
+  g_assert (i < G_N_ELEMENTS (display->dmabuf_downloaders));
 
   display->dmabuf_downloaders[i] = downloader;
 }
@@ -1972,16 +1923,14 @@ gdk_display_init_dmabuf (GdkDisplay *self)
 #ifdef HAVE_DMABUF
   if (!GDK_DISPLAY_DEBUG_CHECK (self, DMABUF_DISABLE))
     {
-#ifdef GDK_RENDERING_VULKAN
-      gdk_display_add_dmabuf_downloader (self, gdk_vulkan_get_dmabuf_downloader (self, builder));
-#endif
+      gdk_display_prepare_gl (self, NULL);
+
+      gdk_display_add_dmabuf_downloader (self, gdk_dmabuf_get_direct_downloader (), builder);
 
 #ifdef HAVE_EGL
-      gdk_display_add_dmabuf_downloader (self, gdk_dmabuf_get_egl_downloader (self, builder));
+      if (gdk_display_prepare_gl (self, NULL))
+        gdk_display_add_dmabuf_downloader (self, gdk_dmabuf_get_egl_downloader (), builder);
 #endif
-
-      gdk_dmabuf_formats_builder_add_formats (builder,
-                                              gdk_dmabuf_get_mmap_formats ());
     }
 #endif
 

gdk/gdkdisplayprivate.h

@@ -26,7 +26,6 @@
 #include "gdkkeysprivate.h"
 #include "gdkdeviceprivate.h"
 #include "gdkdmabufprivate.h"
-#include "gdkdmabufdownloaderprivate.h"
 
 #ifdef GDK_RENDERING_VULKAN
 #include <vulkan/vulkan.h>
@@ -41,17 +40,6 @@ G_BEGIN_DECLS
 
 typedef struct _GdkDisplayClass GdkDisplayClass;
 
-typedef enum {
-  GDK_VULKAN_FEATURE_DMABUF                     = 1 << 0,
-  GDK_VULKAN_FEATURE_YCBCR                      = 1 << 1,
-  GDK_VULKAN_FEATURE_DESCRIPTOR_INDEXING        = 1 << 2,
-  GDK_VULKAN_FEATURE_DYNAMIC_INDEXING           = 1 << 3,
-  GDK_VULKAN_FEATURE_NONUNIFORM_INDEXING        = 1 << 4,
-  GDK_VULKAN_FEATURE_SEMAPHORE_EXPORT           = 1 << 5,
-  GDK_VULKAN_FEATURE_SEMAPHORE_IMPORT           = 1 << 6,
-  GDK_VULKAN_FEATURE_INCREMENTAL_PRESENT        = 1 << 7,
-} GdkVulkanFeatures;
-
 /* Tracks information about the device grab on this display */
 typedef struct
 {
@@ -118,8 +106,6 @@ struct _GdkDisplay
   char *vk_pipeline_cache_etag;
   guint vk_save_pipeline_cache_source;
   GHashTable *vk_shader_modules;
-  GdkDmabufFormats *vk_dmabuf_formats;
-  GdkVulkanFeatures vulkan_features;
 
   guint vulkan_refcount;
 #endif /* GDK_RENDERING_VULKAN */
@@ -132,9 +118,10 @@ struct _GdkDisplay
   guint have_egl_dma_buf_export : 1;
 
   GdkDmabufFormats *dmabuf_formats;
-  GdkDmabufDownloader *dmabuf_downloaders[4];
+  const GdkDmabufDownloader *dmabuf_downloaders[4];
 
    /* Cached data the EGL dmabuf downloader */
+  gpointer egl_gsk_renderer;
   GdkDmabufFormats *egl_dmabuf_formats;
   GdkDmabufFormats *egl_external_formats;
 };
@@ -233,10 +220,7 @@ void                _gdk_display_unpause_events       (GdkDisplay       *display
 
 void                gdk_display_init_dmabuf           (GdkDisplay       *self);
 
-gboolean            gdk_display_has_vulkan_feature    (GdkDisplay       *self,
-                                                       GdkVulkanFeatures feature);
 GdkVulkanContext *  gdk_display_create_vulkan_context (GdkDisplay       *self,
-                                                       GdkSurface       *surface,
                                                        GError          **error);
 
 GdkGLContext *      gdk_display_get_gl_context        (GdkDisplay       *display);

gdk/gdkdmabufdownloader.c

@@ -1,48 +0,0 @@
-#include "config.h"
-
-#include "gdkdmabufdownloaderprivate.h"
-
-G_DEFINE_INTERFACE (GdkDmabufDownloader, gdk_dmabuf_downloader, G_TYPE_OBJECT)
-
-static void
-gdk_dmabuf_downloader_default_init (GdkDmabufDownloaderInterface *iface)
-{
-}
-
-void
-gdk_dmabuf_downloader_close (GdkDmabufDownloader *self)
-{
-  GdkDmabufDownloaderInterface *iface;
-
-  iface = GDK_DMABUF_DOWNLOADER_GET_IFACE (self);
-  iface->close (self);
-}
-
-gboolean
-gdk_dmabuf_downloader_supports (GdkDmabufDownloader  *self,
-                                GdkDmabufTexture     *texture,
-                                GError              **error)
-{
-  GdkDmabufDownloaderInterface *iface;
-
-  g_return_val_if_fail (GDK_IS_DMABUF_DOWNLOADER (self), FALSE);
-
-  iface = GDK_DMABUF_DOWNLOADER_GET_IFACE (self);
-  return iface->supports (self, texture, error);
-}
-
-void
-gdk_dmabuf_downloader_download (GdkDmabufDownloader *self,
-                                GdkDmabufTexture    *texture,
-                                GdkMemoryFormat      format,
-                                guchar              *data,
-                                gsize                stride)
-{
-  GdkDmabufDownloaderInterface *iface;
-
-  g_return_if_fail (GDK_IS_DMABUF_DOWNLOADER (self));
-
-  iface = GDK_DMABUF_DOWNLOADER_GET_IFACE (self);
-  iface->download (self, texture, format, data, stride);
-}
-

gdk/gdkdmabufdownloaderprivate.h

@@ -1,39 +0,0 @@
-#pragma once
-
-#include <gdk/gdktypes.h>
-
-G_BEGIN_DECLS
-
-#define GDK_TYPE_DMABUF_DOWNLOADER               (gdk_dmabuf_downloader_get_type ())
-
-GDK_AVAILABLE_IN_ALL
-G_DECLARE_INTERFACE (GdkDmabufDownloader, gdk_dmabuf_downloader, GDK, DMABUF_DOWNLOADER, GObject)
-
-struct _GdkDmabufDownloaderInterface
-{
-  GTypeInterface g_iface;
-
-  void                  (* close)                               (GdkDmabufDownloader            *downloader);
-  gboolean              (* supports)                            (GdkDmabufDownloader            *downloader,
-                                                                 GdkDmabufTexture               *texture,
-                                                                 GError                        **error);
-  void                  (* download)                            (GdkDmabufDownloader            *downloader,
-                                                                 GdkDmabufTexture               *texture,
-                                                                 GdkMemoryFormat                 format,
-                                                                 guchar                         *data,
-                                                                 gsize                           stride);
-};
-
-void                    gdk_dmabuf_downloader_close             (GdkDmabufDownloader            *downloader);
-gboolean                gdk_dmabuf_downloader_supports          (GdkDmabufDownloader            *downloader,
-                                                                 GdkDmabufTexture               *texture,
-                                                                 GError                        **error);
-void                    gdk_dmabuf_downloader_download          (GdkDmabufDownloader            *downloader,
-                                                                 GdkDmabufTexture               *texture,
-                                                                 GdkMemoryFormat                 format,
-                                                                 guchar                         *data,
-                                                                 gsize                           stride);
-
-
-G_END_DECLS
-

gdk/gdkdmabufegl.c

@@ -19,7 +19,7 @@
 #include "config.h"
 
 #if defined(HAVE_DMABUF) && defined (HAVE_EGL)
-#include "gdkdmabufeglprivate.h"
+#include "gdkdmabufprivate.h"
 
 #include "gdkdmabufformatsbuilderprivate.h"
 #include "gdkdebugprivate.h"
@@ -31,13 +31,15 @@
 #include "gdktexturedownloader.h"
 
 #include <graphene.h>
+#include <epoxy/egl.h>
 
 /* A dmabuf downloader implementation that downloads buffers via
  * gsk_renderer_render_texture + GL texture download.
  */
 
 static gboolean
-gdk_dmabuf_egl_downloader_collect_formats (GdkDisplay                *display,
+gdk_dmabuf_egl_downloader_collect_formats (const GdkDmabufDownloader *downloader,
+                                           GdkDisplay                *display,
                                            GdkDmabufFormatsBuilder   *formats,
                                            GdkDmabufFormatsBuilder   *external)
 {
@@ -100,8 +102,9 @@ gdk_dmabuf_egl_downloader_collect_formats (GdkDisplay                *display,
               (!external_only[j] || gdk_gl_context_get_use_es (context)))
             {
               GDK_DISPLAY_DEBUG (display, DMABUF,
-                                 "%s EGL dmabuf format %.4s:%#" G_GINT64_MODIFIER "x",
+                                 "%s%s dmabuf format %.4s:%#" G_GINT64_MODIFIER "x",
                                  external_only[j] ? "external " : "",
+                                 downloader->name,
                                  (char *) &fourccs[i],
                                  modifiers[j]);
 
@@ -133,143 +136,211 @@ gdk_dmabuf_egl_downloader_collect_formats (GdkDisplay                *display,
   return TRUE;
 }
 
-/* Hack. We don't include gsk/gsk.h here to avoid a build order problem
- * with the generated header gskenumtypes.h, so we need to hack around
- * a bit to access the gsk api we need.
- */
-
-typedef struct _GskRenderer GskRenderer;
-
-extern GskRenderer *   gsk_gl_renderer_new                      (void);
-extern gboolean        gsk_renderer_realize_for_display         (GskRenderer  *renderer,
-                                                                 GdkDisplay   *display,
-                                                                 GError      **error);
-
-GdkDmabufDownloader *
-gdk_dmabuf_get_egl_downloader (GdkDisplay              *display,
-                               GdkDmabufFormatsBuilder *builder)
+static gboolean
+gdk_dmabuf_egl_downloader_add_formats (const GdkDmabufDownloader *downloader,
+                                       GdkDisplay                *display,
+                                       GdkDmabufFormatsBuilder   *builder)
 {
   GdkDmabufFormatsBuilder *formats;
   GdkDmabufFormatsBuilder *external;
   gboolean retval = FALSE;
-  GError *error = NULL;
-  GskRenderer *renderer;
 
   g_assert (display->egl_dmabuf_formats == NULL);
   g_assert (display->egl_external_formats == NULL);
 
-  if (!gdk_display_prepare_gl (display, NULL))
-    return NULL;
-
   formats = gdk_dmabuf_formats_builder_new ();
   external = gdk_dmabuf_formats_builder_new ();
 
-  retval = gdk_dmabuf_egl_downloader_collect_formats (display, formats, external);
+  retval = gdk_dmabuf_egl_downloader_collect_formats (downloader, display, formats, external);
 
   display->egl_dmabuf_formats = gdk_dmabuf_formats_builder_free_to_formats (formats);
   display->egl_external_formats = gdk_dmabuf_formats_builder_free_to_formats (external);
 
   gdk_dmabuf_formats_builder_add_formats (builder, display->egl_dmabuf_formats);
 
-  if (!retval)
-    return NULL;
-
-  renderer = gsk_gl_renderer_new ();
-
-  if (!gsk_renderer_realize_for_display (renderer, display, &error))
-    {
-      g_warning ("Failed to realize GL renderer: %s", error->message);
-      g_error_free (error);
-      g_object_unref (renderer);
-
-      return NULL;
-    }
-
-  return GDK_DMABUF_DOWNLOADER (renderer);
+  return retval;
 }
 
-EGLImage
-gdk_dmabuf_egl_create_image (GdkDisplay      *display,
-                             int              width,
-                             int              height,
-                             const GdkDmabuf *dmabuf,
-                             int              target)
+static gboolean
+gdk_dmabuf_egl_downloader_supports (const GdkDmabufDownloader  *downloader,
+                                    GdkDisplay                 *display,
+                                    const GdkDmabuf            *dmabuf,
+                                    gboolean                    premultiplied,
+                                    GdkMemoryFormat            *out_format,
+                                    GError                    **error)
 {
-  EGLDisplay egl_display = gdk_display_get_egl_display (display);
-  EGLint attribs[64];
-  int i;
-  EGLImage image;
-
-  g_return_val_if_fail (width > 0, 0);
-  g_return_val_if_fail (height > 0, 0);
-  g_return_val_if_fail (1 <= dmabuf->n_planes && dmabuf->n_planes <= 4, 0);
-  g_return_val_if_fail (target == GL_TEXTURE_2D || target == GL_TEXTURE_EXTERNAL_OES, 0);
-
-  if (egl_display == EGL_NO_DISPLAY || !display->have_egl_dma_buf_import)
+  if (gdk_dmabuf_formats_contains (display->egl_dmabuf_formats, dmabuf->fourcc, dmabuf->modifier))
     {
-      GDK_DISPLAY_DEBUG (display, DMABUF,
-                         "Can't import dmabufs into GL, missing EGL or EGL_EXT_image_dma_buf_import_modifiers");
-      return EGL_NO_IMAGE;
+      if (!gdk_dmabuf_get_memory_format (dmabuf->fourcc, premultiplied, out_format))
+        {
+          GDK_DISPLAY_DEBUG (display, DMABUF,
+                             "Falling back to generic ARGB for dmabuf format %.4s",
+                             (char *) &dmabuf->fourcc);
+          *out_format = premultiplied ? GDK_MEMORY_R8G8B8A8_PREMULTIPLIED
+                                      : GDK_MEMORY_R8G8B8A8;
+        }
+      return TRUE;
     }
 
-  GDK_DISPLAY_DEBUG (display, DMABUF,
-                     "Importing dmabuf (format: %.4s:%#" G_GINT64_MODIFIER "x, planes: %u) into GL",
-                     (char *) &dmabuf->fourcc, dmabuf->modifier, dmabuf->n_planes);
+  g_set_error (error,
+               GDK_DMABUF_ERROR, GDK_DMABUF_ERROR_UNSUPPORTED_FORMAT,
+               "Unsupported dmabuf format: %.4s:%#" G_GINT64_MODIFIER "x",
+               (char *) &dmabuf->fourcc, dmabuf->modifier);
 
-  i = 0;
-  attribs[i++] = EGL_IMAGE_PRESERVED_KHR;
-  attribs[i++] = EGL_TRUE;
-  attribs[i++] = EGL_WIDTH;
-  attribs[i++] = width;
-  attribs[i++] = EGL_HEIGHT;
-  attribs[i++] = height;
-  attribs[i++] = EGL_LINUX_DRM_FOURCC_EXT;
-  attribs[i++] = dmabuf->fourcc;
-  attribs[i++] = EGL_YUV_COLOR_SPACE_HINT_EXT;
-  attribs[i++] = EGL_ITU_REC601_EXT;
-  attribs[i++] = EGL_SAMPLE_RANGE_HINT_EXT;
-  attribs[i++] = EGL_YUV_FULL_RANGE_EXT;
+  return FALSE;
+}
 
-#define ADD_PLANE(plane) \
-  { \
-    if (dmabuf->modifier != DRM_FORMAT_MOD_INVALID) \
-      { \
-        attribs[i++] = EGL_DMA_BUF_PLANE## plane ##_MODIFIER_LO_EXT; \
-        attribs[i++] = dmabuf->modifier & 0xFFFFFFFF; \
-        attribs[i++] = EGL_DMA_BUF_PLANE## plane ## _MODIFIER_HI_EXT; \
-        attribs[i++] = dmabuf->modifier >> 32; \
-      } \
-    attribs[i++] = EGL_DMA_BUF_PLANE## plane ##_FD_EXT; \
-    attribs[i++] = dmabuf->planes[plane].fd; \
-    attribs[i++] = EGL_DMA_BUF_PLANE## plane ##_PITCH_EXT; \
-    attribs[i++] = dmabuf->planes[plane].stride; \
-    attribs[i++] = EGL_DMA_BUF_PLANE## plane ##_OFFSET_EXT; \
-    attribs[i++] = dmabuf->planes[plane].offset; \
-  }
+/* Hack. We don't include gsk/gsk.h here to avoid a build order problem
+ * with the generated header gskenumtypes.h, so we need to hack around
+ * a bit to access the gsk api we need.
+ */
 
-  ADD_PLANE (0);
+typedef gpointer GskRenderer;
 
-  if (dmabuf->n_planes > 1) ADD_PLANE (1);
-  if (dmabuf->n_planes > 2) ADD_PLANE (2);
-  if (dmabuf->n_planes > 3) ADD_PLANE (3);
+extern GskRenderer *   gsk_gl_renderer_new          (void);
+extern gboolean        gsk_renderer_realize         (GskRenderer  *renderer,
+                                                     GdkSurface   *surface,
+                                                     GError      **error);
+extern GdkTexture *    gsk_renderer_convert_texture (GskRenderer  *renderer,
+                                                     GdkTexture   *texture);
 
-  attribs[i++] = EGL_NONE;
+typedef void (* InvokeFunc) (gpointer data);
 
-  image = eglCreateImageKHR (egl_display,
-                             EGL_NO_CONTEXT,
-                             EGL_LINUX_DMA_BUF_EXT,
-                             (EGLClientBuffer)NULL,
-                             attribs);
+typedef struct _InvokeData
+{
+  volatile int spinlock;
+  InvokeFunc func;
+  gpointer data;
+} InvokeData;
 
-  if (image == EGL_NO_IMAGE)
+static gboolean
+gdk_dmabuf_egl_downloader_invoke_callback (gpointer data)
+{
+  InvokeData *invoke = data;
+  GdkGLContext *previous;
+
+  previous = gdk_gl_context_get_current ();
+
+  invoke->func (invoke->data);
+
+  if (previous)
+    gdk_gl_context_make_current (previous);
+  else
+    gdk_gl_context_clear_current ();
+
+  g_atomic_int_set (&invoke->spinlock, 1);
+
+  return FALSE;
+}
+
+/* Run func in the main thread, taking care not to disturb
+ * the current GL context of the caller.
+ */
+static void
+gdk_dmabuf_egl_downloader_run (InvokeFunc func,
+                               gpointer   data)
+{
+  InvokeData invoke = { 0, func, data };
+
+  g_main_context_invoke (NULL, gdk_dmabuf_egl_downloader_invoke_callback, &invoke);
+
+  while (g_atomic_int_get (&invoke.spinlock) == 0) ;
+}
+
+typedef struct _Download Download;
+
+struct _Download
+{
+  GdkDmabufTexture *texture;
+  GdkMemoryFormat format;
+  guchar *data;
+  gsize stride;
+};
+
+static GskRenderer *
+get_gsk_renderer (GdkDisplay *display)
+{
+  if (!display->egl_gsk_renderer)
     {
-      GDK_DISPLAY_DEBUG (display, DMABUF,
-                         "Creating EGLImage for dmabuf failed: %#x",
-                         eglGetError ());
-      return 0;
+      GskRenderer *renderer;
+      GError *error = NULL;
+
+      renderer = gsk_gl_renderer_new ();
+
+      if (!gsk_renderer_realize (renderer, NULL, &error))
+        {
+          g_warning ("Failed to realize GL renderer: %s", error->message);
+          g_error_free (error);
+          g_object_unref (renderer);
+
+          return NULL;
+        }
+
+      display->egl_gsk_renderer = renderer;
     }
 
-  return image;
+  return display->egl_gsk_renderer;
+}
+
+static void
+gdk_dmabuf_egl_downloader_do_download (gpointer data)
+{
+  Download *download = data;
+  GdkDisplay *display;
+  GskRenderer *renderer;
+  GdkTexture *native;
+  GdkTextureDownloader *downloader;
+
+  display = gdk_dmabuf_texture_get_display (download->texture);
+
+  renderer = get_gsk_renderer (display);
+
+  native = gsk_renderer_convert_texture (renderer, GDK_TEXTURE (download->texture));
+
+  downloader = gdk_texture_downloader_new (native);
+  gdk_texture_downloader_set_format (downloader, download->format);
+  gdk_texture_downloader_download_into (downloader, download->data, download->stride);
+  gdk_texture_downloader_free (downloader);
+
+  g_object_unref (native);
+}
+
+static void
+gdk_dmabuf_egl_downloader_download (const GdkDmabufDownloader *downloader,
+                                    GdkTexture                *texture,
+                                    GdkMemoryFormat            format,
+                                    guchar                    *data,
+                                    gsize                      stride)
+{
+  Download download;
+  const GdkDmabuf *dmabuf;
+
+  download.texture = GDK_DMABUF_TEXTURE (texture);
+  download.format = format;
+  download.data = data;
+  download.stride = stride;
+
+  dmabuf = gdk_dmabuf_texture_get_dmabuf (GDK_DMABUF_TEXTURE (texture));
+
+  GDK_DISPLAY_DEBUG (gdk_dmabuf_texture_get_display (download.texture), DMABUF,
+                     "Using %s for downloading a dmabuf (format %.4s:%#" G_GINT64_MODIFIER "x)",
+                     downloader->name, (char *)&dmabuf->fourcc, dmabuf->modifier);
+
+
+  gdk_dmabuf_egl_downloader_run (gdk_dmabuf_egl_downloader_do_download, &download);
+}
+
+const GdkDmabufDownloader *
+gdk_dmabuf_get_egl_downloader (void)
+{
+  static const GdkDmabufDownloader downloader = {
+    "egl",
+    gdk_dmabuf_egl_downloader_add_formats,
+    gdk_dmabuf_egl_downloader_supports,
+    gdk_dmabuf_egl_downloader_download,
+  };
+
+  return &downloader;
 }
 
 #endif  /* HAVE_DMABUF && HAVE_EGL */

gdk/gdkdmabufeglprivate.h

@@ -1,18 +0,0 @@
-#pragma once
-
-#if defined(HAVE_DMABUF) && defined (HAVE_EGL)
-
-#include "gdkdmabufprivate.h"
-#include "gdkdmabufdownloaderprivate.h"
-
-#include <epoxy/egl.h>
-
-GdkDmabufDownloader *       gdk_dmabuf_get_egl_downloader       (GdkDisplay                     *display,
-                                                                 GdkDmabufFormatsBuilder        *builder);
-EGLImage                    gdk_dmabuf_egl_create_image         (GdkDisplay                     *display,
-                                                                 int                             width,
-                                                                 int                             height,
-                                                                 const GdkDmabuf                *dmabuf,
-                                                                 int                             target);
-
-#endif  /* HAVE_DMABUF && HAVE_EGL */

gdk/gdkdmabufformats.c

@@ -25,7 +25,7 @@
 /**
  * GdkDmabufFormats:
  *
- * The `GdkDmabufFormats` struct provides information about
+ * The `GdkDmabufFormats struct provides information about
  * supported DMA buffer formats.
  *
  * You can query whether a given format is supported with
@@ -37,7 +37,7 @@
  * The list of supported formats is sorted by preference,
  * with the best formats coming first.
  *
- * The list may contains (format, modifier) pairs where the modifier
+ * The list may contains (format, modfier) pairs where the modifier
  * is `DMA_FORMAT_MOD_INVALID`, indicating that **_implicit modifiers_**
  * may be used with this format.
  *
@@ -152,10 +152,10 @@ gdk_dmabuf_formats_get_format (GdkDmabufFormats *formats,
 }
 
 /**
- * gdk_dmabuf_formats_contains:
+ * gdk_dmabuf_format_contains:
  * @formats: a `GdkDmabufFormats`
  * @fourcc: a format code
- * @modifier: a format modifier
+ * @modfier: a format modifier
  *
  * Returns whether a given format is contained in @formats.
  *

gdk/gdkdmabufprivate.h

@@ -2,13 +2,10 @@
 
 #include "gdkdmabufformatsbuilderprivate.h"
 
-#ifdef GDK_RENDERING_VULKAN
-#include <vulkan/vulkan.h>
-#endif
-
 #define GDK_DMABUF_MAX_PLANES 4
 
 typedef struct _GdkDmabuf GdkDmabuf;
+typedef struct _GdkDmabufDownloader GdkDmabufDownloader;
 
 struct _GdkDmabuf
 {
@@ -22,23 +19,29 @@ struct _GdkDmabuf
   } planes[GDK_DMABUF_MAX_PLANES];
 };
 
-#ifdef HAVE_DMABUF
-
-GdkDmabufFormats *          gdk_dmabuf_get_mmap_formats         (void) G_GNUC_CONST;
-void                        gdk_dmabuf_download_mmap            (GdkTexture                     *texture,
+struct _GdkDmabufDownloader
+{
+  const char *name;
+  gboolean              (* add_formats)                         (const GdkDmabufDownloader      *downloader,
+                                                                 GdkDisplay                     *display,
+                                                                 GdkDmabufFormatsBuilder        *builder);
+  gboolean              (* supports)                            (const GdkDmabufDownloader      *downloader,
+                                                                 GdkDisplay                     *display,
+                                                                 const GdkDmabuf                *dmabuf,
+                                                                 gboolean                        premultiplied,
+                                                                 GdkMemoryFormat                *out_format,
+                                                                 GError                        **error);
+  void                  (* download)                            (const GdkDmabufDownloader      *downloader,
+                                                                 GdkTexture                     *texture,
                                                                  GdkMemoryFormat                 format,
                                                                  guchar                         *data,
                                                                  gsize                           stride);
+};
 
+#ifdef HAVE_DMABUF
 
-int                         gdk_dmabuf_ioctl                    (int                             fd,
-                                                                 unsigned long                   request,
-                                                                 void                           *arg);
-gboolean                    gdk_dmabuf_import_sync_file         (int                             dmabuf_fd,
-                                                                 guint32                         flags,
-                                                                 int                             sync_file_fd);
-int                         gdk_dmabuf_export_sync_file         (int                             dmabuf_fd,
-                                                                 guint32                         flags);
+const GdkDmabufDownloader * gdk_dmabuf_get_direct_downloader    (void) G_GNUC_CONST;
+const GdkDmabufDownloader * gdk_dmabuf_get_egl_downloader       (void) G_GNUC_CONST;
 
 gboolean                    gdk_dmabuf_sanitize                 (GdkDmabuf                      *dest,
                                                                  gsize                           width,
@@ -48,17 +51,10 @@ gboolean                    gdk_dmabuf_sanitize                 (GdkDmabuf
 
 gboolean                    gdk_dmabuf_is_disjoint              (const GdkDmabuf                *dmabuf);
 
-gboolean                    gdk_dmabuf_fourcc_is_yuv            (guint32                         fourcc,
-                                                                 gboolean                       *is_yuv);
 gboolean                    gdk_dmabuf_get_memory_format        (guint32                         fourcc,
                                                                  gboolean                        premultiplied,
                                                                  GdkMemoryFormat                *out_format);
-#ifdef GDK_RENDERING_VULKAN
-gboolean                    gdk_dmabuf_vk_get_nth               (gsize                           n,
-                                                                 guint32                        *fourcc,
-                                                                 VkFormat                       *vk_format);
-VkFormat                    gdk_dmabuf_get_vk_format            (guint32                         fourcc,
-                                                                 VkComponentMapping             *out_components);
-#endif
+gboolean                    gdk_dmabuf_get_fourcc               (GdkMemoryFormat                 format,
+                                                                 guint32                        *out_fourcc);
 
 #endif

gdk/gdkdmabuftexture.c

@@ -21,7 +21,6 @@
 #include "gdkdmabuftextureprivate.h"
 
 #include "gdkdisplayprivate.h"
-#include "gdkdmabufdownloaderprivate.h"
 #include "gdkdmabufformatsbuilderprivate.h"
 #include "gdkdmabuffourccprivate.h"
 #include "gdkdmabufprivate.h"
@@ -39,8 +38,6 @@
  * [class@Gdk.DmabufTextureBuilder] object.
  *
  * Dma-buf textures can only be created on Linux.
- *
- * Since: 4.14
  */
 
 struct _GdkDmabufTexture
@@ -48,7 +45,7 @@ struct _GdkDmabufTexture
   GdkTexture parent_instance;
 
   GdkDisplay *display;
-  GdkDmabufDownloader *downloader;
+  const GdkDmabufDownloader *downloader;
 
   GdkDmabuf dmabuf;
 
@@ -65,6 +62,11 @@ G_DEFINE_QUARK (gdk-dmabuf-error-quark, gdk_dmabuf_error)
 
 G_DEFINE_TYPE (GdkDmabufTexture, gdk_dmabuf_texture, GDK_TYPE_TEXTURE)
 
+static void
+gdk_dmabuf_texture_init (GdkDmabufTexture *self)
+{
+}
+
 static void
 gdk_dmabuf_texture_dispose (GObject *object)
 {
@@ -73,39 +75,9 @@ gdk_dmabuf_texture_dispose (GObject *object)
   if (self->destroy)
     self->destroy (self->data);
 
-  g_clear_object (&self->downloader);
-  g_clear_object (&self->display);
-
   G_OBJECT_CLASS (gdk_dmabuf_texture_parent_class)->dispose (object);
 }
 
-typedef struct _Download Download;
-
-struct _Download
-{
-  GdkDmabufTexture *texture;
-  GdkMemoryFormat format;
-  guchar *data;
-  gsize stride;
-  volatile int spinlock;
-};
-
-static gboolean
-gdk_dmabuf_texture_invoke_callback (gpointer data)
-{
-  Download *download = data;
-
-  gdk_dmabuf_downloader_download (download->texture->downloader,
-                                  download->texture,
-                                  download->format,
-                                  download->data,
-                                  download->stride);
-
-  g_atomic_int_set (&download->spinlock, 1);
-
-  return FALSE;
-}
-
 static void
 gdk_dmabuf_texture_download (GdkTexture      *texture,
                              GdkMemoryFormat  format,
@@ -113,19 +85,12 @@ gdk_dmabuf_texture_download (GdkTexture      *texture,
                              gsize            stride)
 {
   GdkDmabufTexture *self = GDK_DMABUF_TEXTURE (texture);
-  Download download = { self, format, data, stride, 0 };
 
-  if (self->downloader == NULL)
-    {
-#ifdef HAVE_DMABUF
-      gdk_dmabuf_download_mmap (texture, format, data, stride);
-#endif
-      return;
-    }
-
-  g_main_context_invoke (NULL, gdk_dmabuf_texture_invoke_callback, &download);
-
-  while (g_atomic_int_get (&download.spinlock) == 0);
+  self->downloader->download (self->downloader,
+                              texture,
+                              format,
+                              data,
+                              stride);
 }
 
 static void
@@ -139,11 +104,6 @@ gdk_dmabuf_texture_class_init (GdkDmabufTextureClass *klass)
   gobject_class->dispose = gdk_dmabuf_texture_dispose;
 }
 
-static void
-gdk_dmabuf_texture_init (GdkDmabufTexture *self)
-{
-}
-
 GdkDisplay *
 gdk_dmabuf_texture_get_display (GdkDmabufTexture *self)
 {
@@ -167,15 +127,14 @@ gdk_dmabuf_texture_new_from_builder (GdkDmabufTextureBuilder *builder,
   GdkTexture *update_texture;
   GdkDisplay *display;
   GdkDmabuf dmabuf;
+  GdkMemoryFormat format;
   GError *local_error = NULL;
   int width, height;
-  gboolean premultiplied;
   gsize i;
 
   display = gdk_dmabuf_texture_builder_get_display (builder);
   width = gdk_dmabuf_texture_builder_get_width (builder);
   height = gdk_dmabuf_texture_builder_get_height (builder);
-  premultiplied = gdk_dmabuf_texture_builder_get_premultiplied (builder);
 
   if (!gdk_dmabuf_sanitize (&dmabuf,
                             width,
@@ -186,57 +145,43 @@ gdk_dmabuf_texture_new_from_builder (GdkDmabufTextureBuilder *builder,
 
   gdk_display_init_dmabuf (display);
 
+  for (i = 0; display->dmabuf_downloaders[i] != NULL; i++)
+    {
+      if (local_error && g_error_matches (local_error, GDK_DMABUF_ERROR, GDK_DMABUF_ERROR_UNSUPPORTED_FORMAT))
+        g_clear_error (&local_error);
+
+      if (display->dmabuf_downloaders[i]->supports (display->dmabuf_downloaders[i],
+                                                    display,
+                                                    &dmabuf,
+                                                    gdk_dmabuf_texture_builder_get_premultiplied (builder),
+                                                    &format,
+                                                    local_error ? NULL : &local_error))
+        break;
+    }
+
+  if (display->dmabuf_downloaders[i] == NULL)
+    {
+      g_propagate_error (error, local_error);
+      return NULL;
+    }
+
+  GDK_DISPLAY_DEBUG (display, DMABUF,
+             "Creating dmabuf texture, format %.4s:%#" G_GINT64_MODIFIER "x, %s%u planes, memory format %u, downloader %s",
+             (char *) &dmabuf.fourcc, dmabuf.modifier,
+             gdk_dmabuf_texture_builder_get_premultiplied (builder) ? " premultiplied, " : "",
+             dmabuf.n_planes,
+             format,
+             display->dmabuf_downloaders[i]->name);
+
   self = g_object_new (GDK_TYPE_DMABUF_TEXTURE,
                        "width", width,
                        "height", height,
                        NULL);
 
+  GDK_TEXTURE (self)->format = format;
   g_set_object (&self->display, display);
+  self->downloader = display->dmabuf_downloaders[i];
   self->dmabuf = dmabuf;
-
-  if (!gdk_dmabuf_get_memory_format (dmabuf.fourcc, premultiplied, &(GDK_TEXTURE (self)->format)))
-    {
-      GDK_DISPLAY_DEBUG (display, DMABUF,
-                         "Falling back to generic RGBA for dmabuf format %.4s",
-                         (char *) &dmabuf.fourcc);
-      GDK_TEXTURE (self)->format = premultiplied ? GDK_MEMORY_R8G8B8A8_PREMULTIPLIED
-                                                 : GDK_MEMORY_R8G8B8A8;
-    }
-
-  if (!gdk_dmabuf_formats_contains (gdk_dmabuf_get_mmap_formats (), dmabuf.fourcc, dmabuf.modifier))
-    {
-      for (i = 0; display->dmabuf_downloaders[i] != NULL; i++)
-        {
-          if (local_error && g_error_matches (local_error, GDK_DMABUF_ERROR, GDK_DMABUF_ERROR_UNSUPPORTED_FORMAT))
-            g_clear_error (&local_error);
-
-          if (gdk_dmabuf_downloader_supports (display->dmabuf_downloaders[i],
-                                              self,
-                                              local_error ? NULL : &local_error))
-            {
-              self->downloader = g_object_ref (display->dmabuf_downloaders[i]);
-              break;
-            }
-        }
-
-      if (self->downloader == NULL)
-        {
-          g_propagate_error (error, local_error);
-          g_object_unref (self);
-          return NULL;
-        }
-    }
-
-  GDK_DISPLAY_DEBUG (display, DMABUF,
-                     "Creating dmabuf texture, format %.4s:%#" G_GINT64_MODIFIER "x, %s%u planes, memory format %u, downloader %s",
-                     (char *) &dmabuf.fourcc, dmabuf.modifier,
-                     gdk_dmabuf_texture_builder_get_premultiplied (builder) ? " premultiplied, " : "",
-                     dmabuf.n_planes,
-                     GDK_TEXTURE (self)->format,
-                     self->downloader ? G_OBJECT_TYPE_NAME (self->downloader) : "none");
-
-  /* Set this only once we know that the texture will be created.
-   * Otherwise dispose() will run the callback */
   self->destroy = destroy;
   self->data = data;
 

gdk/gdkdmabuftexture.h

@@ -34,6 +34,7 @@ G_BEGIN_DECLS
 
 #define GDK_DMABUF_ERROR       (gdk_dmabuf_error_quark ())
 
+typedef struct _GdkDmabufTexture            GdkDmabufTexture;
 typedef struct _GdkDmabufTextureClass       GdkDmabufTextureClass;
 
 GDK_AVAILABLE_IN_4_14

gdk/gdkdmabuftexturebuilder.c

@@ -57,7 +57,7 @@ struct _GdkDmabufTextureBuilderClass
  *
  * DMA buffers are commonly called **_dma-bufs_**.
  *
- * DMA buffers are a feature of the Linux kernel to enable efficient buffer and
+ * DMA buffers a feature of the Linux kernel to enable efficient buffer and
  * memory sharing between hardware such as codecs, GPUs, displays, cameras and the
  * kernel drivers controlling them. For example, a decoder may want its output to
  * be directly shared with the display server for rendering without a copy.
@@ -67,7 +67,7 @@ struct _GdkDmabufTextureBuilderClass
  *
  * The memory that is shared via DMA buffers is usually stored in non-system memory
  * (maybe in device's local memory or something else not directly accessible by the
- * CPU), and accessing this memory from the CPU may have higher-than-usual overhead.
+ * CPU), and accessing this memory from the CPU may have higher than usual overhead.
  *
  * In particular for graphics data, it is not uncommon that data consists of multiple
  * separate blocks of memory, for example one block for each of the red, green and
@@ -87,7 +87,7 @@ struct _GdkDmabufTextureBuilderClass
  *
  * For historical reasons, some producers of dma-bufs don't provide an explicit modifier, but
  * instead return `DMA_FORMAT_MOD_INVALID` to indicate that their modifier is **_implicit_**.
- * GTK tries to accommodate this situation by accepting `DMA_FORMAT_MOD_INVALID` as modifier.
+ * GTK tries to accomodate this situation by accepting `DMA_FORMAT_MOD_INVALID` as modifier.
  *
  * The operation of `GdkDmabufTextureBuilder` is quite simple: Create a texture builder,
  * set all the necessary properties, and then call [method@Gdk.DmabufTextureBuilder.build]

gdk/gdkdrag.c

@@ -56,10 +56,10 @@ static struct {
   GdkCursor    *cursor;
 } drag_cursors[] = {
   { GDK_ACTION_ASK,     "dnd-ask",  NULL },
-  { GDK_ACTION_COPY,    "copy", NULL },
-  { GDK_ACTION_MOVE,    "move", NULL },
-  { GDK_ACTION_LINK,    "alias", NULL },
-  { 0,                  "no-drop", NULL },
+  { GDK_ACTION_COPY,    "dnd-copy", NULL },
+  { GDK_ACTION_MOVE,    "dnd-move", NULL },
+  { GDK_ACTION_LINK,    "dnd-link", NULL },
+  { 0,                  "dnd-none", NULL },
 };
 
 enum {

gdk/gdkdrawcontext.c

@@ -71,7 +71,7 @@ gdk_draw_context_default_surface_resized (GdkDrawContext *context)
 static void
 gdk_draw_context_default_empty_frame (GdkDrawContext *context)
 {
-  g_warning ("FIXME: Implement GdkDrawContext.empty_frame in %s", G_OBJECT_TYPE_NAME (context));
+  g_warning ("FIXME: Implement");
 }
 
 static void
@@ -305,8 +305,8 @@ gdk_draw_context_get_surface (GdkDrawContext *context)
  *
  * When using GTK, the widget system automatically places calls to
  * gdk_draw_context_begin_frame() and gdk_draw_context_end_frame() via the
- * use of [GskRenderer](../gsk4/class.Renderer.html)s, so application code
- * does not need to call these functions explicitly.
+ * use of [class@Gsk.Renderer]s, so application code does not need to call
+ * these functions explicitly.
  */
 void
 gdk_draw_context_begin_frame (GdkDrawContext       *context,
@@ -331,7 +331,7 @@ gdk_draw_context_begin_frame (GdkDrawContext       *context,
  *
  * This is only a request and if the GDK backend does not support HDR rendering
  * or does not consider it worthwhile, it may choose to not honor the request.
- * It may also choose to provide a different depth even if it was not requested.
+ * It may also choose to provide a differnet depth even if it was not requested.
  * Typically the steps undertaken by a backend are:
  * 1. Check if high depth is supported by this drawing backend.
  * 2. Check if the compositor supports high depth.

gdk/gdkenums.h

@@ -160,8 +160,6 @@ typedef enum
  *   reasons
  *
  * Error enumeration for `GdkDmabufTexture`.
- *
- * Since: 4.14
  */
 typedef enum {
   GDK_DMABUF_ERROR_NOT_AVAILABLE,

gdk/gdkevents.h

@@ -165,18 +165,12 @@ typedef struct _GdkTouchpadEvent        GdkTouchpadEvent;
  * @GDK_PAD_RING: A tablet pad axis event from a "ring".
  * @GDK_PAD_STRIP: A tablet pad axis event from a "strip".
  * @GDK_PAD_GROUP_MODE: A tablet pad group mode change.
+ * @GDK_TOUCHPAD_HOLD: A touchpad hold gesture event, the current state
+ *   is determined by its phase field. Since: 4.6
  * @GDK_EVENT_LAST: marks the end of the GdkEventType enumeration.
  *
  * Specifies the type of the event.
  */
-/**
-  * GDK_TOUCHPAD_HOLD:
-  *
-  * A touchpad hold gesture event, the current state is determined by its phase
-  * field.
-  *
-  * Since: 4.6
-  */
 typedef enum
 {
   GDK_DELETE,

gdk/gdkframeclock.c

@@ -166,8 +166,7 @@ gdk_frame_clock_class_init (GdkFrameClockClass *klass)
    *
    * Animations should be updated using [method@Gdk.FrameClock.get_frame_time].
    * Applications can connect directly to this signal, or use
-   * [gtk_widget_add_tick_callback()](../gtk4/method.Widget.add_tick_callback.html)
-   * as a more convenient interface.
+   * [method@Gtk.Widget.add_tick_callback] as a more convenient interface.
    */
   signals[UPDATE] =
     g_signal_new (g_intern_static_string ("update"),
@@ -204,8 +203,7 @@ gdk_frame_clock_class_init (GdkFrameClockClass *klass)
    *
    * The frame is repainted. GDK normally handles this internally and
    * emits [signal@Gdk.Surface::render] signals which are turned into
-   * [GtkWidget::snapshot](../gtk4/signal.Widget.snapshot.html) signals
-   * by GTK.
+   * [signal@Gtk.Widget::snapshot] signals by GTK.
    */
   signals[PAINT] =
     g_signal_new (g_intern_static_string ("paint"),

gdk/gdkglcontext.c

@@ -78,7 +78,7 @@
 
 #include "gdkdebugprivate.h"
 #include "gdkdisplayprivate.h"
-#include "gdkdmabufeglprivate.h"
+#include <glib/gi18n-lib.h>
 #include "gdkmemoryformatprivate.h"
 #include "gdkmemorytextureprivate.h"
 #include "gdkprofilerprivate.h"
@@ -87,8 +87,6 @@
 
 #include "gdkprivate.h"
 
-#include <glib/gi18n-lib.h>
-
 #ifdef GDK_WINDOWING_WIN32
 # include "gdk/win32/gdkwin32.h"
 #endif
@@ -106,15 +104,10 @@
 
 #define DEFAULT_ALLOWED_APIS GDK_GL_API_GL | GDK_GL_API_GLES
 
-typedef struct _GdkGLContextPrivate GdkGLContextPrivate;
-
-struct _GdkGLContextPrivate
-{
+typedef struct {
   GdkGLVersion required;
   GdkGLVersion gl_version;
 
-  GdkGLMemoryFlags memory_flags[GDK_MEMORY_N_FORMATS];
-
   guint has_khr_debug : 1;
   guint use_khr_debug : 1;
   guint has_half_float : 1;
@@ -136,7 +129,7 @@ struct _GdkGLContextPrivate
   EGLContext egl_context;
   EGLBoolean (*eglSwapBuffersWithDamage) (EGLDisplay, EGLSurface, const EGLint *, EGLint);
 #endif
-};
+} GdkGLContextPrivate;
 
 enum {
   PROP_0,
@@ -1531,133 +1524,6 @@ gdk_gl_context_realize (GdkGLContext  *context,
   return priv->api;
 }
 
-static void
-gdk_gl_context_init_memory_flags (GdkGLContext *self)
-{
-  GdkGLContextPrivate *priv = gdk_gl_context_get_instance_private (self);
-  gsize i;
-
-  if (!gdk_gl_context_get_use_es (self))
-    {
-      for (i = 0; i < G_N_ELEMENTS (priv->memory_flags); i++)
-        {
-          priv->memory_flags[i] = GDK_GL_FORMAT_USABLE | GDK_GL_FORMAT_RENDERABLE | GDK_GL_FORMAT_FILTERABLE;
-        }
-      return;
-    }
-
-  /* GLES 2.0 spec, tables 3.2 and 3.3 */
-  priv->memory_flags[GDK_MEMORY_R8G8B8] = GDK_GL_FORMAT_USABLE | GDK_GL_FORMAT_FILTERABLE;
-  priv->memory_flags[GDK_MEMORY_R8G8B8A8_PREMULTIPLIED] = GDK_GL_FORMAT_USABLE | GDK_GL_FORMAT_FILTERABLE;
-  priv->memory_flags[GDK_MEMORY_R8G8B8A8] = GDK_GL_FORMAT_USABLE | GDK_GL_FORMAT_FILTERABLE;
-#if 0
-  /* GLES2 can do these, but GTK can't */
-  priv->memory_flags[GDK_MEMORY_A8] = GDK_GL_FORMAT_USABLE | GDK_GL_FORMAT_FILTERABLE;
-  priv->memory_flags[GDK_MEMORY_G8] = GDK_GL_FORMAT_USABLE | GDK_GL_FORMAT_FILTERABLE;
-  priv->memory_flags[GDK_MEMORY_G8A8_PREMULTIPLIED] = GDK_GL_FORMAT_USABLE | GDK_GL_FORMAT_FILTERABLE;
-  priv->memory_flags[GDK_MEMORY_G8A8] = GDK_GL_FORMAT_USABLE | GDK_GL_FORMAT_FILTERABLE;
-#endif
-
-  if (gdk_gl_version_greater_equal (&priv->gl_version, &GDK_GL_VERSION_INIT (3, 0)))
-    {
-      /* GLES 3.0.6 spec, table 3.13 */
-      priv->memory_flags[GDK_MEMORY_G8] |= GDK_GL_FORMAT_USABLE | GDK_GL_FORMAT_RENDERABLE | GDK_GL_FORMAT_FILTERABLE;
-      priv->memory_flags[GDK_MEMORY_A8] |= GDK_GL_FORMAT_USABLE | GDK_GL_FORMAT_RENDERABLE | GDK_GL_FORMAT_FILTERABLE;
-      priv->memory_flags[GDK_MEMORY_G8A8_PREMULTIPLIED] |= GDK_GL_FORMAT_USABLE | GDK_GL_FORMAT_RENDERABLE | GDK_GL_FORMAT_FILTERABLE;
-      priv->memory_flags[GDK_MEMORY_G8A8] |= GDK_GL_FORMAT_USABLE | GDK_GL_FORMAT_RENDERABLE | GDK_GL_FORMAT_FILTERABLE;
-      priv->memory_flags[GDK_MEMORY_R8G8B8] |= GDK_GL_FORMAT_USABLE | GDK_GL_FORMAT_RENDERABLE | GDK_GL_FORMAT_FILTERABLE;
-      priv->memory_flags[GDK_MEMORY_R8G8B8A8_PREMULTIPLIED] |= GDK_GL_FORMAT_USABLE | GDK_GL_FORMAT_RENDERABLE | GDK_GL_FORMAT_FILTERABLE;
-      priv->memory_flags[GDK_MEMORY_R8G8B8A8] |= GDK_GL_FORMAT_USABLE | GDK_GL_FORMAT_RENDERABLE | GDK_GL_FORMAT_FILTERABLE;
-      priv->memory_flags[GDK_MEMORY_R8G8B8X8] |= GDK_GL_FORMAT_USABLE | GDK_GL_FORMAT_RENDERABLE | GDK_GL_FORMAT_FILTERABLE;
-      priv->memory_flags[GDK_MEMORY_R16G16B16_FLOAT] |= GDK_GL_FORMAT_USABLE | GDK_GL_FORMAT_FILTERABLE;
-      priv->memory_flags[GDK_MEMORY_R16G16B16A16_FLOAT_PREMULTIPLIED] |= GDK_GL_FORMAT_USABLE | GDK_GL_FORMAT_FILTERABLE;
-      priv->memory_flags[GDK_MEMORY_R16G16B16A16_FLOAT] |= GDK_GL_FORMAT_USABLE | GDK_GL_FORMAT_FILTERABLE;
-      priv->memory_flags[GDK_MEMORY_A16_FLOAT] |= GDK_GL_FORMAT_USABLE | GDK_GL_FORMAT_FILTERABLE;
-      priv->memory_flags[GDK_MEMORY_R32G32B32_FLOAT] |= GDK_GL_FORMAT_USABLE;
-      priv->memory_flags[GDK_MEMORY_R32G32B32A32_FLOAT_PREMULTIPLIED] |= GDK_GL_FORMAT_USABLE;
-      priv->memory_flags[GDK_MEMORY_R32G32B32A32_FLOAT] |= GDK_GL_FORMAT_USABLE;
-      priv->memory_flags[GDK_MEMORY_A32_FLOAT] |= GDK_GL_FORMAT_USABLE;
-
-      /* no changes in GLES 3.1 spec, table 8.13 */
-
-      if (gdk_gl_version_greater_equal (&priv->gl_version, &GDK_GL_VERSION_INIT (3, 2)))
-        {
-          /* GLES 3.2 spec, table 8.10 */
-          priv->memory_flags[GDK_MEMORY_R16G16B16A16_FLOAT_PREMULTIPLIED] |= GDK_GL_FORMAT_RENDERABLE;
-          priv->memory_flags[GDK_MEMORY_R16G16B16A16_FLOAT] |= GDK_GL_FORMAT_RENDERABLE;
-          priv->memory_flags[GDK_MEMORY_A16_FLOAT] |= GDK_GL_FORMAT_RENDERABLE;
-          priv->memory_flags[GDK_MEMORY_R32G32B32A32_FLOAT_PREMULTIPLIED] |= GDK_GL_FORMAT_RENDERABLE;
-          priv->memory_flags[GDK_MEMORY_R32G32B32A32_FLOAT] |= GDK_GL_FORMAT_RENDERABLE;
-          priv->memory_flags[GDK_MEMORY_A32_FLOAT] |= GDK_GL_FORMAT_RENDERABLE;
-        }
-    }
-
-  if (epoxy_has_gl_extension ("GL_OES_rgb8_rgba8"))
-    {
-      priv->memory_flags[GDK_MEMORY_R8G8B8A8_PREMULTIPLIED] |= GDK_GL_FORMAT_USABLE | GDK_GL_FORMAT_RENDERABLE | GDK_GL_FORMAT_FILTERABLE;
-      priv->memory_flags[GDK_MEMORY_R8G8B8A8] |= GDK_GL_FORMAT_USABLE | GDK_GL_FORMAT_RENDERABLE | GDK_GL_FORMAT_FILTERABLE;
-      priv->memory_flags[GDK_MEMORY_R8G8B8] |= GDK_GL_FORMAT_USABLE | GDK_GL_FORMAT_RENDERABLE | GDK_GL_FORMAT_FILTERABLE;
-      if (gdk_gl_version_greater_equal (&priv->gl_version, &GDK_GL_VERSION_INIT (3, 0)))
-        priv->memory_flags[GDK_MEMORY_R8G8B8X8] |= GDK_GL_FORMAT_USABLE | GDK_GL_FORMAT_RENDERABLE | GDK_GL_FORMAT_FILTERABLE;
-    }
-  if (epoxy_has_gl_extension ("GL_EXT_abgr"))
-    {
-      priv->memory_flags[GDK_MEMORY_A8B8G8R8_PREMULTIPLIED] |= GDK_GL_FORMAT_USABLE | GDK_GL_FORMAT_RENDERABLE | GDK_GL_FORMAT_FILTERABLE;
-      priv->memory_flags[GDK_MEMORY_A8B8G8R8] |= GDK_GL_FORMAT_USABLE | GDK_GL_FORMAT_RENDERABLE | GDK_GL_FORMAT_FILTERABLE;
-      if (gdk_gl_version_greater_equal (&priv->gl_version, &GDK_GL_VERSION_INIT (3, 0)))
-        priv->memory_flags[GDK_MEMORY_X8B8G8R8] |= GDK_GL_FORMAT_USABLE | GDK_GL_FORMAT_RENDERABLE | GDK_GL_FORMAT_FILTERABLE;
-    }
-  if (epoxy_has_gl_extension ("GL_EXT_texture_format_BGRA8888"))
-    {
-      priv->memory_flags[GDK_MEMORY_B8G8R8A8_PREMULTIPLIED] |= GDK_GL_FORMAT_USABLE | GDK_GL_FORMAT_RENDERABLE | GDK_GL_FORMAT_FILTERABLE;
-      priv->memory_flags[GDK_MEMORY_B8G8R8A8] |= GDK_GL_FORMAT_USABLE | GDK_GL_FORMAT_RENDERABLE | GDK_GL_FORMAT_FILTERABLE;
-      if (gdk_gl_version_greater_equal (&priv->gl_version, &GDK_GL_VERSION_INIT (3, 0)))
-        priv->memory_flags[GDK_MEMORY_B8G8R8X8] |= GDK_GL_FORMAT_USABLE | GDK_GL_FORMAT_RENDERABLE | GDK_GL_FORMAT_FILTERABLE;
-    }
-
-  /* Technically, those extensions are supported on GLES2.
-   * However, GTK uses the wrong format/type pairs with them, so we don't enable them.
-   */
-  if (gdk_gl_version_greater_equal (&priv->gl_version, &GDK_GL_VERSION_INIT (3, 0)))
-    {
-      if (epoxy_has_gl_extension ("GL_EXT_texture_norm16"))
-        {
-          priv->memory_flags[GDK_MEMORY_R16G16B16A16_PREMULTIPLIED] |= GDK_GL_FORMAT_USABLE | GDK_GL_FORMAT_RENDERABLE | GDK_GL_FORMAT_FILTERABLE;
-          priv->memory_flags[GDK_MEMORY_R16G16B16A16] |= GDK_GL_FORMAT_USABLE | GDK_GL_FORMAT_RENDERABLE | GDK_GL_FORMAT_FILTERABLE;
-          priv->memory_flags[GDK_MEMORY_R16G16B16] |= GDK_GL_FORMAT_USABLE | GDK_GL_FORMAT_FILTERABLE;
-          priv->memory_flags[GDK_MEMORY_G16A16_PREMULTIPLIED] |= GDK_GL_FORMAT_USABLE | GDK_GL_FORMAT_RENDERABLE | GDK_GL_FORMAT_FILTERABLE;
-          priv->memory_flags[GDK_MEMORY_G16A16] |= GDK_GL_FORMAT_USABLE | GDK_GL_FORMAT_RENDERABLE | GDK_GL_FORMAT_FILTERABLE;
-          priv->memory_flags[GDK_MEMORY_G16] |= GDK_GL_FORMAT_USABLE | GDK_GL_FORMAT_RENDERABLE | GDK_GL_FORMAT_FILTERABLE;
-          priv->memory_flags[GDK_MEMORY_A16] |= GDK_GL_FORMAT_USABLE | GDK_GL_FORMAT_RENDERABLE | GDK_GL_FORMAT_FILTERABLE;
-        }
-      if (epoxy_has_gl_extension ("GL_OES_texture_half_float"))
-        {
-          GdkGLMemoryFlags flags = GDK_GL_FORMAT_USABLE;
-          if (epoxy_has_gl_extension ("GL_EXT_color_buffer_half_float"))
-            flags |= GDK_GL_FORMAT_RENDERABLE;
-          if (epoxy_has_gl_extension ("GL_OES_texture_half_float_linear"))
-            flags |= GDK_GL_FORMAT_FILTERABLE;
-          priv->memory_flags[GDK_MEMORY_R16G16B16A16_FLOAT_PREMULTIPLIED] |= flags;
-          priv->memory_flags[GDK_MEMORY_R16G16B16A16_FLOAT] |= flags;
-          /* disabled for now, see https://gitlab.freedesktop.org/mesa/mesa/-/issues/10378 */
-          priv->memory_flags[GDK_MEMORY_R16G16B16_FLOAT] |= flags & ~GDK_GL_FORMAT_RENDERABLE;
-          priv->memory_flags[GDK_MEMORY_A16_FLOAT] |= flags;
-        }
-      if (epoxy_has_gl_extension ("GL_OES_texture_float"))
-        {
-          GdkGLMemoryFlags flags = GDK_GL_FORMAT_USABLE;
-          if (epoxy_has_gl_extension ("GL_EXT_color_buffer_float"))
-            flags |= GDK_GL_FORMAT_RENDERABLE;
-          if (epoxy_has_gl_extension ("GL_OES_texture_float_linear"))
-            flags |= GDK_GL_FORMAT_FILTERABLE;
-          priv->memory_flags[GDK_MEMORY_R32G32B32A32_FLOAT_PREMULTIPLIED] |= flags;
-          priv->memory_flags[GDK_MEMORY_R32G32B32A32_FLOAT] |= flags;
-          priv->memory_flags[GDK_MEMORY_R32G32B32_FLOAT] |= flags & ~GDK_GL_FORMAT_RENDERABLE;
-          priv->memory_flags[GDK_MEMORY_A32_FLOAT] |= flags;
-        }
-    }
-}
-
 void
 gdk_gl_version_init_epoxy (GdkGLVersion *version)
 {
@@ -1724,8 +1590,6 @@ gdk_gl_context_check_extensions (GdkGLContext *context)
                    epoxy_has_gl_extension ("GL_ARB_sync") ||
                    epoxy_has_gl_extension ("GL_APPLE_sync");
 
-  gdk_gl_context_init_memory_flags (context);
-
   {
     int max_texture_size;
     glGetIntegerv (GL_MAX_TEXTURE_SIZE, &max_texture_size);
@@ -2009,15 +1873,6 @@ gdk_gl_context_get_current (void)
   return context;
 }
 
-GdkGLMemoryFlags
-gdk_gl_context_get_format_flags (GdkGLContext    *self,
-                                 GdkMemoryFormat  format)
-{
-  GdkGLContextPrivate *priv = gdk_gl_context_get_instance_private (self);
-
-  return priv->memory_flags[format];
-}
-
 gboolean
 gdk_gl_context_has_debug (GdkGLContext *self)
 {
@@ -2162,16 +2017,81 @@ gdk_gl_context_import_dmabuf_for_target (GdkGLContext    *self,
 {
 #if defined(HAVE_EGL) && defined(HAVE_DMABUF)
   GdkDisplay *display = gdk_gl_context_get_display (self);
+  EGLDisplay egl_display = gdk_display_get_egl_display (display);
+  EGLint attribs[64];
+  int i;
   EGLImage image;
   guint texture_id;
 
-  image = gdk_dmabuf_egl_create_image (display,
-                                       width,
-                                       height,
-                                       dmabuf,
-                                       target);
+  g_return_val_if_fail (GDK_IS_GL_CONTEXT (self), 0);
+  g_return_val_if_fail (width > 0, 0);
+  g_return_val_if_fail (height > 0, 0);
+  g_return_val_if_fail (1 <= dmabuf->n_planes && dmabuf->n_planes <= 4, 0);
+  g_return_val_if_fail (target == GL_TEXTURE_2D || target == GL_TEXTURE_EXTERNAL_OES, 0);
+
+  if (egl_display == EGL_NO_DISPLAY || !display->have_egl_dma_buf_import)
+    {
+      GDK_DISPLAY_DEBUG (display, DMABUF,
+                         "Can't import dmabufs into GL, missing EGL or EGL_EXT_image_dma_buf_import_modifiers");
+      return 0;
+    }
+
+  GDK_DISPLAY_DEBUG (display, DMABUF,
+                     "Importing dmabuf (format: %.4s:%#" G_GINT64_MODIFIER "x, planes: %u) into GL",
+                     (char *) &dmabuf->fourcc, dmabuf->modifier, dmabuf->n_planes);
+
+  i = 0;
+  attribs[i++] = EGL_IMAGE_PRESERVED_KHR;
+  attribs[i++] = EGL_TRUE;
+  attribs[i++] = EGL_WIDTH;
+  attribs[i++] = width;
+  attribs[i++] = EGL_HEIGHT;
+  attribs[i++] = height;
+  attribs[i++] = EGL_LINUX_DRM_FOURCC_EXT;
+  attribs[i++] = dmabuf->fourcc;
+  attribs[i++] = EGL_YUV_COLOR_SPACE_HINT_EXT;
+  attribs[i++] = EGL_ITU_REC601_EXT;
+  attribs[i++] = EGL_SAMPLE_RANGE_HINT_EXT;
+  attribs[i++] = EGL_YUV_FULL_RANGE_EXT;
+
+#define ADD_PLANE(plane) \
+  { \
+    if (dmabuf->modifier != DRM_FORMAT_MOD_INVALID) \
+      { \
+        attribs[i++] = EGL_DMA_BUF_PLANE## plane ##_MODIFIER_LO_EXT; \
+        attribs[i++] = dmabuf->modifier & 0xFFFFFFFF; \
+        attribs[i++] = EGL_DMA_BUF_PLANE## plane ## _MODIFIER_HI_EXT; \
+        attribs[i++] = dmabuf->modifier >> 32; \
+      } \
+    attribs[i++] = EGL_DMA_BUF_PLANE## plane ##_FD_EXT; \
+    attribs[i++] = dmabuf->planes[plane].fd; \
+    attribs[i++] = EGL_DMA_BUF_PLANE## plane ##_PITCH_EXT; \
+    attribs[i++] = dmabuf->planes[plane].stride; \
+    attribs[i++] = EGL_DMA_BUF_PLANE## plane ##_OFFSET_EXT; \
+    attribs[i++] = dmabuf->planes[plane].offset; \
+  }
+
+  ADD_PLANE (0);
+
+  if (dmabuf->n_planes > 1) ADD_PLANE (1);
+  if (dmabuf->n_planes > 2) ADD_PLANE (2);
+  if (dmabuf->n_planes > 3) ADD_PLANE (3);
+
+  attribs[i++] = EGL_NONE;
+
+  image = eglCreateImageKHR (egl_display,
+                             EGL_NO_CONTEXT,
+                             EGL_LINUX_DMA_BUF_EXT,
+                             (EGLClientBuffer)NULL,
+                             attribs);
+
   if (image == EGL_NO_IMAGE)
-    return 0;
+    {
+      GDK_DISPLAY_DEBUG (display, DMABUF,
+                         "Creating EGLImage for dmabuf failed: %#x",
+                         eglGetError ());
+      return 0;
+    }
 
   glGenTextures (1, &texture_id);
   glBindTexture (target, texture_id);
@@ -2179,7 +2099,7 @@ gdk_gl_context_import_dmabuf_for_target (GdkGLContext    *self,
   glTexParameteri (target, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
   glTexParameteri (target, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
 
-  eglDestroyImageKHR (gdk_display_get_egl_display (display), image);
+  eglDestroyImageKHR (egl_display, image);
 
   return texture_id;
 #else

gdk/gdkglcontextprivate.h

@@ -35,17 +35,6 @@ typedef enum {
   GDK_GL_CGL
 } GdkGLBackend;
 
-typedef enum {
-  /* The format is supported for glTexImage2D() */
-  GDK_GL_FORMAT_USABLE = 1 << 0,
-  /* The format can be rendered to.
-   * GL/GLES spec term: "color-renderable" */
-  GDK_GL_FORMAT_RENDERABLE = 1 << 1,
-  /* GL_LINEAR/GL_MIPMAP_LINEAR can be used for textures in this format.
-   * GLES spec term: "texture-filterable" */
-  GDK_GL_FORMAT_FILTERABLE = 1 << 2
-} GdkGLMemoryFlags;
-
 /* 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 */
@@ -161,8 +150,6 @@ void                    gdk_gl_context_label_object_printf      (GdkGLContext
 
 const char *            gdk_gl_context_get_glsl_version_string  (GdkGLContext    *self);
 
-GdkGLMemoryFlags        gdk_gl_context_get_format_flags         (GdkGLContext    *self,
-                                                                 GdkMemoryFormat  format) G_GNUC_PURE;
 gboolean                gdk_gl_context_has_debug                (GdkGLContext    *self) G_GNUC_PURE;
 
 gboolean                gdk_gl_context_use_es_bgra              (GdkGLContext    *context);

gdk/gdkgltexture.c

@@ -151,23 +151,15 @@ gdk_gl_texture_find_format (GdkGLContext    *context,
 
   for (format = 0; format < GDK_MEMORY_N_FORMATS; format++)
     {
-      GLint q_internal_format;
-      GLenum q_format, q_type;
+      GLenum q_internal_format, q_format, q_type;
       GLint q_swizzle[4];
 
       if (gdk_memory_format_alpha (format) != alpha)
         continue;
 
-      if (!(gdk_gl_context_get_format_flags (context, format) & GDK_GL_FORMAT_RENDERABLE))
+      if (!gdk_memory_format_gl_format (format, context, &q_internal_format, &q_format, &q_type, q_swizzle))
         continue;
 
-      gdk_memory_format_gl_format (format,
-                                   gdk_gl_context_get_use_es (context),
-                                   &q_internal_format,
-                                   &q_format,
-                                   &q_type,
-                                   q_swizzle);
-
       if (q_format != gl_format || q_type != gl_type)
         continue;
 
@@ -187,20 +179,18 @@ gdk_gl_texture_do_download (GdkGLTexture *self,
   GdkMemoryFormat format;
   gsize expected_stride;
   Download *download = download_;
-  GLint gl_internal_format;
-  GLenum gl_format, gl_type;
+  GLenum gl_internal_format, gl_format, gl_type;
   GLint gl_swizzle[4];
 
   format = gdk_texture_get_format (texture),
   expected_stride = texture->width * gdk_memory_format_bytes_per_pixel (download->format);
 
   if (!gdk_gl_context_get_use_es (context) &&
-      ((gdk_gl_context_get_format_flags (context, format) & GDK_GL_FORMAT_USABLE) == GDK_GL_FORMAT_USABLE))
-    {
       gdk_memory_format_gl_format (format,
-                                   gdk_gl_context_get_use_es (context),
+                                   context,
                                    &gl_internal_format,
-                                   &gl_format, &gl_type, gl_swizzle);
+                                   &gl_format, &gl_type, gl_swizzle))
+    {
       if (download->stride == expected_stride &&
           download->format == format)
         {
@@ -238,7 +228,7 @@ gdk_gl_texture_do_download (GdkGLTexture *self,
   else
     {
       GdkMemoryFormat actual_format;
-      GLenum gl_read_format, gl_read_type;
+      GLint gl_read_format, gl_read_type;
       GLuint fbo;
 
       glGenFramebuffers (1, &fbo);
@@ -246,36 +236,26 @@ 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"))
         {
-          GLint read_format, read_type;
-          glGetFramebufferParameteriv (GL_FRAMEBUFFER, GL_IMPLEMENTATION_COLOR_READ_FORMAT, &read_format);
-          glGetFramebufferParameteriv (GL_FRAMEBUFFER, GL_IMPLEMENTATION_COLOR_READ_TYPE, &read_type);
-          if (gdk_gl_texture_find_format (context, gdk_memory_format_alpha (format), read_format, read_type, &actual_format))
+          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 (context, gdk_memory_format_alpha (format), gl_read_format, gl_read_type, &actual_format))
             {
-              gl_read_format = read_format;
-              gl_read_type = read_type;
-            }
-          else
-            {
-              actual_format = gdk_memory_depth_get_format (gdk_memory_format_get_depth (format));
-              if (gdk_memory_format_alpha (format) == GDK_MEMORY_ALPHA_STRAIGHT)
-                actual_format = gdk_memory_format_get_straight (actual_format);
-
-              gdk_memory_format_gl_format (actual_format,
-                                           gdk_gl_context_get_use_es (context),
-                                           &gl_internal_format,
-                                           &gl_read_format, &gl_read_type, gl_swizzle);
+              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;
             }
         }
       else
         {
-          actual_format = gdk_memory_depth_get_format (gdk_memory_format_get_depth (format));
-          if (gdk_memory_format_alpha (format) == GDK_MEMORY_ALPHA_STRAIGHT)
-            actual_format = gdk_memory_format_get_straight (actual_format);
-
-          gdk_memory_format_gl_format (actual_format,
-                                       gdk_gl_context_get_use_es (context),
-                                       &gl_internal_format,
-                                       &gl_read_format, &gl_read_type, gl_swizzle);
+          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 (download->format == actual_format &&
@@ -661,7 +641,7 @@ gdk_gl_texture_determine_format (GdkGLTexture *self)
  * Return value: (transfer full) (type GdkGLTexture): A newly-created
  *   `GdkTexture`
  *
- * Deprecated: 4.12: [class@Gdk.GLTextureBuilder] supersedes this function
+ * Deprecated: 4.12: [class@Gdk.GLTextureBuilder] supercedes this function
  *   and provides extended functionality for creating GL textures.
  */
 GdkTexture *

gdk/gdkgltexturebuilder.c

@@ -51,7 +51,7 @@ struct _GdkGLTextureBuilderClass
 /**
  * GdkGLTextureBuilder:
  *
- * `GdkGLTextureBuilder` is a builder used to construct [class@Gdk.Texture] objects from
+ * `GdkGLTextureBuilder` is a buider used to construct [class@Gdk.Texture] objects from
  * GL textures.
  *
  * The operation is quite simple: Create a texture builder, set all the necessary

gdk/gdkmemoryformatprivate.h

@@ -24,10 +24,6 @@
 
 #include <epoxy/gl.h>
 
-#ifdef GDK_RENDERING_VULKAN
-#include <vulkan/vulkan.h>
-#endif
-
 G_BEGIN_DECLS
 
 typedef enum {
@@ -46,36 +42,16 @@ typedef enum {
 gsize                   gdk_memory_format_alignment         (GdkMemoryFormat             format) G_GNUC_CONST;
 GdkMemoryAlpha          gdk_memory_format_alpha             (GdkMemoryFormat             format) G_GNUC_CONST;
 gsize                   gdk_memory_format_bytes_per_pixel   (GdkMemoryFormat             format) G_GNUC_CONST;
-GdkMemoryFormat         gdk_memory_format_get_premultiplied (GdkMemoryFormat             format) G_GNUC_CONST;
-GdkMemoryFormat         gdk_memory_format_get_straight      (GdkMemoryFormat             format) G_GNUC_CONST;
-const GdkMemoryFormat * gdk_memory_format_get_fallbacks     (GdkMemoryFormat             format) G_GNUC_CONST;
 GdkMemoryDepth          gdk_memory_format_get_depth         (GdkMemoryFormat             format) G_GNUC_CONST;
 GdkMemoryDepth          gdk_memory_depth_merge              (GdkMemoryDepth              depth1,
                                                              GdkMemoryDepth              depth2) G_GNUC_CONST;
-GdkMemoryFormat         gdk_memory_depth_get_format         (GdkMemoryDepth              depth) G_GNUC_CONST;
 GdkMemoryFormat         gdk_memory_depth_get_alpha_format   (GdkMemoryDepth              depth) G_GNUC_CONST;
-void                    gdk_memory_format_gl_format         (GdkMemoryFormat             format,
-                                                             gboolean                    gles,
-                                                             GLint                      *out_internal_format,
-                                                             GLenum                     *out_format,
-                                                             GLenum                     *out_type,
-                                                             GLint                       out_swizzle[4]);
-gboolean                gdk_memory_format_gl_rgba_format    (GdkMemoryFormat             format,
-                                                             gboolean                    gles,
-                                                             GdkMemoryFormat            *out_actual_format,
-                                                             GLint                      *out_internal_format,
-                                                             GLenum                     *out_format,
-                                                             GLenum                     *out_type,
-                                                             GLint                       out_swizzle[4]);
-#ifdef GDK_RENDERING_VULKAN
-VkFormat                gdk_memory_format_vk_format         (GdkMemoryFormat             format,
-                                                             VkComponentMapping         *out_swizzle);
-VkFormat                gdk_memory_format_vk_rgba_format    (GdkMemoryFormat             format,
-                                                             GdkMemoryFormat            *out_rgba_format,
-                                                             VkComponentMapping         *out_swizzle);
-#endif
-guint32                 gdk_memory_format_get_dmabuf_fourcc (GdkMemoryFormat             format);
-
+gboolean                gdk_memory_format_gl_format         (GdkMemoryFormat             format,
+                                                             GdkGLContext               *context,
+                                                             guint                      *out_internal_format,
+                                                             guint                      *out_format,
+                                                             guint                      *out_type,
+                                                             GLint                       out_gizzle[4]);
 
 void                    gdk_memory_convert                  (guchar                     *dest_data,
                                                              gsize                       dest_stride,

gdk/gdkpaintable.c

@@ -681,8 +681,7 @@ gdk_empty_paintable_init (GdkEmptyPaintable *self)
  * This is often useful for implementing the
  * [vfunc@Gdk.Paintable.get_current_image] virtual function
  * when the paintable is in an incomplete state (like a
- * [GtkMediaStream](../gtk4/class.MediaStream.html) before receiving
- * the first frame).
+ * [class@Gtk.MediaStream] before receiving the first frame).
  *
  * Returns: (transfer full): a `GdkPaintable`
  */

gdk/gdkpopuplayout.c

@@ -56,9 +56,9 @@
  * [method@Gdk.Popup.get_position_x], [method@Gdk.Popup.get_position_y],
  * [method@Gdk.Popup.get_rect_anchor] and [method@Gdk.Popup.get_surface_anchor]
  * after the popup has been presented. This can be used to adjust the rendering.
- * For example, [GtkPopover](../gtk4/class.Popover.html) changes its arrow position
- * accordingly. But you have to be careful avoid changing the size of the popover,
- * or it has to be presented again.
+ * For example, [class@Gtk.Popover] changes its arrow position accordingly.
+ * But you have to be careful avoid changing the size of the popover, or it
+ * has to be presented again.
  */
 
 struct _GdkPopupLayout

gdk/gdkrectangle.h

@@ -45,12 +45,12 @@ void     gdk_rectangle_union     (const GdkRectangle *src1,
 
 GDK_AVAILABLE_IN_ALL
 gboolean gdk_rectangle_equal     (const GdkRectangle *rect1,
-                                  const GdkRectangle *rect2) G_GNUC_PURE;
+                                  const GdkRectangle *rect2);
 
 GDK_AVAILABLE_IN_ALL
 gboolean gdk_rectangle_contains_point (const GdkRectangle *rect,
                                        int                 x,
-                                       int                 y) G_GNUC_PURE;
+                                       int                 y);
 
 GDK_AVAILABLE_IN_ALL
 GType gdk_rectangle_get_type (void) G_GNUC_CONST;

gdk/gdkrgba.c

@@ -642,7 +642,7 @@ gdk_rgba_parser_parse (GtkCssParser *parser,
     {
       if (gtk_css_token_is_ident (token, "transparent"))
         {
-          *rgba = GDK_RGBA_TRANSPARENT;
+          *rgba = (GdkRGBA) { 0, 0, 0, 0 };
         }
       else if (gdk_rgba_parse (rgba, gtk_css_token_get_string (token)))
         {