From 62f27922b3f1e0253a6755d2c711cd0bc1e79f18 Mon Sep 17 00:00:00 2001 From: Elie Tournier Date: Fri, 13 Apr 2018 14:58:40 +0100 Subject: 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 Message-id: 20180413135842.21325-2-tournier.elie@gmail.com Signed-off-by: Gerd Hoffmann --- vl.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'vl.c') diff --git a/vl.c b/vl.c index 616956a..f7804f7 100644 --- a/vl.c +++ b/vl.c @@ -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 -- cgit v1.1