diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2018-05-07 11:55:38 +0200 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2018-05-15 10:37:40 +0200 |
| commit | 002b2902f39fd9c2b01881e1ca07db80266dc5bf (patch) | |
| tree | eedac0ccfba83cf8d477baf1d4ca67f721d95b61 /ui/gtk.c | |
| parent | 2c9498c3e44cd5574df3baaebfb9d5a095252205 (diff) | |
| download | focaccia-qemu-002b2902f39fd9c2b01881e1ca07db80266dc5bf.tar.gz focaccia-qemu-002b2902f39fd9c2b01881e1ca07db80266dc5bf.zip | |
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 <kraxel@redhat.com> Message-id: 20180507095539.19584-4-kraxel@redhat.com
Diffstat (limited to 'ui/gtk.c')
| -rw-r--r-- | ui/gtk.c | 6 |
1 files changed, 5 insertions, 1 deletions
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())) { |