diff options
| author | Elie Tournier <tournier.elie@gmail.com> | 2018-04-13 14:58:40 +0100 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2018-04-27 09:51:40 +0200 |
| commit | 62f27922b3f1e0253a6755d2c711cd0bc1e79f18 (patch) | |
| tree | f91fd6d9f90b8e722e1151f633b3d62b4fbc8a8f /vl.c | |
| parent | 1bc3117abad28d6465ecdb2c944b22943df0e4f3 (diff) | |
| download | qemu-62f27922b3f1e0253a6755d2c711cd0bc1e79f18.zip qemu-62f27922b3f1e0253a6755d2c711cd0bc1e79f18.tar.gz qemu-62f27922b3f1e0253a6755d2c711cd0bc1e79f18.tar.bz2 | |
qapi: Parameter gl of DisplayType now accept an enum
v2: Rebase on top of master
v3: Fix the json format (Eric Blake)
Fix a comparison issue (Gerd Hoffmann)
Signed-off-by: Elie Tournier <elie.tournier@collabora.com>
Message-id: 20180413135842.21325-2-tournier.elie@gmail.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'vl.c')
| -rw-r--r-- | vl.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -2143,9 +2143,9 @@ static void parse_display(const char *p) opts = nextopt; dpy.has_gl = true; if (strstart(opts, "on", &nextopt)) { - dpy.gl = true; + dpy.gl = DISPLAYGL_MODE_ON; } else if (strstart(opts, "off", &nextopt)) { - dpy.gl = false; + dpy.gl = DISPLAYGL_MODE_OFF; } else { goto invalid_sdl_args; } @@ -2186,9 +2186,9 @@ static void parse_display(const char *p) opts = nextopt; dpy.has_gl = true; if (strstart(opts, "on", &nextopt)) { - dpy.gl = true; + dpy.gl = DISPLAYGL_MODE_ON; } else if (strstart(opts, "off", &nextopt)) { - dpy.gl = false; + dpy.gl = DISPLAYGL_MODE_OFF; } else { goto invalid_gtk_args; } @@ -4356,7 +4356,7 @@ int main(int argc, char **argv, char **envp) qemu_display_early_init(&dpy); qemu_console_early_init(); - if (dpy.has_gl && dpy.gl && display_opengl == 0) { + if (dpy.has_gl && dpy.gl != DISPLAYGL_MODE_OFF && display_opengl == 0) { #if defined(CONFIG_OPENGL) error_report("OpenGL is not supported by the display"); #else |