AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-14 06:10:21 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Matthiasc/for main

See merge request GNOME/gtk!6519
This commit is contained in:
Matthias Clasen 2023-10-23 04:11:04 +00:00
commit 51cb1aeb4e
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gdk/gdkdisplay.c
View File

@ -1910,6 +1910,9 @@ gdk_display_init_dmabuf (GdkDisplay *self)
* GTK may use OpenGL or Vulkan to support some formats. * GTK may use OpenGL or Vulkan to support some formats.
* Calling this function will then initialize them if they aren't yet. * 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 * Returns: (transfer none): a `GdkDmabufFormats` object
* *
* Since: 4.14 * Since: 4.14

5
gdk/gdkdmabuf.c
View File

@ -557,12 +557,11 @@ gdk_dmabuf_get_direct_downloader (void)
* *
* 1. Disallow any dmabuf format that we do not know. * 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. * 2. Ignore all other modifiers.
* *
* 3. Try and fix various inconsistencies between V4L and Mesa, * 3. Try and fix various inconsistencies between V4L and Mesa, like NV12.
* like NV12.
* *
* *** WARNING *** * *** WARNING ***
* *

9
gdk/gdkdmabuftexturebuilder.c
View File

@ -96,9 +96,12 @@ struct _GdkDmabufTextureBuilderClass
* to create the new texture. * to create the new texture.
* *
* The required properties for a dma-buf texture are * 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 width and height in pixels
* - The file descriptor, offset and stride for each of the planes *
* * 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 * `GdkDmabufTextureBuilder` can be used for quick one-shot construction of
* textures as well as kept around and reused to construct multiple textures. * textures as well as kept around and reused to construct multiple textures.