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] [PATCH v2 4/6] ui/gtk: use GtkGlArea on wayland only
Date: Tue,  6 Mar 2018 10:09:49 +0100	[thread overview]
Message-ID: <20180306090951.22932-5-kraxel@redhat.com> (raw)
In-Reply-To: <20180306090951.22932-1-kraxel@redhat.com>

For dma-buf support we need a egl context.  The gtk x11 backend uses glx
contexts though.  We can't use the GtkGlArea widget on x11 because of
that, so use our own gtk-egl code instead.  wayland continues to use
the GtkGlArea widget.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 ui/gtk.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/ui/gtk.c b/ui/gtk.c
index 856429a02f..4a1622b887 100644
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -2440,12 +2440,15 @@ static void early_gtk_display_init(DisplayOptions *opts)
     assert(opts->type == DISPLAY_TYPE_GTK);
     if (opts->has_gl && opts->gl) {
 #if defined(CONFIG_OPENGL)
-#if defined(CONFIG_GTK_GL)
-        gtk_use_gl_area = true;
-        gtk_gl_area_init();
-#else
-        gtk_egl_init();
+#if defined(CONFIG_GTK_GL) && defined(GDK_WINDOWING_WAYLAND)
+        if (GDK_IS_WAYLAND_DISPLAY(gdk_display_get_default())) {
+            gtk_use_gl_area = true;
+            gtk_gl_area_init();
+        }
 #endif
+        {
+            gtk_egl_init();
+        }
 #endif
     }
 
-- 
2.9.3

  parent reply	other threads:[~2018-03-06  9:10 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-03-06  9:09 [Qemu-devel] [PATCH v2 0/6] gtk: add support for dmabufs Gerd Hoffmann
2018-03-06  9:09 ` [Qemu-devel] [PATCH v2 1/6] ui/gtk: make GtkGlArea usage a runtime option Gerd Hoffmann
2018-03-06  9:09 ` [Qemu-devel] [PATCH v2 2/6] ui/gtk: group gtk.mo declarations in Makefile Gerd Hoffmann
2018-03-06  9:09 ` [Qemu-devel] [PATCH v2 3/6] ui/opengl: Makefile cleanup Gerd Hoffmann
2018-03-06  9:09 ` Gerd Hoffmann [this message]
2018-03-06  9:09 ` [Qemu-devel] [PATCH v2 5/6] ui/gtk-egl: add scanout_dmabuf support Gerd Hoffmann
2018-03-06  9:09 ` [Qemu-devel] [PATCH v2 6/6] ui/gtk-egl: add cursor_dmabuf support Gerd Hoffmann

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=20180306090951.22932-5-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).