From nobody Tue Apr 23 09:38:48 2024 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 From nobody Tue Apr 23 09:38:48 2024 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 (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1523628417016323.3281870607299; Fri, 13 Apr 2018 07:06:57 -0700 (PDT) Received: from localhost ([::1]:55995 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f6zLr-0005T1-QC for importer@patchew.org; Fri, 13 Apr 2018 10:06:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46959) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f6zJu-0004Ah-Az for qemu-devel@nongnu.org; Fri, 13 Apr 2018 10:04:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f6zJt-000193-72 for qemu-devel@nongnu.org; Fri, 13 Apr 2018 10:04:54 -0400 Received: from mail-wr0-x243.google.com ([2a00:1450:400c:c0c::243]:46874) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f6zJt-00018P-1b for qemu-devel@nongnu.org; Fri, 13 Apr 2018 10:04:53 -0400 Received: by mail-wr0-x243.google.com with SMTP id d1so8420050wrj.13 for ; Fri, 13 Apr 2018 07:04:52 -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.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Apr 2018 07:04:51 -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=/9MPoFI9eNVZAspLGNHhoO1SN4cpYMarzezatbgZDlM=; b=fBtSM7oPtZwefeRYyIvoGlBnz6MyxkhULP+toRIFIAhOVOsb9LGnQLd3sqndOS6WlI s4KbLc9E2Q2cDE2twkBfdqvu9DFWAErsKx1nShraREmpkZ6q0HPww6612x23xWe9mKKG 4m3P9ce2UaZyS7hh0f3KGUiO1RFjMezscuPsMstV3JXwbVBh9GA1SBXVOHsUHushx+LV WhQhRANC+75q9EOi71B7hk1Y0fZ0e5ULFKtTBQXZh20L/jt1SRlvl0O0XmPYTLuOS5kM P/eWKzuB4Vp20Pa11e7prdyhxyAzH6ZnY1C4lOmMURebX6uq0HmxHXSuPNfjbQNoSctc QKVA== 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=/9MPoFI9eNVZAspLGNHhoO1SN4cpYMarzezatbgZDlM=; b=n/NxuoOGGwPKrSyxwu4k4jXvpxmihHYrl9jdSKVjEz6i06iO4PAdar6UGNLlXkglkO 3fPGlJAtl9AwIHffRpRp99jgV3Q6vsw9eENmeolenemVASqiphQ61PjwyJyk+MvqHZn7 vhW02rPieu2bMTbgB7lAebzJaxnVTzeXQhR4wyW+wmc/9Y43fZtyhxSgdt+zQwqjb4Sy Y3SmtWfhJ3PM+yGv6oTQ65IqNdHLSMkldPGNhwR7xWtjoJhsvUUiFX/h5EMgSVlOLaj4 I+YKeWHHC2pMOUEmPYWuSoKGrDLsEfL8ZStnV+dWaTWqRz4OPIUckTh73Dq0IWWqdf6j zEVg== X-Gm-Message-State: ALQs6tDahrlU9ddHPio8GpTBrVMQsMZjCazKYzxj6o+jJiIAflrDraMl HmTHttgrZc/lqUFOJbP3wvVxWg== X-Google-Smtp-Source: AIpwx4/RBsmrlsHcoHupUPcriXTTrXNzxVX6I+x67tuE8+4gG/2Krx02bCaNnBXHI5K49j3TsXOI7w== X-Received: by 10.28.249.8 with SMTP id x8mr3605044wmh.12.1523628291857; Fri, 13 Apr 2018 07:04:51 -0700 (PDT) From: Elie Tournier To: qemu-devel@nongnu.org Date: Fri, 13 Apr 2018 14:58:41 +0100 Message-Id: <20180413135842.21325-3-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::243 Subject: [Qemu-devel] [PATCH v3 2/3] sdl: Move DisplayOptions global to sdl2_console 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" Suggested-by: Gerd Hoffmann Signed-off-by: Elie Tournier --- include/ui/sdl2.h | 1 + ui/sdl2.c | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/include/ui/sdl2.h b/include/ui/sdl2.h index 51084e6320..f43eecdbd6 100644 --- a/include/ui/sdl2.h +++ b/include/ui/sdl2.h @@ -14,6 +14,7 @@ struct sdl2_console { DisplayChangeListener dcl; DisplaySurface *surface; + DisplayOptions *opts; SDL_Texture *texture; SDL_Window *real_window; SDL_Renderer *real_renderer; diff --git a/ui/sdl2.c b/ui/sdl2.c index 83b917fa37..da037248c2 100644 --- a/ui/sdl2.c +++ b/ui/sdl2.c @@ -32,7 +32,6 @@ =20 static int sdl2_num_outputs; static struct sdl2_console *sdl2_console; -static DisplayOptions *opts; =20 static SDL_Surface *guest_sprite_surface; static int gui_grab; /* if true, all keyboard/mouse events are grabbed */ @@ -566,7 +565,7 @@ static void handle_windowevent(SDL_Event *ev) break; case SDL_WINDOWEVENT_CLOSE: if (qemu_console_is_graphic(scon->dcl.con)) { - if (opts->has_window_close && !opts->window_close) { + if (scon->opts->has_window_close && !scon->opts->window_close)= { allow_close =3D false; } if (allow_close) { @@ -613,7 +612,7 @@ void sdl2_poll_events(struct sdl2_console *scon) handle_textinput(ev); break; case SDL_QUIT: - if (opts->has_window_close && !opts->window_close) { + if (scon->opts->has_window_close && !scon->opts->window_close)= { allow_close =3D false; } if (allow_close) { @@ -770,7 +769,6 @@ static void sdl2_display_init(DisplayState *ds, Display= Options *o) SDL_SysWMinfo info; =20 assert(o->type =3D=3D DISPLAY_TYPE_SDL); - opts =3D o; =20 #ifdef __linux__ /* on Linux, SDL may use fbcon|directfb|svgalib when run without @@ -806,6 +804,7 @@ static void sdl2_display_init(DisplayState *ds, Display= Options *o) return; } sdl2_console =3D g_new0(struct sdl2_console, sdl2_num_outputs); + sdl2_console->opts =3D o; for (i =3D 0; i < sdl2_num_outputs; i++) { QemuConsole *con =3D qemu_console_lookup_by_index(i); assert(con !=3D NULL); @@ -846,7 +845,8 @@ static void sdl2_display_init(DisplayState *ds, Display= Options *o) g_free(filename); } =20 - if (opts->has_full_screen && opts->full_screen) { + if (sdl2_console->opts->has_full_screen && + sdl2_console->opts->full_screen) { gui_fullscreen =3D 1; sdl_grab_start(0); } --=20 2.17.0 From nobody Tue Apr 23 09:38:48 2024 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 (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1523628608151254.0380632491623; Fri, 13 Apr 2018 07:10:08 -0700 (PDT) Received: from localhost ([::1]:56050 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f6zOx-0008BI-CI for importer@patchew.org; Fri, 13 Apr 2018 10:10:07 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46991) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f6zJx-0004Cu-He for qemu-devel@nongnu.org; Fri, 13 Apr 2018 10:04:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f6zJu-00019K-AB for qemu-devel@nongnu.org; Fri, 13 Apr 2018 10:04:57 -0400 Received: from mail-wr0-x242.google.com ([2a00:1450:400c:c0c::242]:44714) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f6zJu-00019D-3V for qemu-devel@nongnu.org; Fri, 13 Apr 2018 10:04:54 -0400 Received: by mail-wr0-x242.google.com with SMTP id u46so8435221wrc.11 for ; Fri, 13 Apr 2018 07:04:53 -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.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Apr 2018 07:04:52 -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=YC+X3S69FVKxpqR4XrJofZM+EoqzOm+q44DkurFJYLk=; b=OXKEFTkTWOsfW68dk8EhA6Jk+HBUo7DqofVVu0awGeYUtsvXTHa64bvqu1UKWktD6y NfQ7Fdw4Bz1P+14I2iH7BxNpn5HpufjayzRWX+I4dd/oD7J7g98vXwfLIZpZHzR83URp TFaR/SnZyAHvmxsPRT8xflMIW+nV6yW8+XKW3TUm1O/8fUxBe20T9qGT58vXK7G/fzao EFQ9Z6CvETKvLhCVutY6PBAuhlwsAZQ1ePese8oELUKdxTdDXqcZL/7ER/98vFIc5bmS d69K3nO8GFCf0xfylGV9brNiUZSykV64PuIOxuWGTlfGqnmp4NEWn95IfE93GL6c9LYz p9UA== 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=YC+X3S69FVKxpqR4XrJofZM+EoqzOm+q44DkurFJYLk=; b=nhpQYSyLEMIhlSj+iWEPK7NAz2Zc+5ZEFqwJetjP2+KWns/rB6BuDdmpirOJvGr6FS IXiRkniFWpXtP/F9WHw01FK2r2FkLR2mb6VYy8Wkz2P9wRmICg1ajs2iCLxH8hCoKkcx pYrTmcU3hwQs/jp6Ow6PNOpWwmMcGXYogjnlfVAL3PwYuxGoKxsd1Zel7jSFZeHrUqcT EySy0nZQXmQPzy+rFBGY00phhwCWFPHAd1WqylW8hNM08wf3o4ONzdkHU58OAbwK178x L4bTGSP0S6j1+G+PefqdSL1ayj6cERAzJRjGlZJlC5WLYHrjXgLXe7/FYssHLoVw8Occ YiNQ== X-Gm-Message-State: ALQs6tBNHX5e+wjDEyf7L2S+pBdg4wyDKM0Ca4ulTnZdc77tceM5zfGu 8uW5MPWHMeJdRwcu2kc4TINBog== X-Google-Smtp-Source: AIpwx4916Vm7AzzFoHalsVnn7mxdDLYhsTDwQwXL7IZcpVctxAAWwiyC9Yb2b2qHPHfttU4sGUjRSg== X-Received: by 10.223.195.40 with SMTP id n37mr1069918wrf.91.1523628292920; Fri, 13 Apr 2018 07:04:52 -0700 (PDT) From: Elie Tournier To: qemu-devel@nongnu.org Date: Fri, 13 Apr 2018 14:58:42 +0100 Message-Id: <20180413135842.21325-4-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 3/3] sdl: Allow OpenGL ES context creation 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" Signed-off-by: Elie Tournier --- qemu-options.hx | 2 +- ui/sdl2-gl.c | 19 +++++++++++++++++-- vl.c | 4 ++++ 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/qemu-options.hx b/qemu-options.hx index ca4e412f2f..333dd1f1c8 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1240,7 +1240,7 @@ ETEXI =20 DEF("display", HAS_ARG, QEMU_OPTION_display, "-display sdl[,frame=3Don|off][,alt_grab=3Don|off][,ctrl_grab=3Don|off= ]\n" - " [,window_close=3Don|off][,gl=3Don|off]\n" + " [,window_close=3Don|off][,gl=3Don|core|es|off]\n" "-display gtk[,grab_on_hover=3Don|off][,gl=3Don|off]|\n" "-display vnc=3D[,]\n" "-display curses\n" diff --git a/ui/sdl2-gl.c b/ui/sdl2-gl.c index c3683e6b65..a1200bfd20 100644 --- a/ui/sdl2-gl.c +++ b/ui/sdl2-gl.c @@ -140,12 +140,27 @@ QEMUGLContext sdl2_gl_create_context(DisplayChangeLis= tener *dcl, SDL_GL_MakeCurrent(scon->real_window, scon->winctx); =20 SDL_GL_SetAttribute(SDL_GL_SHARE_WITH_CURRENT_CONTEXT, 1); - SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, - SDL_GL_CONTEXT_PROFILE_CORE); + if (scon->opts->gl =3D=3D DISPLAYGL_MODE_ON || + scon->opts->gl =3D=3D DISPLAYGL_MODE_CORE) { + SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, + SDL_GL_CONTEXT_PROFILE_CORE); + } else if (scon->opts->gl =3D=3D DISPLAYGL_MODE_ES) { + SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, + SDL_GL_CONTEXT_PROFILE_ES); + } SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, params->major_ver); SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, params->minor_ver); =20 ctx =3D SDL_GL_CreateContext(scon->real_window); + + /* If SDL fail to create a GL context and we use the "on" flag, + * then try to fallback to GLES. + */ + if (!ctx && scon->opts->gl =3D=3D DISPLAYGL_MODE_ON) { + SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, + SDL_GL_CONTEXT_PROFILE_ES); + ctx =3D SDL_GL_CreateContext(scon->real_window); + } return (QEMUGLContext)ctx; } =20 diff --git a/vl.c b/vl.c index 99284fd518..3bd3b902a0 100644 --- a/vl.c +++ b/vl.c @@ -2143,6 +2143,10 @@ static void parse_display(const char *p) dpy.has_gl =3D true; if (strstart(opts, "on", &nextopt)) { dpy.gl =3D DISPLAYGL_MODE_ON; + } else if (strstart(opts, "core", &nextopt)) { + dpy.gl =3D DISPLAYGL_MODE_CORE; + } else if (strstart(opts, "es", &nextopt)) { + dpy.gl =3D DISPLAYGL_MODE_ES; } else if (strstart(opts, "off", &nextopt)) { dpy.gl =3D DISPLAYGL_MODE_OFF; } else { --=20 2.17.0