[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 1/2] qapi: Parameter gl of DisplayType now accept
From: |
Elie Tournier |
Subject: |
[Qemu-devel] [PATCH v2 1/2] qapi: Parameter gl of DisplayType now accept an enum |
Date: |
Tue, 10 Apr 2018 13:02:21 +0100 |
Signed-off-by: Elie Tournier <address@hidden>
---
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
- [Qemu-devel] [PATCH v2 0/2] Use SDL to create an OpenGL ES context for virglrenderer., Elie Tournier, 2018/04/10
- [Qemu-devel] [PATCH v2 2/2] sdl: Allow OpenGL ES context creation, Elie Tournier, 2018/04/10
- [Qemu-devel] [PATCH v2 1/2] qapi: Parameter gl of DisplayType now accept an enum,
Elie Tournier <=
- Re: [Qemu-devel] [PATCH v2 1/2] qapi: Parameter gl of DisplayType now accept an enum, Gerd Hoffmann, 2018/04/10
- Re: [Qemu-devel] [PATCH v2 1/2 for-2.12?] qapi: Parameter gl of DisplayType now accept an enum, Eric Blake, 2018/04/10
- Re: [Qemu-devel] [PATCH v2 1/2 for-2.12?] qapi: Parameter gl of DisplayType now accept an enum, Gerd Hoffmann, 2018/04/10
- Re: [Qemu-devel] [PATCH v2 1/2 for-2.12?] qapi: Parameter gl of DisplayType now accept an enum, Elie Tournier, 2018/04/12
- Re: [Qemu-devel] [PATCH v2 1/2 for-2.12?] qapi: Parameter gl of DisplayType now accept an enum, Eric Blake, 2018/04/12
- Re: [Qemu-devel] [PATCH v2 1/2 for-2.12?] qapi: Parameter gl of DisplayType now accept an enum, Gerd Hoffmann, 2018/04/13
- Re: [Qemu-devel] [PATCH v2 1/2 for-2.12?] qapi: Parameter gl of DisplayType now accept an enum, Elie Tournier, 2018/04/13
- Re: [Qemu-devel] [PATCH v2 1/2 for-2.12?] qapi: Parameter gl of DisplayType now accept an enum, Gerd Hoffmann, 2018/04/13
- Re: [Qemu-devel] [PATCH v2 1/2 for-2.12?] qapi: Parameter gl of DisplayType now accept an enum, Elie Tournier, 2018/04/10
Re: [Qemu-devel] [PATCH v2 0/2] Use SDL to create an OpenGL ES context for virglrenderer., no-reply, 2018/04/10