AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-08 17:50:10 +00:00
Code Issues Projects Releases Wiki Activity

dmabuftexture: Stop having a fixed downloader

Browse Source 
Change things from picking a download method at creation time to
trying all methods at download time until one succeeds.
This commit is contained in:
Matthias Clasen 2024-09-17 08:34:54 +02:00
parent d0b409d349
commit ff0045b8c9
1 changed files with 49 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
gdk/gdkdmabuftexture.c
View File

@ -50,7 +50,6 @@ struct _GdkDmabufTexture
GdkTexture parent_instance; GdkTexture parent_instance;
GdkDisplay *display; GdkDisplay *display;
GdkDmabufDownloader *downloader;
GdkDmabuf dmabuf; GdkDmabuf dmabuf;
@ -85,7 +84,6 @@ gdk_dmabuf_texture_dispose (GObject *object)
self->destroy = NULL; self->destroy = NULL;
} }
g_clear_object (&self->downloader);
g_clear_object (&self->display); g_clear_object (&self->display);
G_OBJECT_CLASS (gdk_dmabuf_texture_parent_class)->dispose (object); G_OBJECT_CLASS (gdk_dmabuf_texture_parent_class)->dispose (object);
@ -107,16 +105,49 @@ static gboolean
gdk_dmabuf_texture_invoke_callback (gpointer data) gdk_dmabuf_texture_invoke_callback (gpointer data)
{ {
Download *download = data; Download *download = data;
GdkDisplay *display = download->texture->display;
gdk_dmabuf_downloader_download (download->texture->downloader, if (display->egl_downloader &&
gdk_dmabuf_downloader_download (display->egl_downloader,
download->texture, download->texture,
download->format, download->format,
download->color_state, download->color_state,
download->data, download->data,
download->stride); download->stride))
{
/* Successfully downloaded using EGL */
}
else if (display->vk_downloader &&
gdk_dmabuf_downloader_download (display->vk_downloader,
download->texture,
download->format,
download->color_state,
download->data,
download->stride))
{
/* Successfully downloaded using Vulkan */
}
#ifdef HAVE_DMABUF
else if (gdk_dmabuf_download_mmap (GDK_TEXTURE (download->texture),
download->format,
download->color_state,
download->data,
download->stride))
{
/* Successfully downloaded using mmap */
}
#endif
else
{
const GdkDmabuf *dmabuf = gdk_dmabuf_texture_get_dmabuf (download->texture);
g_critical ("Failed to download %dx%d dmabuf texture (format %.4s:%#" G_GINT64_MODIFIER "x)",
gdk_texture_get_width (GDK_TEXTURE (download->texture)),
gdk_texture_get_height (GDK_TEXTURE (download->texture)),
(char *)&(dmabuf->fourcc), dmabuf->modifier);
}
g_atomic_int_set (&download->spinlock, 1); g_atomic_int_set (&download->spinlock, 1);
return FALSE; return FALSE;
} }
@ -130,14 +161,6 @@ gdk_dmabuf_texture_download (GdkTexture *texture,
GdkDmabufTexture *self = GDK_DMABUF_TEXTURE (texture); GdkDmabufTexture *self = GDK_DMABUF_TEXTURE (texture);
Download download = { self, format, color_state, data, stride, 0 }; Download download = { self, format, color_state, data, stride, 0 };
if (self->downloader == NULL)
{
#ifdef HAVE_DMABUF
gdk_dmabuf_download_mmap (texture, format, color_state, data, stride);
#endif
return;
}
g_main_context_invoke (NULL, gdk_dmabuf_texture_invoke_callback, &download); g_main_context_invoke (NULL, gdk_dmabuf_texture_invoke_callback, &download);
while (g_atomic_int_get (&download.spinlock) == 0); while (g_atomic_int_get (&download.spinlock) == 0);
@ -232,37 +255,22 @@ gdk_dmabuf_texture_new_from_builder (GdkDmabufTextureBuilder *builder,
: GDK_MEMORY_R8G8B8A8; : GDK_MEMORY_R8G8B8A8;
} }
if (display->egl_downloader) if (!gdk_dmabuf_formats_contains (display->dmabuf_formats, dmabuf.fourcc, dmabuf.modifier))
{
if (gdk_dmabuf_downloader_supports (display->egl_downloader, self, error))
self->downloader = g_object_ref (display->egl_downloader);
}
if (!self->downloader && display->vk_downloader)
{
g_clear_error (error);
if (gdk_dmabuf_downloader_supports (display->vk_downloader, self, error))
self->downloader = g_object_ref (display->vk_downloader);
}
if (!self->downloader)
{
if (!gdk_dmabuf_formats_contains (gdk_dmabuf_get_mmap_formats (), dmabuf.fourcc, dmabuf.modifier))
{ {
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);
g_object_unref (self); g_object_unref (self);
return NULL; return NULL;
} }
g_clear_error (error);
}
GDK_DISPLAY_DEBUG (display, DMABUF, GDK_DISPLAY_DEBUG (display, DMABUF,
"Creating dmabuf texture, format %.4s:%#" G_GINT64_MODIFIER "x, %s%u planes, memory format %u, downloader %s", "Creating dmabuf texture, format %.4s:%#" G_GINT64_MODIFIER "x, %s%u planes, memory format %u",
(char *) &dmabuf.fourcc, dmabuf.modifier, (char *) &dmabuf.fourcc, dmabuf.modifier,
gdk_dmabuf_texture_builder_get_premultiplied (builder) ? " premultiplied, " : "", gdk_dmabuf_texture_builder_get_premultiplied (builder) ? " premultiplied, " : "",
dmabuf.n_planes, dmabuf.n_planes,
GDK_TEXTURE (self)->format, GDK_TEXTURE (self)->format);
self->downloader ? G_OBJECT_TYPE_NAME (self->downloader) : "none");
/* Set this only once we know that the texture will be created. /* Set this only once we know that the texture will be created.
* Otherwise dispose() will run the callback */ * Otherwise dispose() will run the callback */