qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Gerd Hoffmann <kraxel@redhat.com>
Subject: [Qemu-devel] [PULL 7/8] ui/gtk-egl: add scanout_dmabuf support
Date: Thu,  8 Mar 2018 09:32:30 +0100	[thread overview]
Message-ID: <20180308083231.20180-8-kraxel@redhat.com> (raw)
In-Reply-To: <20180308083231.20180-1-kraxel@redhat.com>

Add support for dmabuf scanouts to gtk-egl.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-id: 20180306090951.22932-6-kraxel@redhat.com
---
 include/ui/gtk.h |  4 ++++
 ui/gtk-egl.c     | 23 +++++++++++++++++++++++
 ui/gtk.c         |  2 ++
 3 files changed, 29 insertions(+)

diff --git a/include/ui/gtk.h b/include/ui/gtk.h
index f6dafc5961..84c992c227 100644
--- a/include/ui/gtk.h
+++ b/include/ui/gtk.h
@@ -113,6 +113,10 @@ void gd_egl_scanout_texture(DisplayChangeListener *dcl,
                             uint32_t backing_height,
                             uint32_t x, uint32_t y,
                             uint32_t w, uint32_t h);
+void gd_egl_scanout_dmabuf(DisplayChangeListener *dcl,
+                           QemuDmaBuf *dmabuf);
+void gd_egl_release_dmabuf(DisplayChangeListener *dcl,
+                           QemuDmaBuf *dmabuf);
 void gd_egl_scanout_flush(DisplayChangeListener *dcl,
                           uint32_t x, uint32_t y, uint32_t w, uint32_t h);
 void gtk_egl_init(void);
diff --git a/ui/gtk-egl.c b/ui/gtk-egl.c
index eb86c26a1d..2c83c22d04 100644
--- a/ui/gtk-egl.c
+++ b/ui/gtk-egl.c
@@ -194,6 +194,29 @@ void gd_egl_scanout_texture(DisplayChangeListener *dcl,
                          backing_id, false);
 }
 
+void gd_egl_scanout_dmabuf(DisplayChangeListener *dcl,
+                           QemuDmaBuf *dmabuf)
+{
+#ifdef CONFIG_OPENGL_DMABUF
+    egl_dmabuf_import_texture(dmabuf);
+    if (!dmabuf->texture) {
+        return;
+    }
+
+    gd_egl_scanout_texture(dcl, dmabuf->texture,
+                           false, dmabuf->width, dmabuf->height,
+                           0, 0, dmabuf->width, dmabuf->height);
+#endif
+}
+
+void gd_egl_release_dmabuf(DisplayChangeListener *dcl,
+                           QemuDmaBuf *dmabuf)
+{
+#ifdef CONFIG_OPENGL_DMABUF
+    egl_dmabuf_release_texture(dmabuf);
+#endif
+}
+
 void gd_egl_scanout_flush(DisplayChangeListener *dcl,
                           uint32_t x, uint32_t y, uint32_t w, uint32_t h)
 {
diff --git a/ui/gtk.c b/ui/gtk.c
index 4a1622b887..cf2061d716 100644
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -744,6 +744,8 @@ static const DisplayChangeListenerOps dcl_egl_ops = {
     .dpy_gl_ctx_get_current  = qemu_egl_get_current_context,
     .dpy_gl_scanout_disable  = gd_egl_scanout_disable,
     .dpy_gl_scanout_texture  = gd_egl_scanout_texture,
+    .dpy_gl_scanout_dmabuf   = gd_egl_scanout_dmabuf,
+    .dpy_gl_release_dmabuf   = gd_egl_release_dmabuf,
     .dpy_gl_update           = gd_egl_scanout_flush,
 };
 
-- 
2.9.3

  parent reply	other threads:[~2018-03-08  8:32 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-03-08  8:32 [Qemu-devel] [PULL 0/8] Ui 20180308 patches Gerd Hoffmann
2018-03-08  8:32 ` [Qemu-devel] [PULL 1/8] make: switch language file build to be gtk module aware Gerd Hoffmann
2018-03-08  8:32 ` [Qemu-devel] [PULL 2/8] sdl: workaround bug in sdl 2.0.8 headers Gerd Hoffmann
2018-03-08  8:32 ` [Qemu-devel] [PULL 3/8] ui/gtk: make GtkGlArea usage a runtime option Gerd Hoffmann
2018-03-08  8:32 ` [Qemu-devel] [PULL 4/8] ui/gtk: group gtk.mo declarations in Makefile Gerd Hoffmann
2018-03-08  8:32 ` [Qemu-devel] [PULL 5/8] ui/opengl: Makefile cleanup Gerd Hoffmann
2018-03-08  8:32 ` [Qemu-devel] [PULL 6/8] ui/gtk: use GtkGlArea on wayland only Gerd Hoffmann
2018-03-08  8:32 ` Gerd Hoffmann [this message]
2018-03-08  8:32 ` [Qemu-devel] [PULL 8/8] ui/gtk-egl: add cursor_dmabuf support Gerd Hoffmann
2018-03-08 17:27 ` [Qemu-devel] [PULL 0/8] Ui 20180308 patches Peter Maydell
2018-03-09  6:52   ` Gerd Hoffmann
2018-03-09  7:50     ` Gerd Hoffmann
2018-03-09  8:46       ` Thomas Huth
2018-03-09  9:15         ` Gerd Hoffmann
2018-03-09  9:44           ` Gerd Hoffmann
2018-03-09  9:48             ` Thomas Huth
2018-03-09 10:41               ` Gerd Hoffmann
2018-03-09 10:46                 ` Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180308083231.20180-8-kraxel@redhat.com \
    --to=kraxel@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).