[RFC PATCH] ui/gtk: ??? Remove dead code around X11 ???

[Philippe Mathieu-Daudé]

I have no clue about what this code does,
but gtk_widget_set_double_buffered() is deprecated since GTK 3.14
and we require 3.22 since more than 4 years, commit 7b23d121f9
("ui: increase min required GTK version to 3.22.0").

Assert gtk_use_gl_area is set and remove the dead code.

Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org>
---
 ui/gtk.c | 46 +++++++++-------------------------------------
 1 file changed, 9 insertions(+), 37 deletions(-)

diff --git a/ui/gtk.c b/ui/gtk.c
index bf9d3dd679..d968cf3de1 100644
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -809,17 +809,9 @@ static gboolean gd_draw_event(GtkWidget *widget, cairo_t 
*cr, void *opaque)
 
 #if defined(CONFIG_OPENGL)
     if (vc->gfx.gls) {
-        if (gtk_use_gl_area) {
-            /* invoke render callback please */
-            return FALSE;
-        } else {
-#ifdef CONFIG_X11
-            gd_egl_draw(vc);
-            return TRUE;
-#else
-            abort();
-#endif
-        }
+        assert(gtk_use_gl_area);
+        /* invoke render callback please */
+        return FALSE;
     }
 #endif
 
@@ -2156,32 +2148,12 @@ static GSList *gd_vc_gfx_init(GtkDisplayState *s, 
VirtualConsole *vc,
 
 #if defined(CONFIG_OPENGL)
     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;
-            vc->gfx.dgc.ops = &gl_area_ctx_ops;
-        } else {
-#ifdef CONFIG_X11
-            vc->gfx.drawing_area = gtk_drawing_area_new();
-            /*
-             * gtk_widget_set_double_buffered() was deprecated in 3.14.
-             * It is required for opengl rendering on X11 though.  A
-             * proper replacement (native opengl support) is only
-             * available in 3.16+.  Silence the warning if possible.
-             */
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-            gtk_widget_set_double_buffered(vc->gfx.drawing_area, FALSE);
-#pragma GCC diagnostic pop
-            vc->gfx.dcl.ops = &dcl_egl_ops;
-            vc->gfx.dgc.ops = &egl_ctx_ops;
-            vc->gfx.has_dmabuf = qemu_egl_has_dmabuf();
-#else
-            abort();
-#endif
-        }
+        assert(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;
+        vc->gfx.dgc.ops = &gl_area_ctx_ops;
     } else
 #endif
     {
-- 
2.45.2