[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 16/20] ui: add egl dmabuf import to gtkglarea
From: |
marcandre . lureau |
Subject: |
[PATCH 16/20] ui: add egl dmabuf import to gtkglarea |
Date: |
Tue, 2 Feb 2021 18:26:21 +0400 |
From: Marc-André Lureau <marcandre.lureau@redhat.com>
GtkGLArea is used on wayland, where EGL is usually available.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
include/ui/gtk.h | 2 ++
ui/gtk-gl-area.c | 18 ++++++++++++++++++
ui/gtk.c | 22 ++++++++++++++++++++++
3 files changed, 42 insertions(+)
diff --git a/include/ui/gtk.h b/include/ui/gtk.h
index aaef884b95..3c1cd98db8 100644
--- a/include/ui/gtk.h
+++ b/include/ui/gtk.h
@@ -134,6 +134,8 @@ QEMUGLContext
gd_gl_area_create_context(DisplayChangeListener *dcl,
QEMUGLParams *params);
void gd_gl_area_destroy_context(DisplayChangeListener *dcl,
QEMUGLContext ctx);
+void gd_gl_area_scanout_dmabuf(DisplayChangeListener *dcl,
+ QemuDmaBuf *dmabuf);
void gd_gl_area_scanout_texture(DisplayChangeListener *dcl,
uint32_t backing_id,
bool backing_y_0_top,
diff --git a/ui/gtk-gl-area.c b/ui/gtk-gl-area.c
index 96fbe75387..72bcd94918 100644
--- a/ui/gtk-gl-area.c
+++ b/ui/gtk-gl-area.c
@@ -213,6 +213,24 @@ void gd_gl_area_scanout_flush(DisplayChangeListener *dcl,
gtk_gl_area_queue_render(GTK_GL_AREA(vc->gfx.drawing_area));
}
+void gd_gl_area_scanout_dmabuf(DisplayChangeListener *dcl,
+ QemuDmaBuf *dmabuf)
+{
+#ifdef CONFIG_OPENGL_DMABUF
+ VirtualConsole *vc = container_of(dcl, VirtualConsole, gfx.dcl);
+
+ gtk_gl_area_make_current(GTK_GL_AREA(vc->gfx.drawing_area));
+ egl_dmabuf_import_texture(dmabuf);
+ if (!dmabuf->texture) {
+ return;
+ }
+
+ gd_gl_area_scanout_texture(dcl, dmabuf->texture,
+ false, dmabuf->width, dmabuf->height,
+ 0, 0, dmabuf->width, dmabuf->height);
+#endif
+}
+
void gtk_gl_area_init(void)
{
display_opengl = 1;
diff --git a/ui/gtk.c b/ui/gtk.c
index f41c396cb9..79dc240120 100644
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -627,6 +627,12 @@ static bool gd_has_dmabuf(DisplayChangeListener *dcl)
{
VirtualConsole *vc = container_of(dcl, VirtualConsole, gfx.dcl);
+ if (gtk_use_gl_area && !gtk_widget_get_realized(vc->gfx.drawing_area)) {
+ /* FIXME: Assume it will work, actual check done after realize */
+ /* fixing this would require delaying listener registration */
+ return true;
+ }
+
return vc->gfx.has_dmabuf;
}
@@ -647,6 +653,8 @@ static const DisplayChangeListenerOps dcl_gl_area_ops = {
.dpy_gl_scanout_texture = gd_gl_area_scanout_texture,
.dpy_gl_scanout_disable = gd_gl_area_scanout_disable,
.dpy_gl_update = gd_gl_area_scanout_flush,
+ .dpy_gl_scanout_dmabuf = gd_gl_area_scanout_dmabuf,
+ .dpy_has_dmabuf = gd_has_dmabuf,
};
static const DisplayChangeListenerOps dcl_egl_ops = {
@@ -1983,6 +1991,18 @@ static GtkWidget *gd_create_menu_machine(GtkDisplayState
*s)
return machine_menu;
}
+#if defined(CONFIG_OPENGL)
+static void gl_area_realize(GtkGLArea *area, VirtualConsole *vc)
+{
+ gtk_gl_area_make_current(area);
+ qemu_egl_display = eglGetCurrentDisplay();
+ vc->gfx.has_dmabuf = qemu_egl_has_dmabuf();
+ if (!vc->gfx.has_dmabuf) {
+ error_report("GtkGLArea console lacks DMABUF support.");
+ }
+}
+#endif
+
static GSList *gd_vc_gfx_init(GtkDisplayState *s, VirtualConsole *vc,
QemuConsole *con, int idx,
GSList *group, GtkWidget *view_menu)
@@ -1998,6 +2018,8 @@ static GSList *gd_vc_gfx_init(GtkDisplayState *s,
VirtualConsole *vc,
if (display_opengl) {
if (gtk_use_gl_area) {
vc->gfx.drawing_area = gtk_gl_area_new();
+ g_signal_connect(vc->gfx.drawing_area, "realize",
+ G_CALLBACK(gl_area_realize), vc);
vc->gfx.dcl.ops = &dcl_gl_area_ops;
} else {
vc->gfx.drawing_area = gtk_drawing_area_new();
--
2.29.0
- [PATCH 09/20] ui: remove console_has_gl_dmabuf(), (continued)
- [PATCH 12/20] ui: add a DCLOps callback to check dmabuf support, marcandre . lureau, 2021/02/02
- [PATCH 13/20] ui: check hw requirements during DCL registration, marcandre . lureau, 2021/02/02
- [PATCH 14/20] ui: add qemu_egl_has_dmabuf helper, marcandre . lureau, 2021/02/02
- [PATCH 15/20] ui: check gtk-egl dmabuf support, marcandre . lureau, 2021/02/02
- [PATCH 16/20] ui: add egl dmabuf import to gtkglarea,
marcandre . lureau <=
- [PATCH 17/20] virtio-gpu: avoid re-entering cmdq processing, marcandre . lureau, 2021/02/02
- [PATCH 18/20] display/ui: add a callback to indicate GL state is flushed, marcandre . lureau, 2021/02/02
- [PATCH 19/20] chardev: check if the chardev is registered for yanking, marcandre . lureau, 2021/02/02
- [PATCH 20/20] RFC: tests: add some virtio-gpu & vhost-user-gpu acceptance test, marcandre . lureau, 2021/02/02
Re: [PATCH 00/20] Various vhost-user-gpu & UI fixes, no-reply, 2021/02/02