[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 07/14] ui/gtk: use GtkGlArea on wayland only
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 07/14] ui/gtk: use GtkGlArea on wayland only |
Date: |
Mon, 12 Mar 2018 10:13:58 +0100 |
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 <address@hidden>
Message-id: address@hidden
---
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
- [Qemu-devel] [PULL 00/14] Ui 20180312 patches, Gerd Hoffmann, 2018/03/12
- [Qemu-devel] [PULL 02/14] make: switch language file build to be gtk module aware, Gerd Hoffmann, 2018/03/12
- [Qemu-devel] [PULL 03/14] sdl: workaround bug in sdl 2.0.8 headers, Gerd Hoffmann, 2018/03/12
- [Qemu-devel] [PULL 01/14] build: try improve handling of clang warnings, Gerd Hoffmann, 2018/03/12
- [Qemu-devel] [PULL 09/14] ui/gtk-egl: add cursor_dmabuf support, Gerd Hoffmann, 2018/03/12
- [Qemu-devel] [PULL 10/14] vnc: deal with surface NULL pointers, Gerd Hoffmann, 2018/03/12
- [Qemu-devel] [PULL 07/14] ui/gtk: use GtkGlArea on wayland only,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 05/14] ui/gtk: group gtk.mo declarations in Makefile, Gerd Hoffmann, 2018/03/12
- [Qemu-devel] [PULL 14/14] qapi: Add device ID and head parameters to screendump, Gerd Hoffmann, 2018/03/12
- [Qemu-devel] [PULL 06/14] ui/opengl: Makefile cleanup, Gerd Hoffmann, 2018/03/12
- [Qemu-devel] [PULL 08/14] ui/gtk-egl: add scanout_dmabuf support, Gerd Hoffmann, 2018/03/12
- [Qemu-devel] [PULL 11/14] spice: drop dprint() debug logging, Gerd Hoffmann, 2018/03/12
- [Qemu-devel] [PULL 12/14] spice: add scanout_dmabuf support, Gerd Hoffmann, 2018/03/12
- [Qemu-devel] [PULL 04/14] ui/gtk: make GtkGlArea usage a runtime option, Gerd Hoffmann, 2018/03/12
- [Qemu-devel] [PULL 13/14] spice: add cursor_dmabuf support, Gerd Hoffmann, 2018/03/12
- Re: [Qemu-devel] [PULL 00/14] Ui 20180312 patches, Peter Maydell, 2018/03/12