testsubsurface: Add dmabuf support

Allow attaching dmabuf textures without downloading.

Currently, this is using create_immed, so failure to import a
dmabuf will be deadly.

.gitlab-ci.yml

@@ -26,7 +26,7 @@ variables:
   BACKEND_FLAGS: "-Dx11-backend=true -Dwayland-backend=true -Dbroadway-backend=true"
   FEATURE_FLAGS: "-Dvulkan=enabled -Dcloudproviders=enabled -Dbuild-testsuite=true -Dintrospection=enabled"
   MESON_TEST_TIMEOUT_MULTIPLIER: 3
-  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v49"
+  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v48"
 
 workflow:
   rules:
@@ -66,8 +66,7 @@ style-check-diff:
       junit:
         - "${CI_PROJECT_DIR}/_build/report-x11.xml"
         - "${CI_PROJECT_DIR}/_build/report-wayland.xml"
-        - "${CI_PROJECT_DIR}/_build/report-wayland_gl.xml"
-        - "${CI_PROJECT_DIR}/_build/report-wayland_gles2.xml"
+        - "${CI_PROJECT_DIR}/_build/report-wayland_gles.xml"
         - "${CI_PROJECT_DIR}/_build/report-broadway.xml"
     name: "gtk-${CI_COMMIT_REF_NAME}"
     paths:
@@ -104,9 +103,8 @@ fedora-x86_64:
             ${FEATURE_FLAGS}
             _build
     - meson compile -C _build
-    - .gitlab-ci/run-tests.sh _build x11 gtk
-    # only repeat test runs that are likely affected by test setups
-    - .gitlab-ci/run-tests.sh _build wayland_gl gtk:gdk,gtk:gsk-gl
+    - .gitlab-ci/run-tests.sh _build wayland
+    - .gitlab-ci/run-tests.sh _build wayland_gles
 
 release-build:
   extends: .build-fedora-default
@@ -131,9 +129,7 @@ release-build:
     - meson install -C _build
     - PKG_CONFIG_PATH=${CI_PROJECT_DIR}/_install/lib64/pkgconfig:${CI_PROJECT_DIR}/_install/share/pkgconfig meson setup _build_hello examples/hello
     - LD_LIBRARY_PATH=${CI_PROJECT_DIR}/_install/lib64 meson compile -C _build_hello
-    - .gitlab-ci/run-tests.sh _build wayland gtk
-    # only repeat test runs that are likely affected by test setups
-    - .gitlab-ci/run-tests.sh _build wayland_gles2 gtk:gdk,gtk:gsk-gl
+    - .gitlab-ci/run-tests.sh _build x11
 
 fedora-clang:
   extends: .build-fedora-default
@@ -427,12 +423,11 @@ asan-build:
             -Df16c=disabled
             _build
     - ninja -C _build
-    - .gitlab-ci/run-tests.sh _build wayland gtk
+    - .gitlab-ci/run-tests.sh _build wayland
+    - .gitlab-ci/run-tests.sh _build wayland_gles
+    - .gitlab-ci/run-tests.sh _build x11
   artifacts:
     when: always
-    reports:
-      junit:
-        - "${CI_PROJECT_DIR}/_build/report-wayland.xml"
     paths:
       - "${CI_PROJECT_DIR}/_build/meson-logs"
 

.gitlab-ci/fedora.Dockerfile

@@ -1,4 +1,4 @@
-FROM fedora:39
+FROM fedora:38
 
 RUN dnf -y install \
     adwaita-icon-theme \

.gitlab-ci/meson-html-report.py

@@ -324,7 +324,7 @@ for line in args.infile:
     units.append(unit)
 
 report = {}
-report['date'] = datetime.datetime.now(datetime.UTC)
+report['date'] = datetime.datetime.utcnow()
 report['locale_date'] = report['date'].strftime("%c")
 report['project_name'] = args.project_name
 report['backend'] = args.backend

.gitlab-ci/meson-junit-report.py

@@ -44,7 +44,7 @@ outfile = args.output
 testsuites = ET.Element('testsuites')
 testsuites.set('id', '{}/{}'.format(args.job_id, args.branch))
 testsuites.set('package', args.project_name)
-testsuites.set('timestamp', datetime.datetime.now(datetime.UTC).isoformat(timespec='minutes'))
+testsuites.set('timestamp', datetime.datetime.utcnow().isoformat(timespec='minutes'))
 
 suites = {}
 for line in args.infile:

.gitlab-ci/run-tests.sh

@@ -1,29 +1,27 @@
 #!/bin/bash
 
-set -x
+set +x
 set +e
 
 srcdir=$( pwd )
 builddir=$1
-setup=$2
-suite=$3
+backend=$2
 multiplier=${MESON_TEST_TIMEOUT_MULTIPLIER:-1}
 
 # Ignore memory leaks lower in dependencies
 export LSAN_OPTIONS=suppressions=$srcdir/lsan.supp:print_suppressions=0:detect_leaks=0:allocator_may_return_null=1
 export G_SLICE=always-malloc
 
-case "${setup}" in
-  x11*)
+case "${backend}" in
+  x11)
     xvfb-run -a -s "-screen 0 1024x768x24 -noreset" \
           meson test -C ${builddir} \
                 --quiet \
                 --timeout-multiplier "${multiplier}" \
                 --print-errorlogs \
-                --setup=${setup} \
-                --suite=${suite//,/ --suite=} \
+                --setup=${backend} \
+                --suite=gtk \
                 --no-suite=failing \
-                --no-suite=${setup}_failing \
                 --no-suite=flaky \
                 --no-suite=headless \
                 --no-suite=gsk-compare-broadway
@@ -44,19 +42,19 @@ case "${setup}" in
                 --quiet \
                 --timeout-multiplier "${multiplier}" \
                 --print-errorlogs \
-                --setup=${setup} \
-                --suite=${suite//,/ --suite=} \
+                --setup=${backend} \
+                --suite=gtk \
                 --no-suite=failing \
-                --no-suite=${setup}_failing \
                 --no-suite=flaky \
                 --no-suite=headless \
+                --no-suite=${backend}_failing \
                 --no-suite=gsk-compare-broadway
     exit_code=$?
 
     kill ${compositor}
     ;;
 
-  broadway*)
+  broadway)
     export XDG_RUNTIME_DIR="$(mktemp -p $(pwd) -d xdg-runtime-XXXXXX)"
 
     ${builddir}/gdk/broadway/gtk4-broadwayd :5 &
@@ -67,10 +65,9 @@ case "${setup}" in
                 --quiet \
                 --timeout-multiplier "${multiplier}" \
                 --print-errorlogs \
-                --setup=${setup} \
-                --suite=${suite//,/ --suite=} \
+                --setup=${backend} \
+                --suite=gtk \
                 --no-suite=failing \
-                --no-suite=${setup}_failing \
                 --no-suite=flaky \
                 --no-suite=headless \
                 --no-suite=gsk-compare-opengl
@@ -79,7 +76,7 @@ case "${setup}" in
     ;;
 
   *)
-    echo "Failed to add ${setup} to .gitlab-ci/run-tests.sh"
+    echo "Failed to add ${backend} to .gitlab-ci/run-tests.sh"
     exit 1
     ;;
 
@@ -89,17 +86,17 @@ cd ${builddir}
 
 $srcdir/.gitlab-ci/meson-junit-report.py \
             --project-name=gtk \
-            --backend="${setup}" \
+            --backend="${backend}" \
             --job-id="${CI_JOB_NAME}" \
-            --output="report-${setup}.xml" \
-            "meson-logs/testlog-${setup}.json"
+            --output="report-${backend}.xml" \
+            "meson-logs/testlog-${backend}.json"
 
 $srcdir/.gitlab-ci/meson-html-report.py \
             --project-name=gtk \
-            --backend="${setup}" \
+            --backend="${backend}" \
             --job-id="${CI_JOB_NAME}" \
-            --reftest-output-dir="testsuite/reftests/output/${setup}" \
-            --output="report-${setup}.html" \
-            "meson-logs/testlog-${setup}.json"
+            --reftest-output-dir="testsuite/reftests/output/${backend}" \
+            --output="report-${backend}.html" \
+            "meson-logs/testlog-${backend}.json"
 
 exit $exit_code

.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

NEWS

@@ -1,148 +1,6 @@
-Overview of Changes in 4.13.6, xx-xx-xxxx
+Overview of Changes in 4.13.3, 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
-=========================================
-
-* GtkGraphicsOffload: A new widget to support passthrough
-  of dmabuf textures with subsurfaces on Wayland
-
-* GtkListView:
- - reduce tree indentation
-
-* GtkInspector:
- - Show more GL information
- - Add a subsurface overlay
- - Improve the fps overlay
-
-* GDK
- - Allow implicit modifiers for dmabufs
- - Support more dmabuf formats: NV16, NV61, NV24, NV42
-   and 3-plane YUV formats
-
-* GSK
- - Fix padding of icons in the GL atlas
- - Fix handling of texture-scale nodes in cairo
- - Treat texture-scale nodes more faithfully in GL
-
-* Accessibility:
- - Tweak the accessible name computation for corner cases
-
-* The GTK/GDK/GSK_DEBUG environment variables now
-  work in productions as well as in debug builds
-
-* Translation updates
- Catalan
- French
- Russian
-
-
 Overview of Changes in 4.13.2, 22-10-2023
 =========================================
 
@@ -522,7 +380,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 +1364,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 +1761,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 +2308,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

build-aux/flatpak/org.gtk.Demo4.json

@@ -185,6 +185,7 @@
             "builddir" : true,
             "config-opts" : [
                 "--libdir=/app/lib",
+                "-Dvulkan=disabled",
                 "-Dbuildtype=debugoptimized",
                 "-Ddemo-profile=devel"
             ],
@@ -199,6 +200,7 @@
     ],
     "build-options" : {
         "env" : {
+            "GSK_RENDERER" : "opengl"
         }
     }
 }

build-aux/flatpak/org.gtk.IconBrowser4.json

@@ -114,6 +114,7 @@
             "builddir" : true,
             "config-opts" : [
                 "--libdir=/app/lib",
+                "-Dvulkan=disabled",
                 "-Dbuildtype=debugoptimized",
                 "-Ddemo-profile=devel"
             ],

build-aux/flatpak/org.gtk.WidgetFactory4.json

@@ -114,6 +114,7 @@
             "builddir" : true,
             "config-opts" : [
                 "--libdir=/app/lib",
+                "-Dvulkan=disabled",
                 "-Dbuildtype=debugoptimized",
                 "-Ddemo-profile=devel"
             ],
@@ -129,6 +130,8 @@
     "build-options" : {
         "env" : {
             "DBUS_SESSION_BUS_ADDRESS" : "''",
+            "GSK_RENDERER" : "opengl",
+            "GDK_DEBUG" : "vulkan-disable",
             "G_ENABLE_DEBUG" : "true"
         }
     }

build-aux/flatpak/org.gtk.gtk4.NodeEditor.json

@@ -114,6 +114,7 @@
             "builddir" : true,
             "config-opts" : [
                 "--libdir=/app/lib",
+                "-Dvulkan=disabled",
                 "-Dbuildtype=debugoptimized",
                 "-Ddemo-profile=devel"
             ],
@@ -129,6 +130,8 @@
     "build-options" : {
         "env" : {
             "DBUS_SESSION_BUS_ADDRESS" : "''",
+            "GSK_RENDERER" : "opengl",
+            "GDK_DEBUG" : "vulkan-disable",
             "G_ENABLE_DEBUG" : "true"
         }
     }

build-aux/msvc/msvc_recommended_pragmas.h

@@ -1,41 +0,0 @@
-#ifndef _MSC_VER
-#pragma error "This header is for Microsoft VC or clang-cl only."
-#endif /* _MSC_VER */
-
-/* Make MSVC more pedantic, this is a recommended pragma list
- * from _Win32_Programming_ by Rector and Newcomer.
- */
-#ifndef __clang__
-#pragma warning(error:4002) /* too many actual parameters for macro */
-#pragma warning(error:4003) /* not enough actual parameters for macro */
-#pragma warning(1:4010)     /* single-line comment contains line-continuation character */
-#pragma warning(error:4013) /* 'function' undefined; assuming extern returning int */
-#pragma warning(1:4016)     /* no function return type; using int as default */
-#pragma warning(error:4020) /* too many actual parameters */
-#pragma warning(error:4021) /* too few actual parameters */
-#pragma warning(error:4027) /* function declared without formal parameter list */
-#pragma warning(error:4029) /* declared formal parameter list different from definition */
-#pragma warning(error:4033) /* 'function' must return a value */
-#pragma warning(error:4035) /* 'function' : no return value */
-#pragma warning(error:4045) /* array bounds overflow */
-#pragma warning(error:4047) /* different levels of indirection */
-#pragma warning(error:4049) /* terminating line number emission */
-#pragma warning(error:4053) /* An expression of type void was used as an operand */
-#pragma warning(error:4071) /* no function prototype given */
-#pragma warning(disable:4101) /* unreferenced local variable */
-#pragma warning(error:4150)
-
-/* G_NORETURN */
-#pragma warning(error:4646) /* function declared with __declspec(noreturn) has non-void return type */
-#pragma warning(error:4715) /* 'function': not all control paths return a value */
-#pragma warning(error:4098) /* 'void' function returning a value */
-
-#pragma warning(disable:4244)	/* No possible loss of data warnings */
-#pragma warning(disable:4305)   /* No truncation from int to char warnings */
-
-#pragma warning(error:4819) /* The file contains a character that cannot be represented in the current code page */
-#endif                      /* __clang__ */
-
-/* work around Microsoft's premature attempt to deprecate the C-Library */
-#define _CRT_SECURE_NO_WARNINGS
-#define _CRT_NONSTDC_NO_WARNINGS

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/demo3widget.c

@@ -75,9 +75,7 @@ query_tooltip (GtkWidget  *widget,
   gtk_grid_attach (GTK_GRID (grid), label, 0, 2, 1, 1);
 
   precision = 1;
-  s = NULL;
   do {
-    g_free (s);
     s = g_strdup_printf ("%.*f", precision, self->scale);
     l = strlen (s) - 1;
     while (s[l] == '0')

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/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/gtk-demo/video_player.c

@@ -139,7 +139,6 @@ do_video_player (GtkWidget *do_widget)
 
       video = gtk_video_new ();
       gtk_video_set_autoplay (GTK_VIDEO (video), TRUE);
-      gtk_video_set_graphics_offload (GTK_VIDEO (video), GTK_GRAPHICS_OFFLOAD_ENABLED);
       gtk_window_set_child (GTK_WINDOW (window), video);
 
       title = gtk_header_bar_new ();

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/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/node-editor-application.c

@@ -19,10 +19,6 @@
 
 #include "config.h"
 
-#ifdef HAVE_PANGOFT
-#include <pango/pangofc-fontmap.h>
-#endif
-
 #include "node-editor-application.h"
 
 #include "node-editor-window.h"
@@ -49,47 +45,11 @@ struct _NodeEditorApplicationClass
   GtkApplicationClass parent_class;
 };
 
-G_DEFINE_TYPE (NodeEditorApplication, node_editor_application, GTK_TYPE_APPLICATION);
-
-static void
-maybe_add_test_fonts (void)
-{
-#ifdef HAVE_PANGOFT
-  const char *subdir = "testsuite/gsk/fonts";
-  const char *source_dir;
-  char *dir;
-
-  source_dir = g_getenv ("GTK_SOURCE_DIR");
-
-  if (source_dir)
-    {
-      char *abs_source_dir = g_canonicalize_filename (source_dir, NULL);
-      dir = g_canonicalize_filename (subdir, abs_source_dir);
-      g_free (abs_source_dir);
-    }
-  else
-    {
-      char *current_dir = g_get_current_dir ();
-      dir = g_canonicalize_filename (subdir, current_dir);
-      g_free (current_dir);
-    }
-
-  if (g_file_test (dir, G_FILE_TEST_EXISTS))
-    {
-      FcConfig *config;
-
-      config = FcConfigGetCurrent ();
-      FcConfigAppFontAddDir (config, (const FcChar8 *) dir);
-    }
-
-  g_free (dir);
-#endif
-}
+G_DEFINE_TYPE(NodeEditorApplication, node_editor_application, GTK_TYPE_APPLICATION);
 
 static void
 node_editor_application_init (NodeEditorApplication *app)
 {
-  maybe_add_test_fonts ();
 }
 
 static void

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,9 +24,13 @@
 #include "gtkrendererpaintableprivate.h"
 
 #include "gsk/gskrendernodeparserprivate.h"
+#include "gsk/gl/gskglrenderer.h"
 #ifdef GDK_WINDOWING_BROADWAY
 #include "gsk/broadway/gskbroadwayrenderer.h"
 #endif
+#ifdef GDK_RENDERING_VULKAN
+#include "gsk/vulkan/gskvulkanrenderer.h"
+#endif
 
 #include <cairo.h>
 #ifdef CAIRO_HAS_SVG_SURFACE
@@ -790,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);
@@ -862,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 ();
             }
@@ -1117,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);
@@ -1156,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 (),

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>
 
@@ -37,3 +38,5 @@ NodeEditorWindow *      node_editor_window_new          (NodeEditorApplication
 
 gboolean                node_editor_window_load         (NodeEditorWindow       *self,
                                                          GFile                  *file);
+
+#endif /* __NODE_EDITOR_WINDOW_H__ */

demos/widget-factory/icons/scalable/actions/view-grid-symbolic.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path d="M3.384 3h3.231c.213 0 .385.224.385.502v2.996C7 6.776 6.828 7 6.615 7h-3.23C3.17 7 3 6.776 3 6.498V3.502C3 3.224 3.17 3 3.384 3zm6 0h3.231c.213 0 .385.224.385.502v2.996c0 .278-.172.502-.385.502h-3.23C9.17 7 9 6.776 9 6.498V3.502C9 3.224 9.17 3 9.384 3zm-6 6h3.231c.213 0 .385.224.385.502v2.996c0 .278-.172.502-.385.502h-3.23C3.17 13 3 12.776 3 12.498V9.502C3 9.224 3.17 9 3.384 9zm6 0h3.231c.213 0 .385.224.385.502v2.996c0 .278-.172.502-.385.502h-3.23C9.17 13 9 12.776 9 12.498V9.502C9 9.224 9.17 9 9.384 9z" style="marker:none" overflow="visible" color="#000" fill="#474747"/></svg>

demos/widget-factory/widget-factory.gresource.xml

@@ -25,12 +25,14 @@
     <file>icons/16x16/actions/format-justify-fill-symbolic.symbolic.png</file>
     <file>icons/16x16/actions/format-justify-left-symbolic.symbolic.png</file>
     <file>icons/16x16/actions/format-justify-right-symbolic.symbolic.png</file>
+    <file>icons/16x16/actions/insert-image.png</file>
     <file>icons/16x16/actions/insert-link-symbolic.symbolic.png</file>
     <file>icons/16x16/actions/send-to-symbolic.symbolic.png</file>
     <file>icons/16x16/actions/star-new-symbolic.symbolic.png</file>
     <file>icons/16x16/actions/view-continuous-symbolic.symbolic.png</file>
     <file>icons/16x16/actions/view-dual-symbolic.symbolic.png</file>
     <file>icons/16x16/actions/view-fullscreen-symbolic.symbolic.png</file>
+    <file>icons/16x16/actions/view-grid-symbolic.symbolic.png</file>
     <file>icons/16x16/actions/view-paged-symbolic.symbolic.png</file>
     <file>icons/16x16/actions/zoom-in-symbolic.symbolic.png</file>
     <file>icons/16x16/actions/zoom-in.png</file>
@@ -86,6 +88,7 @@
     <file>icons/scalable/actions/view-dual-symbolic.svg</file>
     <file>icons/scalable/actions/view-paged-symbolic.svg</file>
     <file>icons/scalable/actions/view-fullscreen-symbolic.svg</file>
+    <file>icons/scalable/actions/view-grid-symbolic.svg</file>
     <file>icons/scalable/actions/zoom-in-symbolic.svg</file>
     <file>icons/scalable/actions/zoom-original-symbolic.svg</file>
     <file>icons/scalable/actions/zoom-out-symbolic.svg</file>

docs/CODING-STYLE.md

@@ -685,8 +685,6 @@ stack-allocated using `g_newa()` or `g_alloca()`. But limit the amount
 of stack memory that you consume this way, in particular in recursive
 functions.
 
-On Windows, the default stack size we have to work with is 1M.
-
 ### Macros
 
 Try to avoid private macros unless strictly necessary. Remember to #undef

docs/reference/gdk/cairo.md

@@ -1,4 +1,6 @@
+----
 Title: Cairo interaction
+----
 
 ## Functions to support using cairo
 

docs/reference/gdk/gdk4.toml.in

@@ -107,5 +107,4 @@ content_images = [
   "images/popup-flip.png",
   "images/popup-slide.png",
 ]
-content_base_url = "https://gitlab.gnome.org/GNOME/gtk/-/blob/main/docs/reference/gdk/"
 urlmap_file = "urlmap.js"

docs/reference/gdk/keys.md

@@ -1,4 +1,4 @@
-Title: Keyboard Codes, Groups, And Modifiers
+Title: Key Values
 
 ## Functions for manipulating keyboard codes
 
@@ -8,19 +8,19 @@ The complete list of key values can be found in the [`gdk/gdkkeysyms.h`](https:/
 file.
 
 Key values are regularly updated from the upstream X.org X11 implementation,
-so new values are added regularly. They will be prefixed with `GDK_KEY_` rather
-than `XF86XK_` or `XK_` (for older symbols).
+so new values are added regularly. They will be prefixed with GDK_KEY_ rather
+than XF86XK_ or XK_ (for older symbols).
 
 Key values can be converted into a string representation using
-[`func@Gdk.keyval_name`]. The reverse function, converting a string to a key
-value, is provided by [`func@Gdk.keyval_from_name`].
+gdk_keyval_name(). The reverse function, converting a string to a key value,
+is provided by gdk_keyval_from_name().
 
-The case of key values can be determined using [`func@Gdk.keyval_is_upper`]
-and [`func@Gdk.keyval_is_lower`]. Key values can be converted to upper or lower
-case using [`func@Gdk.keyval_to_upper`] and [`func@Gdk.keyval_to_lower`].
+The case of key values can be determined using gdk_keyval_is_upper() and
+gdk_keyval_is_lower(). Key values can be converted to upper or lower case
+using gdk_keyval_to_upper() and gdk_keyval_to_lower().
 
-When it makes sense, key values can be converted to and from Unicode characters
-with [`func@Gdk.keyval_to_unicode`] and [`func@Gdk.unicode_to_keyval`].
+When it makes sense, key values can be converted to and from
+Unicode characters with gdk_keyval_to_unicode() and gdk_unicode_to_keyval().
 
 ## Key groups
 
@@ -36,23 +36,23 @@ You can think of a [struct@Gdk.KeymapKey] as a representation of a symbol
 printed on a physical keyboard key. That is, it contains three pieces of
 information:
 
-1. first, it contains the hardware keycode; this is an identifying number
-   for a physical key
-1. second, it contains the “level” of the key. The level indicates which
-   symbol on the key will be used, in a vertical direction. So on a standard
-   US keyboard, the key with the number “1“ on it also has the exclamation
-   point (”!”) character on it. The level indicates whether to use the “1”
-   or the “!” symbol. The letter keys are considered to have a lowercase
-   letter at level 0, and an uppercase letter at level 1, though normally
-   only the uppercase letter is printed on the key
-1. third, the [struct@Gdk.KeymapKey] contains a group; groups are not used on
-   standard US keyboards, but are used in many other countries. On a
-   keyboard with groups, there can be 3 or 4 symbols printed on a single
-   key. The group indicates movement in a horizontal direction. Usually
-   groups are used for two different languages. In group 0, a key might
-   have two English characters, and in group 1 it might have two Hebrew
-   characters. The Hebrew characters will be printed on the key next to
-   the English characters.
+  1. first, it contains the hardware keycode; this is an identifying number
+    for a physical key
+  1. second, it contains the “level” of the key. The level indicates which
+    symbol on the key will be used, in a vertical direction. So on a standard
+    US keyboard, the key with the number “1“ on it also has the exclamation
+    point (”!”) character on it. The level indicates whether to use the “1”
+    or the “!” symbol. The letter keys are considered to have a lowercase
+    letter at level 0, and an uppercase letter at level 1, though normally
+    only the uppercase letter is printed on the key
+  1. third, the [struct@Gdk.KeymapKey] contains a group; groups are not used on
+     standard US keyboards, but are used in many other countries. On a
+     keyboard with groups, there can be 3 or 4 symbols printed on a single
+     key. The group indicates movement in a horizontal direction. Usually
+     groups are used for two different languages. In group 0, a key might
+     have two English characters, and in group 1 it might have two Hebrew
+     characters. The Hebrew characters will be printed on the key next to
+     the English characters.
 
 When GDK creates a key event in order to deliver a key press or release,
 it first converts the current keyboard state into an effective group and
@@ -72,7 +72,7 @@ in the key event and can be obtained via [class@Gdk.KeyEvent] getters.
 ### Consumed modifiers
 
 The `consumed_modifiers` in a key event are modifiers that should be masked
-out from `@state` when comparing this key press to a hot key. For instance,
+out from @state when comparing this key press to a hot key. For instance,
 on a US keyboard, the `plus` symbol is shifted, so when comparing a key
 press to a `<Control>plus` accelerator `<Shift>` should be masked out.
 
@@ -91,8 +91,9 @@ if (keyval == GDK_PLUS &&
 ```
 
 An older interpretation of `consumed_modifiers` was that it contained
-all modifiers that might affect the translation of the key; this allowed
-accelerators to be stored with irrelevant consumed modifiers, by doing:
+all modifiers that might affect the translation of the key;
+this allowed accelerators to be stored with irrelevant consumed
+modifiers, by doing:
 
 ```c
 // XXX Don’t do this XXX
@@ -101,11 +102,12 @@ if (keyval == accel_keyval &&
   // Accelerator was pressed
 ```
 
-However, this did not work if multi-modifier combinations were used in the
-keymap, since, for instance, `<Control>` would be masked out even if only
-`<Control><Alt>` was used in the keymap. To support this usage as well as
-well as possible, all single modifier combinations that could affect the key
-for any combination of modifiers will be returned in `consumed_modifiers`;
-multi-modifier combinations are returned only when actually found in `state`.
-When you store accelerators, you should always store them with consumed
+However, this did not work if multi-modifier combinations were
+used in the keymap, since, for instance, `<Control>` would be
+masked out even if only `<Control><Alt>` was used in
+the keymap. To support this usage as well as well as possible, all single
+modifier combinations that could affect the key for any combination
+of modifiers will be returned in `consumed_modifiers`; multi-modifier
+combinations are returned only when actually found in `state`. When
+you store accelerators, you should always store them with consumed
 modifiers removed. Store `<Control>plus`, not `<Control><Shift>plus`.

docs/reference/gdk/pango.md

@@ -1,4 +1,4 @@
-Title: Pango Interaction
+ Title: Pango Interaction
 
 Pango is the text layout system used by GDK and GTK. The functions
 and types in this section are used to obtain clip regions for

docs/reference/gsk/gsk4.toml.in

@@ -62,5 +62,4 @@ content_images = [
   "images/stroke-miter.png",
   "images/stroke-round.png",
 ]
-content_base_url = "https://gitlab.gnome.org/GNOME/gtk/-/blob/main/docs/reference/gsk/"
 urlmap_file = "urlmap.js"

docs/reference/gtk/building.md

@@ -1,6 +1,8 @@
-Title: Building GTK
+Title: Compiling the GTK Libraries
 Slug: gtk-building
 
+## Building GTK
+
 Before we get into the details of how to compile GTK, we should
 mention that in many cases, binary packages of GTK prebuilt for
 your operating system will be available, either from your

docs/reference/gtk/coordinates.md

@@ -1,6 +1,8 @@
-Title: Coordinate systems in GTK
+Title: Coordinate systems
 Slug: gtk-coordinates
 
+## Coordinate systems in GTK
+
 All coordinate systems in GTK have the origin at the top left, with the X axis
 pointing right, and the Y axis pointing down. This matches the convention used
 in X11, Wayland and cairo, but differs from OpenGL and PostScript, where the origin

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/getting_started.md

@@ -41,7 +41,7 @@ activate (GtkApplication* app,
   window = gtk_application_window_new (app);
   gtk_window_set_title (GTK_WINDOW (window), "Window");
   gtk_window_set_default_size (GTK_WINDOW (window), 200, 200);
-  gtk_window_present (GTK_WINDOW (window));
+  gtk_widget_show (window);
 }
 
 int
@@ -183,7 +183,7 @@ activate (GtkApplication *app,
 
   gtk_box_append (GTK_BOX (box), button);
 
-  gtk_window_present (GTK_WINDOW (window));
+  gtk_widget_show (window);
 }
 
 int
@@ -331,7 +331,8 @@ activate (GtkApplication *app,
    */
   gtk_grid_attach (GTK_GRID (grid), button, 0, 1, 2, 1);
 
-  gtk_window_present (GTK_WINDOW (window));
+  gtk_widget_show (window);
+
 }
 
 int
@@ -553,7 +554,7 @@ activate (GtkApplication *app,
 
   g_signal_connect (press, "pressed", G_CALLBACK (pressed), drawing_area);
 
-  gtk_window_present (GTK_WINDOW (window));
+  gtk_widget_show (window);
 }
 
 int
@@ -630,7 +631,7 @@ activate (GtkApplication *app,
   button = gtk_builder_get_object (builder, "quit");
   g_signal_connect_swapped (button, "clicked", G_CALLBACK (quit_cb), window);
 
-  gtk_widget_set_visible (GTK_WIDGET (window), TRUE);
+  gtk_widget_show (GTK_WIDGET (window));
 
   /* We do not need the builder any more */
   g_object_unref (builder);

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,13 +25,3 @@ OPTIONS
 ``-h, --help``
 
   Show the application help.
-
-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

@@ -35,11 +35,6 @@ Showing
 
 The ``show`` command displays the rendernode.
 
-``--undecorated``
-
-Removes window decorations. This is meant for rendering of exactly the rendernode
-without any titlebar.
-
 Rendering
 ^^^^^^^^^
 

docs/reference/gtk/gtk4.toml.in

@@ -245,5 +245,4 @@ content_images = [
   "images/box-model-light.png",
   "images/box-model-dark.png",
 ]
-content_base_url = "https://gitlab.gnome.org/GNOME/gtk/-/blob/main/docs/reference/gtk/"
 urlmap_file = "urlmap.js"

docs/reference/gtk/initialization.md

@@ -1,6 +1,8 @@
-Title: Initializing GTK
+----
+Title: Initialization
+----
 
-## Library initialization and main loop
+# Library initialization and main loop
 
 Before using GTK, you need to initialize it using [func@Gtk.init]; this
 connects to the windowing system, sets up the locale and performs other
@@ -47,7 +49,7 @@ main (int argc, char **argv)
   // ...
 
   // Show the application window
-  gtk_window_present (GTK_WINDOW (window));
+  gtk_widget_show (window);
 
   // Enter the main event loop, and wait for user interaction
   while (!done)
@@ -64,5 +66,5 @@ as spinning the main loop.
 
 ### See also
 
-- the GLib manual, especially `GMainLoop`
-- signal-related functions, such as `g_signal_connect()` in GObject
+  - the GLib manual, especially `GMainLoop`
+  - signal-related functions, such as `g_signal_connect()` in GObject

docs/reference/gtk/migrating-2to4.md

@@ -2,6 +2,5 @@ Title: Migrating from GTK 2.x to GTK 4
 Slug: gtk-migrating-2-to-4
 
 If your application is still using GTK 2, you should first convert it to GTK 3,
-by following the [migration guide](https://docs.gtk.org/gtk3/migrating-2to3.html)
-in the GTK 3 documentation, and then follow [the GTK 3 to 4 migration
-guide](migrating-3to4.html).
+by following the [migration guide](https://developer.gnome.org/gtk3/stable/gtk-migrating-2-to-3.html)
+in the GTK 3 documentation, and then follow [these instructions](#gtk-migrating-3-to-4).

docs/reference/gtk/resources.md

@@ -31,11 +31,10 @@ for GTK, available on GitLab.
 
 If you want to discuss your approach before or after working on it,
 good ways to contact the GTK developers, apart from GitLab issues,
-are:
+are
 
+- the #gtk IRC channel on irc.gnome.org
 - the gtk tag on the [GNOME Discourse instance](https://discourse.gnome.org/tag/gtk)
-- the `#gtk:gnome.org` Matrix room
-- the `#gtk` IRC channel on `irc.libera.chat`
 
 You should not send patches by email, as they will inevitably get lost,
 or forgotten. Always open a merge request.

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:
@@ -206,11 +206,11 @@ are only available when GTK has been configured with `-Ddebug=true`.
 `dmabuf`
 : Information about dmabuf handling (Linux-only)
 
-`offload`
-: Information about subsurfaces and graphics offload (Wayland-only)
-
 A number of options affect behavior instead of logging:
 
+`nograbs`
+: Turn off all pointer and keyboard grabs
+
 `portals`
 : Force the use of [portals](https://docs.flatpak.org/en/latest/portals.html)
 
@@ -226,14 +226,11 @@ A number of options affect behavior instead of logging:
 `gl-debug`
 : Insert debugging information in OpenGL
 
-`gl-disable-gl`
-: Don't allow the use of OpenGL GL API. This forces GLES to be used
+`gl-legacy`
+: Use a legacy OpenGL context
 
-`gl-disable-gles`
-: Don't allow the use of OpenGL GLES API. This forces GL to be used
-
-`gl-prefer-gl`
-: Prefer OpenGL over OpenGL ES. This was the default behavior before GTK 4.14.
+`gl-gles`
+: Use a GLES OpenGL context
 
 `gl-egl`
 : Use an EGL context on X11 or Windows
@@ -274,46 +271,46 @@ 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)
+`vulkan-staging-image`
+: Use a staging image for Vulkan texture upload
 
-`offload-disable`
-: Disable graphics offload to subsurfaces
-
-`cairo`
-: Overlay error pattern over cairo drawing (finds fallbacks)
+`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 +351,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,9 +372,6 @@ using and the GDK backend supports them:
 `gl`
 : Selects the "gl" OpenGL renderer
 
-`ngl`
-: Selects the "ngl" OpenGL renderer
-
 `vulkan`
 : Selects the Vulkan renderer
 
@@ -429,32 +389,6 @@ 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.
-
 ### `GSK_MAX_TEXTURE_SIZE`
 
 Limit texture size to the minimum of this value and the OpenGL limit

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/broadway/gdksurface-broadway.c

@@ -209,11 +209,13 @@ _gdk_broadway_roundtrip_notify (GdkSurface  *surface,
       timings->complete = TRUE;
 
 
+#ifdef G_ENABLE_DEBUG
       if ((_gdk_debug_flags & GDK_DEBUG_FRAMES) != 0)
         _gdk_frame_clock_debug_print_timings (clock, timings);
 
   if (GDK_PROFILER_IS_RUNNING)
     _gdk_frame_clock_add_timings_to_profiler (clock, timings);
+#endif
     }
 }
 

gdk/filetransferportal.c

@@ -369,12 +369,14 @@ portal_file_serializer (GdkContentSerializer *serializer)
           GDK_DEBUG (DND, "file transfer portal: Adding %s", g_file_peek_path (file));
           g_ptr_array_add (files, g_file_get_path (file));
         }
+#ifdef G_ENABLE_DEBUG
       else if (GDK_DEBUG_CHECK (DND))
         {
           char *uri = g_file_get_uri (file);
           gdk_debug_message ("file transfer portal: %s has no path, dropping\n", uri);
           g_free (uri);
         }
+#endif
 
       g_ptr_array_add (files, NULL);
     }
@@ -424,12 +426,14 @@ portal_finish (GObject *object,
       return;
     }
 
+#ifdef G_ENABLE_DEBUG
   if (GDK_DEBUG_CHECK (DND))
     {
       char *s = g_strjoinv (", ", files);
       gdk_debug_message ("file transfer portal: Receiving files: %s", s);
       g_free (s);
     }
+#endif
 
   value = gdk_content_deserializer_get_value (deserializer);
   if (G_VALUE_HOLDS (value, G_TYPE_FILE))

gdk/gdk.c

@@ -118,25 +118,24 @@ static const GdkDebugKey gdk_debug_keys[] = {
   { "selection",       GDK_DEBUG_SELECTION, "Information about selections" },
   { "clipboard",       GDK_DEBUG_CLIPBOARD, "Information about clipboards" },
   { "dmabuf",          GDK_DEBUG_DMABUF, "Information about dmabuf buffers" },
-  { "offload",         GDK_DEBUG_OFFLOAD, "Information about subsurfaces and graphics offload" },
 
-  { "portals",         GDK_DEBUG_PORTALS, "Force use of portals" },
-  { "no-portals",      GDK_DEBUG_NO_PORTALS, "Disable use of portals" },
-  { "gl-disable",      GDK_DEBUG_GL_DISABLE, "Disable OpenGL support" },
-  { "gl-fractional",   GDK_DEBUG_GL_FRACTIONAL, "Enable fractional scaling for OpenGL (experimental)" },
-  { "gl-debug",        GDK_DEBUG_GL_DEBUG, "Insert debugging information in OpenGL" },
-  { "gl-disable-gl",   GDK_DEBUG_GL_DISABLE_GL, "Only allow OpenGL GLES API" },
-  { "gl-disable-gles", GDK_DEBUG_GL_DISABLE_GLES, "Don't allow OpenGL GLES API" },
-  { "gl-prefer-gl",    GDK_DEBUG_GL_PREFER_GL, "Prefer GL over GLES API" },
-  { "gl-egl",          GDK_DEBUG_GL_EGL, "Use EGL on X11 or Windows" },
-  { "gl-glx",          GDK_DEBUG_GL_GLX, "Use GLX on X11" },
-  { "gl-wgl",          GDK_DEBUG_GL_WGL, "Use WGL on Windows" },
-  { "vulkan-disable",  GDK_DEBUG_VULKAN_DISABLE, "Disable Vulkan support" },
-  { "vulkan-validate", GDK_DEBUG_VULKAN_VALIDATE, "Load the Vulkan validation layer" },
-  { "default-settings",GDK_DEBUG_DEFAULT_SETTINGS, "Force default values for xsettings" },
-  { "high-depth",      GDK_DEBUG_HIGH_DEPTH, "Use high bit depth rendering if possible" },
-  { "no-vsync",        GDK_DEBUG_NO_VSYNC, "Repaint instantly (uses 100% CPU with animations)" },
-  { "dmabuf-disable",  GDK_DEBUG_DMABUF_DISABLE, "Disable dmabuf support" },
+  { "nograbs",         GDK_DEBUG_NOGRABS, "Disable pointer and keyboard grabs (X11)", TRUE },
+  { "portals",         GDK_DEBUG_PORTALS, "Force use of portals", TRUE },
+  { "no-portals",      GDK_DEBUG_NO_PORTALS, "Disable use of portals", TRUE },
+  { "gl-disable",      GDK_DEBUG_GL_DISABLE, "Disable OpenGL support", TRUE },
+  { "gl-fractional",   GDK_DEBUG_GL_FRACTIONAL, "Enable fractional scaling for OpenGL (experimental)", TRUE },
+  { "gl-debug",        GDK_DEBUG_GL_DEBUG, "Insert debugging information in OpenGL", TRUE },
+  { "gl-legacy",       GDK_DEBUG_GL_LEGACY, "Use a legacy OpenGL context", TRUE },
+  { "gl-gles",         GDK_DEBUG_GL_GLES, "Only allow OpenGL GLES API", TRUE },
+  { "gl-egl",          GDK_DEBUG_GL_EGL, "Use EGL on X11 or Windows", TRUE },
+  { "gl-glx",          GDK_DEBUG_GL_GLX, "Use GLX on X11", TRUE },
+  { "gl-wgl",          GDK_DEBUG_GL_WGL, "Use WGL on Windows", TRUE },
+  { "vulkan-disable",  GDK_DEBUG_VULKAN_DISABLE, "Disable Vulkan support", TRUE },
+  { "vulkan-validate", GDK_DEBUG_VULKAN_VALIDATE, "Load the Vulkan validation layer", TRUE },
+  { "default-settings",GDK_DEBUG_DEFAULT_SETTINGS, "Force default values for xsettings", TRUE },
+  { "high-depth",      GDK_DEBUG_HIGH_DEPTH, "Use high bit depth rendering if possible", TRUE },
+  { "no-vsync",        GDK_DEBUG_NO_VSYNC, "Repaint instantly (uses 100% CPU with animations)", TRUE },
+  { "dmabuf-disable",  GDK_DEBUG_DMABUF_DISABLE, "Disable dmabuf support", TRUE },
 };
 
 
@@ -197,6 +196,13 @@ gdk_parse_debug_var (const char        *variable,
   const char *q;
   gboolean invert;
   gboolean help;
+  gboolean debug_enabled;
+
+#ifdef G_ENABLE_DEBUG
+  debug_enabled = TRUE;
+#else
+  debug_enabled = FALSE;
+#endif
 
   string = g_getenv (variable);
   if (string == NULL)
@@ -228,6 +234,12 @@ gdk_parse_debug_var (const char        *variable,
               if (strlen (keys[i].key) == q - p &&
                   g_ascii_strncasecmp (keys[i].key, p, q - p) == 0)
                 {
+                  if (!debug_enabled && !keys[i].always_enabled)
+                    {
+                      fprintf (stderr, "\"%s\" is only available when building GTK with G_ENABLE_DEBUG. See %s=help\n",
+                               val, variable);
+                      break;
+                    }
                   result |= keys[i].value;
                   break;
                 }
@@ -251,7 +263,8 @@ gdk_parse_debug_var (const char        *variable,
 
       fprintf (stderr, "Supported %s values:\n", variable);
       for (i = 0; i < nkeys; i++) {
-        fprintf (stderr, "  %s%*s%s\n", keys[i].key, (int)(max_width - strlen (keys[i].key)), " ", keys[i].help);
+        if (debug_enabled || keys[i].always_enabled)
+          fprintf (stderr, "  %s%*s%s\n", keys[i].key, (int)(max_width - strlen (keys[i].key)), " ", keys[i].help);
       }
       fprintf (stderr, "  %s%*s%s\n", "all", max_width - 3, " ", "Enable all values. Other given values are subtracted");
       fprintf (stderr, "  %s%*s%s\n", "help", max_width - 4, " ", "Print this help");
@@ -264,7 +277,8 @@ gdk_parse_debug_var (const char        *variable,
 
       for (i = 0; i < nkeys; i++)
         {
-          all_flags |= keys[i].value;
+          if (debug_enabled || keys[i].always_enabled)
+            all_flags |= keys[i].value;
         }
 
       result = all_flags & (~result);

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/gdkdebugprivate.h

@@ -37,27 +37,25 @@ typedef enum {
   GDK_DEBUG_SELECTION       = 1 <<  9,
   GDK_DEBUG_CLIPBOARD       = 1 << 10,
   GDK_DEBUG_DMABUF          = 1 << 11,
-  GDK_DEBUG_OFFLOAD         = 1 << 12,
 
   /* flags below are influencing behavior */
-  GDK_DEBUG_PORTALS         = 1 << 14,
-  GDK_DEBUG_NO_PORTALS      = 1 << 15,
-  GDK_DEBUG_GL_DISABLE      = 1 << 16,
-  GDK_DEBUG_GL_FRACTIONAL   = 1 << 17,
-
-  GDK_DEBUG_GL_DISABLE_GL   = 1 << 19,
-  GDK_DEBUG_GL_DISABLE_GLES = 1 << 20,
-  GDK_DEBUG_GL_PREFER_GL    = 1 << 21,
-  GDK_DEBUG_GL_DEBUG        = 1 << 22,
-  GDK_DEBUG_GL_EGL          = 1 << 23,
-  GDK_DEBUG_GL_GLX          = 1 << 24,
-  GDK_DEBUG_GL_WGL          = 1 << 25,
-  GDK_DEBUG_VULKAN_DISABLE  = 1 << 26,
-  GDK_DEBUG_VULKAN_VALIDATE = 1 << 27,
-  GDK_DEBUG_DEFAULT_SETTINGS= 1 << 28,
-  GDK_DEBUG_HIGH_DEPTH      = 1 << 29,
-  GDK_DEBUG_NO_VSYNC        = 1 << 30,
-  GDK_DEBUG_DMABUF_DISABLE  = 1 << 31,
+  GDK_DEBUG_NOGRABS         = 1 << 12,
+  GDK_DEBUG_PORTALS         = 1 << 13,
+  GDK_DEBUG_NO_PORTALS      = 1 << 14,
+  GDK_DEBUG_GL_DISABLE      = 1 << 15,
+  GDK_DEBUG_GL_FRACTIONAL   = 1 << 16,
+  GDK_DEBUG_GL_LEGACY       = 1 << 17,
+  GDK_DEBUG_GL_GLES         = 1 << 18,
+  GDK_DEBUG_GL_DEBUG        = 1 << 19,
+  GDK_DEBUG_GL_EGL          = 1 << 20,
+  GDK_DEBUG_GL_GLX          = 1 << 21,
+  GDK_DEBUG_GL_WGL          = 1 << 22,
+  GDK_DEBUG_VULKAN_DISABLE  = 1 << 23,
+  GDK_DEBUG_VULKAN_VALIDATE = 1 << 24,
+  GDK_DEBUG_DEFAULT_SETTINGS= 1 << 25,
+  GDK_DEBUG_HIGH_DEPTH      = 1 << 26,
+  GDK_DEBUG_NO_VSYNC        = 1 << 27,
+  GDK_DEBUG_DMABUF_DISABLE  = 1 << 28,
 } GdkDebugFlags;
 
 extern guint _gdk_debug_flags;
@@ -66,24 +64,13 @@ GdkDebugFlags    gdk_display_get_debug_flags    (GdkDisplay       *display);
 void             gdk_display_set_debug_flags    (GdkDisplay       *display,
                                                  GdkDebugFlags     flags);
 
-static inline void
-gdk_debug_message (const char *format, ...) G_GNUC_PRINTF(1, 2);
-static inline void
-gdk_debug_message (const char *format, ...)
-{
-  va_list args;
-  char *s;
-
-  va_start (args, format);
-  s = g_strdup_vprintf (format, args);
-  va_end (args);
 #ifdef GLIB_USING_SYSTEM_PRINTF
-  fprintf (stderr, "%s\n", s);
+#define gdk_debug_message(format, ...) fprintf (stderr, format "\n", ##__VA_ARGS__)
 #else
-  g_fprintf (stderr, "%s\n", s);
+#define gdk_debug_message(format, ...) g_fprintf (stderr, format "\n", ##__VA_ARGS__)
 #endif
-  g_free (s);
-}
+
+#ifdef G_ENABLE_DEBUG
 
 #define GDK_DISPLAY_DEBUG_CHECK(display,type) \
     G_UNLIKELY (gdk_display_get_debug_flags (display) & GDK_DEBUG_##type)
@@ -94,6 +81,13 @@ gdk_debug_message (const char *format, ...)
       gdk_debug_message (__VA_ARGS__);                                    \
     } G_STMT_END
 
+#else /* !G_ENABLE_DEBUG */
+
+#define GDK_DISPLAY_DEBUG_CHECK(display,type) 0
+#define GDK_DISPLAY_DEBUG(display,type,...)
+
+#endif /* G_ENABLE_DEBUG */
+
 #define GDK_DEBUG_CHECK(type) GDK_DISPLAY_DEBUG_CHECK (NULL,type)
 #define GDK_DEBUG(type,...) GDK_DISPLAY_DEBUG (NULL,type,__VA_ARGS__)
 
@@ -102,6 +96,7 @@ typedef struct
   const char *key;
   guint value;
   const char *help;
+  gboolean always_enabled;
 } GdkDebugKey;
 
 guint gdk_parse_debug_var (const char        *variable,

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,16 +39,11 @@
 #include "gdkglcontextprivate.h"
 #include "gdkmonitorprivate.h"
 #include "gdkrectangle.h"
-#include "gdkvulkancontextprivate.h"
+#include "gdkvulkancontext.h"
 
 #ifdef HAVE_EGL
 #include <epoxy/egl.h>
 #endif
-
-#ifdef HAVE_SYS_SYSMACROS_H
-#include <sys/sysmacros.h>
-#endif
-
 #include <math.h>
 #include <stdlib.h>
 
@@ -253,13 +247,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 +386,13 @@ 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_pointer (&display->egl_dmabuf_formats, gdk_dmabuf_formats_unref);
+  g_clear_object (&display->egl_gsk_renderer);
   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 +1166,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 +1237,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 +1251,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 +1270,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
@@ -1483,6 +1427,7 @@ gdk_display_get_gl_context (GdkDisplay *self)
 }
 
 #ifdef HAVE_EGL
+#ifdef G_ENABLE_DEBUG
 static int
 strvcmp (gconstpointer p1,
          gconstpointer p2)
@@ -1539,6 +1484,7 @@ describe_egl_config (EGLDisplay egl_display,
 
   return g_strdup_printf ("R%dG%dB%dA%d%s", red, green, blue, alpha, type == EGL_COLOR_COMPONENT_TYPE_FIXED_EXT ? "" : " float");
 }
+#endif
 
 gpointer
 gdk_display_get_egl_config (GdkDisplay *self)
@@ -1742,23 +1688,6 @@ gdk_display_check_egl_extensions (EGLDisplay   egl_display,
   return TRUE;
 }
 
-static const char *
-find_egl_device (EGLDisplay egl_display)
-{
-  EGLAttrib value;
-  EGLDeviceEXT egl_device;
-
-  eglQueryDisplayAttribEXT (egl_display, EGL_DEVICE_EXT, &value);
-
-  egl_device = (EGLDeviceEXT)value;
-
-#ifndef EGL_DRM_RENDER_NODE_FILE_EXT
-#define EGL_DRM_RENDER_NODE_FILE_EXT 0x3377
-#endif
-
-  return eglQueryDeviceStringEXT (egl_device, EGL_DRM_RENDER_NODE_FILE_EXT);
-}
-
 gboolean
 gdk_display_init_egl (GdkDisplay  *self,
                       int          platform,
@@ -1856,22 +1785,15 @@ gdk_display_init_egl (GdkDisplay  *self,
   if (priv->egl_config_high_depth == NULL)
     priv->egl_config_high_depth = priv->egl_config;
 
+#ifdef G_ENABLE_DEBUG
   if (GDK_DISPLAY_DEBUG_CHECK (self, OPENGL))
     {
       char *ext = describe_extensions (priv->egl_display);
       char *std_cfg = describe_egl_config (priv->egl_display, priv->egl_config);
       char *hd_cfg = describe_egl_config (priv->egl_display, priv->egl_config_high_depth);
-      const char *path;
-      struct stat buf = { .st_rdev = 0, };
-
-      path = find_egl_device (priv->egl_display);
-      if (path)
-        stat (path, &buf);
-
       gdk_debug_message ("EGL API version %d.%d found\n"
                          " - Vendor: %s\n"
                          " - Version: %s\n"
-                         " - Device: %s, %d %d\n"
                          " - Client APIs: %s\n"
                          " - Extensions:\n"
                          "\t%s\n"
@@ -1880,12 +1802,6 @@ gdk_display_init_egl (GdkDisplay  *self,
                          major, minor,
                          eglQueryString (priv->egl_display, EGL_VENDOR),
                          eglQueryString (priv->egl_display, EGL_VERSION),
-                         path ? path : "unknown",
-#ifdef HAVE_SYS_SYSMACROS_H
-                         major (buf.st_rdev), minor (buf.st_rdev),
-#else
-                         0, 0,
-#endif
                          eglQueryString (priv->egl_display, EGL_CLIENT_APIS),
                          ext, std_cfg,
                          priv->egl_config_high_depth == priv->egl_config ? "none" : hd_cfg);
@@ -1893,6 +1809,7 @@ gdk_display_init_egl (GdkDisplay  *self,
       g_free (std_cfg);
       g_free (ext);
     }
+#endif
 
   gdk_profiler_end_mark (start_time, "init EGL", NULL);
 
@@ -1931,12 +1848,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 +1864,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;
 }
@@ -1970,18 +1888,16 @@ gdk_display_init_dmabuf (GdkDisplay *self)
   builder = gdk_dmabuf_formats_builder_new ();
 
 #ifdef HAVE_DMABUF
-  if (!GDK_DISPLAY_DEBUG_CHECK (self, DMABUF_DISABLE))
+  if (!GDK_DEBUG_CHECK (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
 
@@ -2004,8 +1920,6 @@ gdk_display_init_dmabuf (GdkDisplay *self)
  * The formats returned by this function can be used for negotiating
  * buffer formats with producers such as v4l, pipewire or GStreamer.
  *
- * To learn more about dma-bufs, see [class@Gdk.DmabufTextureBuilder].
- *
  * Returns: (transfer none): a `GdkDmabufFormats` object
  *
  * Since: 4.14

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,10 +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 */
-  GdkDmabufFormats *egl_dmabuf_formats;
+  gpointer egl_gsk_renderer;
   GdkDmabufFormats *egl_external_formats;
 };
 
@@ -233,10 +219,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,11 +19,10 @@
 #include "config.h"
 
 #if defined(HAVE_DMABUF) && defined (HAVE_EGL)
-#include "gdkdmabufeglprivate.h"
+#include "gdkdmabufprivate.h"
 
 #include "gdkdmabufformatsbuilderprivate.h"
 #include "gdkdebugprivate.h"
-#include "gdkdmabuffourccprivate.h"
 #include "gdkdmabuftextureprivate.h"
 #include "gdkmemoryformatprivate.h"
 #include "gdkdisplayprivate.h"
@@ -31,106 +30,237 @@
 #include "gdktexturedownloader.h"
 
 #include <graphene.h>
+#include <sys/mman.h>
+#include <sys/ioctl.h>
+#include <linux/dma-buf.h>
+#include <drm_fourcc.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,
-                                           GdkDmabufFormatsBuilder   *formats,
-                                           GdkDmabufFormatsBuilder   *external)
+gdk_dmabuf_egl_downloader_add_formats (const GdkDmabufDownloader *downloader,
+                                       GdkDisplay                *display,
+                                       GdkDmabufFormatsBuilder   *builder)
 {
   GdkGLContext *context = gdk_display_get_gl_context (display);
   EGLDisplay egl_display = gdk_display_get_egl_display (display);
-  int num_fourccs;
-  int *fourccs;
-  guint64 *modifiers;
-  unsigned int *external_only;
-  int n_mods;
+  GdkDmabufFormatsBuilder *external;
+  gboolean retval = FALSE;
 
-  if (egl_display == EGL_NO_DISPLAY ||
-      !display->have_egl_dma_buf_import)
-    return FALSE;
+  g_assert (display->egl_external_formats == NULL);
+
+  external = gdk_dmabuf_formats_builder_new ();
 
   gdk_gl_context_make_current (context);
 
-  eglQueryDmaBufFormatsEXT (egl_display, 0, NULL, &num_fourccs);
-  fourccs = g_new (int, num_fourccs);
-  eglQueryDmaBufFormatsEXT (egl_display, num_fourccs, fourccs, &num_fourccs);
-
-  n_mods = 80;
-  modifiers = g_new (guint64, n_mods);
-  external_only = g_new (unsigned int, n_mods);
-
-  for (int i = 0; i < num_fourccs; i++)
+  if (egl_display != EGL_NO_DISPLAY &&
+      display->have_egl_dma_buf_import &&
+      gdk_gl_context_has_image_storage (context))
     {
-      int num_modifiers;
-      gboolean all_external;
+      int num_fourccs;
+      int *fourccs;
+      guint64 *modifiers;
+      unsigned int *external_only;
+      int n_mods;
 
-      eglQueryDmaBufModifiersEXT (egl_display,
-                                  fourccs[i],
-                                  0,
-                                  NULL,
-                                  NULL,
-                                  &num_modifiers);
+      eglQueryDmaBufFormatsEXT (egl_display, 0, NULL, &num_fourccs);
+      fourccs = g_new (int, num_fourccs);
+      eglQueryDmaBufFormatsEXT (egl_display, num_fourccs, fourccs, &num_fourccs);
 
-      if (num_modifiers > n_mods)
+      n_mods = 80;
+      modifiers = g_new (guint64, n_mods);
+      external_only = g_new (unsigned int, n_mods);
+
+      for (int i = 0; i < num_fourccs; i++)
         {
-          n_mods = num_modifiers;
-          modifiers = g_renew (guint64, modifiers, n_mods);
-          external_only = g_renew (unsigned int, external_only, n_mods);
-        }
+          int num_modifiers;
 
-      eglQueryDmaBufModifiersEXT (egl_display,
-                                  fourccs[i],
-                                  num_modifiers,
-                                  modifiers,
-                                  external_only,
-                                  &num_modifiers);
+          eglQueryDmaBufModifiersEXT (egl_display,
+                                      fourccs[i],
+                                      0,
+                                      NULL,
+                                      NULL,
+                                      &num_modifiers);
 
-      all_external = TRUE;
-
-      for (int j = 0; j < num_modifiers; j++)
-        {
-          /* All linear formats we support are already added my the mmap downloader.
-           * We don't add external formats, unless we can use them (via GLES)
-           */
-          if (modifiers[j] != DRM_FORMAT_MOD_LINEAR &&
-              (!external_only[j] || gdk_gl_context_get_use_es (context)))
+          if (num_modifiers > n_mods)
             {
-              GDK_DISPLAY_DEBUG (display, DMABUF,
-                                 "%s EGL dmabuf format %.4s:%#" G_GINT64_MODIFIER "x",
-                                 external_only[j] ? "external " : "",
-                                 (char *) &fourccs[i],
-                                 modifiers[j]);
-
-              gdk_dmabuf_formats_builder_add_format (formats, fourccs[i], modifiers[j]);
+              n_mods = num_modifiers;
+              modifiers = g_renew (guint64, modifiers, n_mods);
+              external_only = g_renew (unsigned int, external_only, n_mods);
+            }
+
+          eglQueryDmaBufModifiersEXT (egl_display,
+                                      fourccs[i],
+                                      num_modifiers,
+                                      modifiers,
+                                      external_only,
+                                      &num_modifiers);
+
+          for (int j = 0; j < num_modifiers; j++)
+            {
+              /* All linear formats we support are already added my the mmap downloader.
+               * We don't add external formats, unless we can use them (via GLES)
+               */
+              if (modifiers[j] != DRM_FORMAT_MOD_LINEAR &&
+                  (!external_only[j] || gdk_gl_context_get_use_es (context)))
+                {
+                  GDK_DEBUG (DMABUF, "%s%s dmabuf format %.4s:%#" G_GINT64_MODIFIER "x",
+                             external_only[j] ? "external " : "",
+                             downloader->name,
+                             (char *) &fourccs[i],
+                             modifiers[j]);
+
+                  gdk_dmabuf_formats_builder_add_format (builder, fourccs[i], modifiers[j]);
+                }
+              if (external_only[j])
+                gdk_dmabuf_formats_builder_add_format (external, fourccs[i], modifiers[j]);
             }
-          if (external_only[j])
-            gdk_dmabuf_formats_builder_add_format (external, fourccs[i], modifiers[j]);
-          else
-            all_external = FALSE;
         }
 
-      /* Accept implicit modifiers as long as we accept the format at all.
-       * This is a bit of a crapshot, but unfortunately needed for a bunch
-       * of drivers.
-       *
-       * As an extra wrinkle, treat the implicit modifier as 'external only'
-       * if all formats with the same fourcc are 'external only'.
-       */
-      if (!all_external || gdk_gl_context_get_use_es (context))
-        gdk_dmabuf_formats_builder_add_format (formats, fourccs[i], DRM_FORMAT_MOD_INVALID);
-      if (all_external)
-        gdk_dmabuf_formats_builder_add_format (external, fourccs[i], DRM_FORMAT_MOD_INVALID);
+      g_free (modifiers);
+      g_free (external_only);
+      g_free (fourccs);
+
+      retval = TRUE;
     }
 
-  g_free (modifiers);
-  g_free (external_only);
-  g_free (fourccs);
+  display->egl_external_formats = gdk_dmabuf_formats_builder_free_to_formats (external);
 
-  return TRUE;
+  return retval;
+}
+
+static GdkMemoryFormat
+get_memory_format (guint32  fourcc,
+                   gboolean premultiplied)
+{
+  switch (fourcc)
+    {
+    case DRM_FORMAT_ARGB8888:
+    case DRM_FORMAT_ABGR8888:
+    case DRM_FORMAT_XRGB8888_A8:
+    case DRM_FORMAT_XBGR8888_A8:
+      return premultiplied ? GDK_MEMORY_A8R8G8B8_PREMULTIPLIED : GDK_MEMORY_A8R8G8B8;
+
+    case DRM_FORMAT_RGBA8888:
+    case DRM_FORMAT_RGBX8888_A8:
+      return premultiplied ? GDK_MEMORY_R8G8B8A8_PREMULTIPLIED : GDK_MEMORY_R8G8B8A8;
+
+    case DRM_FORMAT_BGRA8888:
+      return premultiplied ? GDK_MEMORY_B8G8R8A8_PREMULTIPLIED : GDK_MEMORY_B8G8R8A8;
+
+    case DRM_FORMAT_RGB888:
+    case DRM_FORMAT_XRGB8888:
+    case DRM_FORMAT_XBGR8888:
+    case DRM_FORMAT_RGBX8888:
+    case DRM_FORMAT_BGRX8888:
+      return GDK_MEMORY_R8G8B8;
+
+    case DRM_FORMAT_BGR888:
+      return GDK_MEMORY_B8G8R8;
+
+    case DRM_FORMAT_XRGB2101010:
+    case DRM_FORMAT_XBGR2101010:
+    case DRM_FORMAT_RGBX1010102:
+    case DRM_FORMAT_BGRX1010102:
+    case DRM_FORMAT_XRGB16161616:
+    case DRM_FORMAT_XBGR16161616:
+      return GDK_MEMORY_R16G16B16;
+
+    case DRM_FORMAT_ARGB2101010:
+    case DRM_FORMAT_ABGR2101010:
+    case DRM_FORMAT_RGBA1010102:
+    case DRM_FORMAT_BGRA1010102:
+    case DRM_FORMAT_ARGB16161616:
+    case DRM_FORMAT_ABGR16161616:
+      return premultiplied ? GDK_MEMORY_R16G16B16A16_PREMULTIPLIED : GDK_MEMORY_R16G16B16A16;
+
+    case DRM_FORMAT_ARGB16161616F:
+    case DRM_FORMAT_ABGR16161616F:
+      return premultiplied ? GDK_MEMORY_R16G16B16A16_FLOAT_PREMULTIPLIED : GDK_MEMORY_R16G16B16A16_FLOAT;
+
+    case DRM_FORMAT_XRGB16161616F:
+    case DRM_FORMAT_XBGR16161616F:
+      return GDK_MEMORY_R16G16B16_FLOAT;
+
+    case DRM_FORMAT_YUYV:
+    case DRM_FORMAT_YVYU:
+    case DRM_FORMAT_UYVY:
+    case DRM_FORMAT_VYUY:
+    case DRM_FORMAT_XYUV8888:
+#ifdef DRM_FORMAT_XVUY8888
+    case DRM_FORMAT_XVUY8888:
+#endif
+    case DRM_FORMAT_VUY888:
+      return GDK_MEMORY_R8G8B8;
+
+    /* Add more formats here */
+    default:
+      return premultiplied ? GDK_MEMORY_A8R8G8B8_PREMULTIPLIED : GDK_MEMORY_A8R8G8B8;
+    }
+}
+
+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;
+  GdkGLContext *context;
+  int num_modifiers;
+  guint64 *modifiers;
+  unsigned int *external_only;
+
+  egl_display = gdk_display_get_egl_display (display);
+  if (egl_display == EGL_NO_DISPLAY)
+    {
+      g_set_error_literal (error,
+                           GDK_DMABUF_ERROR, GDK_DMABUF_ERROR_UNSUPPORTED_FORMAT,
+                           "EGL not available");
+      return FALSE;
+    }
+
+  context = gdk_display_get_gl_context (display);
+
+  gdk_gl_context_make_current (context);
+
+  eglQueryDmaBufModifiersEXT (egl_display,
+                              dmabuf->fourcc,
+                              0,
+                              NULL,
+                              NULL,
+                              &num_modifiers);
+
+  modifiers = g_newa (uint64_t, num_modifiers);
+  external_only = g_newa (unsigned int, num_modifiers);
+
+  eglQueryDmaBufModifiersEXT (egl_display,
+                              dmabuf->fourcc,
+                              num_modifiers,
+                              modifiers,
+                              external_only,
+                              &num_modifiers);
+
+  for (int i = 0; i < num_modifiers; i++)
+    {
+      if (modifiers[i] == dmabuf->modifier)
+        {
+          *out_format = get_memory_format (dmabuf->fourcc, premultiplied);
+          return TRUE;
+        }
+    }
+
+  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);
+
+  return FALSE;
 }
 
 /* Hack. We don't include gsk/gsk.h here to avoid a build order problem
@@ -138,138 +268,146 @@ gdk_dmabuf_egl_downloader_collect_formats (GdkDisplay                *display,
  * a bit to access the gsk api we need.
  */
 
-typedef struct _GskRenderer GskRenderer;
+typedef gpointer GskRenderer;
 
-extern GskRenderer *   gsk_gl_renderer_new                      (void);
-extern gboolean        gsk_renderer_realize_for_display         (GskRenderer  *renderer,
-                                                                 GdkDisplay   *display,
-                                                                 GError      **error);
+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);
 
-GdkDmabufDownloader *
-gdk_dmabuf_get_egl_downloader (GdkDisplay              *display,
-                               GdkDmabufFormatsBuilder *builder)
+typedef void (* InvokeFunc) (gpointer data);
+
+typedef struct _InvokeData
 {
-  GdkDmabufFormatsBuilder *formats;
-  GdkDmabufFormatsBuilder *external;
-  gboolean retval = FALSE;
-  GError *error = NULL;
-  GskRenderer *renderer;
+  volatile int spinlock;
+  InvokeFunc func;
+  gpointer data;
+} InvokeData;
 
-  g_assert (display->egl_dmabuf_formats == NULL);
-  g_assert (display->egl_external_formats == NULL);
+static gboolean
+gdk_dmabuf_egl_downloader_invoke_callback (gpointer data)
+{
+  InvokeData *invoke = data;
+  GdkGLContext *previous;
 
-  if (!gdk_display_prepare_gl (display, NULL))
-    return NULL;
+  previous = gdk_gl_context_get_current ();
 
-  formats = gdk_dmabuf_formats_builder_new ();
-  external = gdk_dmabuf_formats_builder_new ();
+  invoke->func (invoke->data);
 
-  retval = gdk_dmabuf_egl_downloader_collect_formats (display, formats, external);
+  if (previous)
+    gdk_gl_context_make_current (previous);
+  else
+    gdk_gl_context_clear_current ();
 
-  display->egl_dmabuf_formats = gdk_dmabuf_formats_builder_free_to_formats (formats);
-  display->egl_external_formats = gdk_dmabuf_formats_builder_free_to_formats (external);
+  g_atomic_int_set (&invoke->spinlock, 1);
 
-  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 FALSE;
 }
 
-EGLImage
-gdk_dmabuf_egl_create_image (GdkDisplay      *display,
-                             int              width,
-                             int              height,
-                             const GdkDmabuf *dmabuf,
-                             int              target)
+/* 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)
 {
-  EGLDisplay egl_display = gdk_display_get_egl_display (display);
-  EGLint attribs[64];
-  int i;
-  EGLImage image;
+  InvokeData invoke = { 0, func, data };
 
-  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);
+  g_main_context_invoke (NULL, gdk_dmabuf_egl_downloader_invoke_callback, &invoke);
 
-  if (egl_display == EGL_NO_DISPLAY || !display->have_egl_dma_buf_import)
+  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,
-                         "Can't import dmabufs into GL, missing EGL or EGL_EXT_image_dma_buf_import_modifiers");
-      return EGL_NO_IMAGE;
+      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;
     }
 
-  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);
+  return display->egl_gsk_renderer;
+}
 
-  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;
+static void
+gdk_dmabuf_egl_downloader_do_download (gpointer data)
+{
+  Download *download = data;
+  GdkDisplay *display;
+  GskRenderer *renderer;
+  GdkTexture *native;
+  GdkTextureDownloader *downloader;
 
-#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; \
-  }
+  display = gdk_dmabuf_texture_get_display (download->texture);
 
-  ADD_PLANE (0);
+  renderer = get_gsk_renderer (display);
 
-  if (dmabuf->n_planes > 1) ADD_PLANE (1);
-  if (dmabuf->n_planes > 2) ADD_PLANE (2);
-  if (dmabuf->n_planes > 3) ADD_PLANE (3);
+  native = gsk_renderer_convert_texture (renderer, GDK_TEXTURE (download->texture));
 
-  attribs[i++] = EGL_NONE;
+  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);
 
-  image = eglCreateImageKHR (egl_display,
-                             EGL_NO_CONTEXT,
-                             EGL_LINUX_DMA_BUF_EXT,
-                             (EGLClientBuffer)NULL,
-                             attribs);
+  g_object_unref (native);
+}
 
-  if (image == EGL_NO_IMAGE)
-    {
-      GDK_DISPLAY_DEBUG (display, DMABUF,
-                         "Creating EGLImage for dmabuf failed: %#x",
-                         eglGetError ());
-      return 0;
-    }
+static void
+gdk_dmabuf_egl_downloader_download (const GdkDmabufDownloader *downloader,
+                                    GdkTexture                *texture,
+                                    GdkMemoryFormat            format,
+                                    guchar                    *data,
+                                    gsize                      stride)
+{
+  Download download;
 
-  return image;
+  GDK_DEBUG (DMABUF, "Using %s for downloading a dmabuf", downloader->name);
+
+  download.texture = GDK_DMABUF_TEXTURE (texture);
+  download.format = format;
+  download.data = data;
+  download.stride = stride;
+
+  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,10 +37,6 @@
  * 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
- * is `DMA_FORMAT_MOD_INVALID`, indicating that **_implicit modifiers_**
- * may be used with this format.
- *
  * See [class@Gdk.DmabufTextureBuilder] for more information
  * about DMA buffers.
  *
@@ -152,10 +148,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/gdkdmabufformatsbuilder.c

@@ -22,6 +22,9 @@
 
 #include "gdkdmabufformatsprivate.h"
 
+#ifdef HAVE_DMABUF
+#include <drm_fourcc.h>
+#endif
 
 #define GDK_ARRAY_NAME gdk_dmabuf_formats_builder
 #define GDK_ARRAY_TYPE_NAME GdkDmabufFormatsBuilder
@@ -118,6 +121,12 @@ gdk_dmabuf_formats_builder_add_format (GdkDmabufFormatsBuilder *self,
                                        guint32                  fourcc,
                                        guint64                  modifier)
 {
+#ifdef HAVE_DMABUF
+  g_return_if_fail (modifier != DRM_FORMAT_MOD_INVALID);
+#else
+  g_return_if_reached ();
+#endif
+
   gdk_dmabuf_formats_builder_append (self, &(GdkDmabufFormat) { fourcc, modifier });
 }