From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53034) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f5s4l-0001qZ-0h for qemu-devel@nongnu.org; Tue, 10 Apr 2018 08:08:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f5s4f-0004ZK-SV for qemu-devel@nongnu.org; Tue, 10 Apr 2018 08:08:38 -0400 Received: from mail-wr0-x244.google.com ([2a00:1450:400c:c0c::244]:34230) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f5s4f-0004Yt-M3 for qemu-devel@nongnu.org; Tue, 10 Apr 2018 08:08:33 -0400 Received: by mail-wr0-x244.google.com with SMTP id d19so8644014wre.1 for ; Tue, 10 Apr 2018 05:08:33 -0700 (PDT) From: Elie Tournier Date: Tue, 10 Apr 2018 13:02:21 +0100 Message-Id: <20180410120222.31845-2-tournier.elie@gmail.com> In-Reply-To: <20180410120222.31845-1-tournier.elie@gmail.com> References: <20180410120222.31845-1-tournier.elie@gmail.com> Subject: [Qemu-devel] [PATCH v2 1/2] qapi: Parameter gl of DisplayType now accept an enum List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, kraxel@redhat.com, Elie Tournier , Elie Tournier Signed-off-by: Elie Tournier --- qapi/ui.json | 21 ++++++++++++++++++++- vl.c | 10 +++++----- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/qapi/ui.json b/qapi/ui.json index 5d01ad4304..c8005867e5 100644 --- a/qapi/ui.json +++ b/qapi/ui.json @@ -1019,6 +1019,25 @@ { 'struct' : 'DisplayGTK', 'data' : { '*grab-on-hover' : 'bool' } } + ## + # @DisplayGLMode: + # + # Display OpenGL mode. + # + # 'off' Disable OpenGL (default). + # 'on' Use OpenGL, pick context type automatically. + # Would better be named 'auto' but is called 'on' for backward + # compatibility with bool type. + # 'core' Use OpenGL with Core (desktop) Context. + # 'es' Use OpenGL with ES (embedded systems) Context. + # + # Since: 2.13 + # + ## + { 'enum' : 'DisplayGLMode', + 'data' : [ 'off', 'on', 'core', 'es' ] } + + ## # @DisplayType: # @@ -1048,7 +1067,7 @@ 'base' : { 'type' : 'DisplayType', '*full-screen' : 'bool', '*window-close' : 'bool', - '*gl' : 'bool' }, + '*gl' : 'DisplayGLMode' }, 'discriminator' : 'type', 'data' : { 'default' : 'DisplayNoOpts', 'none' : 'DisplayNoOpts', diff --git a/vl.c b/vl.c index fce1fd12d8..7809a15caf 100644 --- a/vl.c +++ b/vl.c @@ -2142,9 +2142,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; } @@ -2185,9 +2185,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; } @@ -4343,7 +4343,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 -- 2.17.0