From nobody Tue Feb 10 23:00:43 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1523628899833958.1126353592279; Fri, 13 Apr 2018 07:14:59 -0700 (PDT) Received: from localhost ([::1]:56291 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f6zTX-0004GG-Rm for importer@patchew.org; Fri, 13 Apr 2018 10:14:51 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46938) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f6zJs-0004Ab-Ve for qemu-devel@nongnu.org; Fri, 13 Apr 2018 10:04:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f6zJs-00018J-2V for qemu-devel@nongnu.org; Fri, 13 Apr 2018 10:04:52 -0400 Received: from mail-wr0-x242.google.com ([2a00:1450:400c:c0c::242]:33689) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f6zJr-000185-SG for qemu-devel@nongnu.org; Fri, 13 Apr 2018 10:04:52 -0400 Received: by mail-wr0-x242.google.com with SMTP id z73so8441528wrb.0 for ; Fri, 13 Apr 2018 07:04:51 -0700 (PDT) Received: from Nikki.cbg.collabora.co.uk (bakora.collabora.co.uk. [46.17.161.148]) by smtp.googlemail.com with ESMTPSA id y51sm4785330wrc.38.2018.04.13.07.04.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Apr 2018 07:04:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=wtFsMhqCRgyx2TXx7P+DNayQo2Npva9Ul/Lh2p2SKpI=; b=sqHkO/VpdZoHIrvJIHaeDdIIRCb6btqMqZKy2TCaAsJ7yhCrAfO2PK7BlOoxPql5ce a2ejALmRPucgNiQO5VvBcNQN7oPm8a6TxMMgvxZRzDde9OuleYoHSOQpbNZI/pIcaN7u pwaDpi/WczG/T29hK96qndBHjOXMc6LlltpjpcFO73Ttb/YlMB23AN0jTSYBWYBk7uko CDAXgtfIExplhj4B8qyHio52DFhch05fJLtaUH2YyaZxk/m8gBVtJKa/ICwL7V0nItBB RPtNvL9L3kIUT4rIPcKwEd3LPp5tNF9GWyXPuAETHU4X3lJn1IxwjbUTcFeLVHIt9YEg MnAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=wtFsMhqCRgyx2TXx7P+DNayQo2Npva9Ul/Lh2p2SKpI=; b=pjbVvxQEVtMc+1clWWQS3SNnQal+BN5pq1dKRWR+re2yTBtRr9Pey1LNFvO82K7oem BEWBnNIpri0U2xJNidIc0JpD1xUyCwWypyMrP5hx7qMI8+AU3/3lapkV7DNAXddRHq2p ltIkCdEc6/gilE297V59SOpBJDNmoSVrtq7HKEqZfbaWO9INk5sE6AWK8d3hye1kVnCZ a6QZWIoBVPMNvR5UDQscp6nbnLEhfOx28DelsWSmfobdRVOO8tM+yQ2htH+/PMAynMtT IfINJIcEglFxAK3VsofahcpJLGZH6azE+KQsKnszIUNlxOtO+tZSgF2PTvhpMYppogAq E04w== X-Gm-Message-State: ALQs6tDA8oOZFTXL52RUSELAsFWR8yKNWh30FVL9l1mSbXsr03tsPCRA JRDO1y1zsxmMJ9Tm6cgXyE1Z0g== X-Google-Smtp-Source: AIpwx48jd7TI9Wn15YXAk6jXYTCSf1BG6D8n0hxpRz1xOvg7wjXU39I2CVds/Xyyh7bi64rHtvLTmA== X-Received: by 10.223.133.139 with SMTP id 11mr4069668wrt.28.1523628290751; Fri, 13 Apr 2018 07:04:50 -0700 (PDT) From: Elie Tournier To: qemu-devel@nongnu.org Date: Fri, 13 Apr 2018 14:58:40 +0100 Message-Id: <20180413135842.21325-2-tournier.elie@gmail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180413135842.21325-1-tournier.elie@gmail.com> References: <20180413135842.21325-1-tournier.elie@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::242 Subject: [Qemu-devel] [PATCH v3 1/3] qapi: Parameter gl of DisplayType now accept an enum X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Elie Tournier , kraxel@redhat.com, Elie Tournier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" v2: Rebase on top of master v3: Fix the json format (Eric Blake) Fix a comparison issue (Gerd Hoffmann) Signed-off-by: Elie Tournier --- qapi/ui.json | 20 +++++++++++++++++++- vl.c | 10 +++++----- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/qapi/ui.json b/qapi/ui.json index 5d01ad4304..3ad7835992 100644 --- a/qapi/ui.json +++ b/qapi/ui.json @@ -1019,6 +1019,24 @@ { 'struct' : 'DisplayGTK', 'data' : { '*grab-on-hover' : 'bool' } } =20 + ## + # @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 +1066,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..99284fd518 100644 --- a/vl.c +++ b/vl.c @@ -2142,9 +2142,9 @@ static void parse_display(const char *p) opts =3D nextopt; dpy.has_gl =3D true; if (strstart(opts, "on", &nextopt)) { - dpy.gl =3D true; + dpy.gl =3D DISPLAYGL_MODE_ON; } else if (strstart(opts, "off", &nextopt)) { - dpy.gl =3D false; + dpy.gl =3D DISPLAYGL_MODE_OFF; } else { goto invalid_sdl_args; } @@ -2185,9 +2185,9 @@ static void parse_display(const char *p) opts =3D nextopt; dpy.has_gl =3D true; if (strstart(opts, "on", &nextopt)) { - dpy.gl =3D true; + dpy.gl =3D DISPLAYGL_MODE_ON; } else if (strstart(opts, "off", &nextopt)) { - dpy.gl =3D false; + dpy.gl =3D 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(); =20 - if (dpy.has_gl && dpy.gl && display_opengl =3D=3D 0) { + if (dpy.has_gl && dpy.gl !=3D DISPLAYGL_MODE_OFF && display_opengl =3D= =3D 0) { #if defined(CONFIG_OPENGL) error_report("OpenGL is not supported by the display"); #else --=20 2.17.0