Merge branch 'matthiasc/for-main' into 'main'

Matthiasc/for main

See merge request GNOME/gtk!6519

gdk/gdkdisplay.c

@@ -1910,6 +1910,9 @@ gdk_display_init_dmabuf (GdkDisplay *self)
  * GTK may use OpenGL or Vulkan to support some formats.
  * Calling this function will then initialize them if they aren't yet.
  *
+ * The formats returned by this function can be used for negotiating
+ * buffer formats with producers such as v4l, pipewire or GStreamer.
+ *
  * Returns: (transfer none): a `GdkDmabufFormats` object
  *
  * Since: 4.14

gdk/gdkdmabuf.c

@@ -557,12 +557,11 @@ gdk_dmabuf_get_direct_downloader (void)
  *
  * 1. Disallow any dmabuf format that we do not know.
  *
- * 1. Treat the INVALID modifier the same as LINEAR.
+ * 1. Reject the INVALID modifier, accept the LINEAR one.
  *
  * 2. Ignore all other modifiers.
  *
- * 3. Try and fix various inconsistencies between V4L and Mesa,
- *    like NV12.
+ * 3. Try and fix various inconsistencies between V4L and Mesa, like NV12.
  *
  * *** WARNING ***
  *

gdk/gdkdmabuftexturebuilder.c

@@ -96,9 +96,12 @@ struct _GdkDmabufTextureBuilderClass
  * to create the new texture.
  *
  * The required properties for a dma-buf texture are
- *  - The width and height in pixels
- *  - The `fourcc` code and `modifier` which identify the format and memory layout of the dma-buf
- *  - The file descriptor, offset and stride for each of the planes
+ *
+ *  * The width and height in pixels
+ *
+ *  * The `fourcc` code and `modifier` which identify the format and memory layout of the dma-buf
+ *
+ *  * The file descriptor, offset and stride for each of the planes
  *
  * `GdkDmabufTextureBuilder` can be used for quick one-shot construction of
  * textures as well as kept around and reused to construct multiple textures.