Merge branch 'dont-claim-external-formats' into 'main'

dmabuf: We don't support external formats on GL

See merge request GNOME/gtk!6516
This commit is contained in:
Matthias Clasen 2023-10-22 22:40:48 +00:00
commit 65993ed0e0

View File

@ -106,8 +106,11 @@ gdk_dmabuf_egl_downloader_add_formats (const GdkDmabufDownloader *downloader,
(char *) &fourccs[i],
modifiers[j]);
/* All linear formats we support are already added my the mmap downloader */
if (modifiers[j] != DRM_FORMAT_MOD_LINEAR)
/* 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_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]);