From 002b2902f39fd9c2b01881e1ca07db80266dc5bf Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Mon, 7 May 2018 11:55:38 +0200 Subject: ui: switch gtk display to qapi parser Drop the gtk option parser from parse_display(), so parse_display_qapi() will handle it instead. With this change the parser will accept gl=core and gl=es too, gtk must catch the unsupported gles variant now. Signed-off-by: Gerd Hoffmann Message-id: 20180507095539.19584-4-kraxel@redhat.com --- ui/gtk.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'ui') diff --git a/ui/gtk.c b/ui/gtk.c index 568c9563ce..ef6ca7179e 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -2478,7 +2478,11 @@ static void early_gtk_display_init(DisplayOptions *opts) } assert(opts->type == DISPLAY_TYPE_GTK); - if (opts->has_gl && opts->gl) { + if (opts->has_gl && opts->gl != DISPLAYGL_MODE_OFF) { + if (opts->gl == DISPLAYGL_MODE_ES) { + error_report("gtk: opengl es not supported"); + return; + } #if defined(CONFIG_OPENGL) #if defined(CONFIG_GTK_GL) && defined(GDK_WINDOWING_WAYLAND) if (GDK_IS_WAYLAND_DISPLAY(gdk_display_get_default())) { -- cgit v1.2.3-55-g7522