Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dmabuf: Refactor downloader vfuncs

Browse Source 
This is in preparation for future commits. It also makes the API
clearer.
This commit is contained in:
Benjamin Otte
2023-12-18 22:58:55 +01:00
parent 26060b1be2
commit 26561ab2e7
3 changed files with 53 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
gdk/gdkdmabufegl.c
View File

@@ -134,21 +134,23 @@ gdk_dmabuf_egl_downloader_collect_formats (GdkDisplay *display,
}
static gboolean
gdk_dmabuf_egl_downloader_supports (const GdkDmabufDownloader *downloader,
GdkDisplay *display,
const GdkDmabuf *dmabuf,
gboolean premultiplied,
GError **error)
gdk_dmabuf_egl_downloader_supports (const GdkDmabufDownloader *downloader,
GdkDmabufTexture *texture,
GError **error)
{
if (gdk_dmabuf_formats_contains (display->egl_dmabuf_formats, dmabuf->fourcc, dmabuf->modifier))
return TRUE;
GdkDisplay *display = gdk_dmabuf_texture_get_display (texture);
const GdkDmabuf *dmabuf = gdk_dmabuf_texture_get_dmabuf (texture);
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);
if (!gdk_dmabuf_formats_contains (display->egl_dmabuf_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);
return FALSE;
}
return FALSE;
return TRUE;
}
/* Hack. We don't include gsk/gsk.h here to avoid a build order problem
@@ -192,7 +194,7 @@ get_gsk_renderer (GdkDisplay *display)
static void
gdk_dmabuf_egl_downloader_download (const GdkDmabufDownloader *downloader_,
GdkTexture *texture,
GdkDmabufTexture *texture,
GdkMemoryFormat format,
guchar *data,
gsize stride)
@@ -205,10 +207,10 @@ gdk_dmabuf_egl_downloader_download (const GdkDmabufDownloader *downloader_,
previous = gdk_gl_context_get_current ();
display = gdk_dmabuf_texture_get_display (GDK_DMABUF_TEXTURE (texture));
display = gdk_dmabuf_texture_get_display (texture);
renderer = get_gsk_renderer (display);
native = gsk_renderer_convert_texture (renderer, texture);
native = gsk_renderer_convert_texture (renderer, GDK_TEXTURE (texture));
downloader = gdk_texture_downloader_new (native);
gdk_texture_downloader_set_format (downloader, format);

6
gdk/gdkdmabufprivate.h
View File

@@ -27,12 +27,10 @@ struct _GdkDmabufDownloader
{
const char *name;
gboolean (* supports) (const GdkDmabufDownloader *downloader,
GdkDisplay *display,
const GdkDmabuf *dmabuf,
gboolean premultiplied,
GdkDmabufTexture *texture,
GError **error);
void (* download) (const GdkDmabufDownloader *downloader,
GdkTexture *texture,
GdkDmabufTexture *texture,
GdkMemoryFormat format,
guchar *data,
gsize stride);

75
gdk/gdkdmabuftexture.c
View File

@@ -62,11 +62,6 @@ G_DEFINE_QUARK (gdk-dmabuf-error-quark, gdk_dmabuf_error)
G_DEFINE_TYPE (GdkDmabufTexture, gdk_dmabuf_texture, GDK_TYPE_TEXTURE)
static void
gdk_dmabuf_texture_init (GdkDmabufTexture *self)
{
}
static void
gdk_dmabuf_texture_dispose (GObject *object)
{
@@ -97,7 +92,7 @@ gdk_dmabuf_texture_invoke_callback (gpointer data)
Download *download = data;
download->texture->downloader->download (download->texture->downloader,
GDK_TEXTURE (download->texture),
download->texture,
download->format,
download->data,
download->stride);
@@ -140,6 +135,11 @@ gdk_dmabuf_texture_class_init (GdkDmabufTextureClass *klass)
gobject_class->dispose = gdk_dmabuf_texture_dispose;
}
static void
gdk_dmabuf_texture_init (GdkDmabufTexture *self)
{
}
GdkDisplay *
gdk_dmabuf_texture_get_display (GdkDmabufTexture *self)
{
@@ -160,11 +160,9 @@ gdk_dmabuf_texture_new_from_builder (GdkDmabufTextureBuilder *builder,
{
#ifdef HAVE_DMABUF
GdkDmabufTexture *self;
const GdkDmabufDownloader *downloader;
GdkTexture *update_texture;
GdkDisplay *display;
GdkDmabuf dmabuf;
GdkMemoryFormat format;
GError *local_error = NULL;
int width, height;
gboolean premultiplied;
@@ -184,62 +182,57 @@ gdk_dmabuf_texture_new_from_builder (GdkDmabufTextureBuilder *builder,
gdk_display_init_dmabuf (display);
if (gdk_dmabuf_formats_contains (gdk_dmabuf_get_mmap_formats (), dmabuf.fourcc, dmabuf.modifier))
self = g_object_new (GDK_TYPE_DMABUF_TEXTURE,
"width", width,
"height", height,
NULL);
g_set_object (&self->display, display);
self->dmabuf = dmabuf;
if (!gdk_dmabuf_get_memory_format (dmabuf.fourcc, premultiplied, &(GDK_TEXTURE (self)->format)))
{
downloader = NULL;
GDK_DISPLAY_DEBUG (display, DMABUF,
"Falling back to generic RGBA for dmabuf format %.4s",
(char *) &dmabuf.fourcc);
GDK_TEXTURE (self)->format = premultiplied ? GDK_MEMORY_R8G8B8A8_PREMULTIPLIED
: GDK_MEMORY_R8G8B8A8;
}
else
if (!gdk_dmabuf_formats_contains (gdk_dmabuf_get_mmap_formats (), dmabuf.fourcc, dmabuf.modifier))
{
downloader = NULL;
for (i = 0; display->dmabuf_downloaders[i] != NULL; i++)
{
if (local_error && g_error_matches (local_error, GDK_DMABUF_ERROR, GDK_DMABUF_ERROR_UNSUPPORTED_FORMAT))
g_clear_error (&local_error);
if (display->dmabuf_downloaders[i]->supports (display->dmabuf_downloaders[i],
display,
&dmabuf,
premultiplied,
self,
local_error ? NULL : &local_error))
{
downloader = display->dmabuf_downloaders[i];
self->downloader = display->dmabuf_downloaders[i];
break;
}
}
if (downloader == NULL)
if (self->downloader == NULL)
{
g_propagate_error (error, local_error);
g_object_unref (self);
return NULL;
}
}
if (!gdk_dmabuf_get_memory_format (dmabuf.fourcc, premultiplied, &format))
{
GDK_DISPLAY_DEBUG (display, DMABUF,
"Falling back to generic ARGB for dmabuf format %.4s",
(char *) &dmabuf.fourcc);
format = premultiplied ? GDK_MEMORY_R8G8B8A8_PREMULTIPLIED
: GDK_MEMORY_R8G8B8A8;
}
GDK_DISPLAY_DEBUG (display, DMABUF,
"Creating dmabuf texture, format %.4s:%#" G_GINT64_MODIFIER "x, %s%u planes, memory format %u, downloader %s",
(char *) &dmabuf.fourcc, dmabuf.modifier,
gdk_dmabuf_texture_builder_get_premultiplied (builder) ? " premultiplied, " : "",
dmabuf.n_planes,
format,
downloader ? downloader->name : "none");
"Creating dmabuf texture, format %.4s:%#" G_GINT64_MODIFIER "x, %s%u planes, memory format %u, downloader %s",
(char *) &dmabuf.fourcc, dmabuf.modifier,
gdk_dmabuf_texture_builder_get_premultiplied (builder) ? " premultiplied, " : "",
dmabuf.n_planes,
GDK_TEXTURE (self)->format,
self->downloader ? self->downloader->name : "none");
self = g_object_new (GDK_TYPE_DMABUF_TEXTURE,
"width", width,
"height", height,
NULL);
GDK_TEXTURE (self)->format = format;
g_set_object (&self->display, display);
self->downloader = downloader;
self->dmabuf = dmabuf;
/* Set this only once we know that the texture will be created.
* Otherwise dispose() will run the callback */
self->destroy = destroy;
self->data = data;