[Qemu-devel] [PATCH 3/4] gtk: use GtkGlArea on wayland only

[Gerd Hoffmann]

For dma-buf imports we need a egl context.  The GtkGlArea widget uses
glx though when running on X11.  So use the GtkGlArea code on wayland
only.

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

diff --git a/ui/gtk.c b/ui/gtk.c
index 33cd848db3..d794fb7fa9 100644
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -2374,12 +2374,15 @@ void early_gtk_display_init(int opengl)
         break;
     case 1: /* on */
 #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
         break;
     default:
-- 
2.9.3