ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 <elie.tournier@collabora.com>
Message-id: 20180413135842.21325-2-tournier.elie@gmail.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Elie Tournier 2018-04-13 14:58:40 +01:00 committed by Gerd Hoffmann
parent 1bc3117aba
commit 62f27922b3
2 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
qapi/ui.json
View File

@ -1019,6 +1019,24 @@
{ 'struct' : 'DisplayGTK', { 'struct' : 'DisplayGTK',
'data' : { '*grab-on-hover' : 'bool' } } '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: # @DisplayType:
# #
@ -1048,7 +1066,7 @@
'base' : { 'type' : 'DisplayType', 'base' : { 'type' : 'DisplayType',
'*full-screen' : 'bool', '*full-screen' : 'bool',
'*window-close' : 'bool', '*window-close' : 'bool',
'*gl' : 'bool' }, '*gl' : 'DisplayGLMode' },
'discriminator' : 'type', 'discriminator' : 'type',
'data' : { 'default' : 'DisplayNoOpts', 'data' : { 'default' : 'DisplayNoOpts',
'none' : 'DisplayNoOpts', 'none' : 'DisplayNoOpts',

10
vl.c
View File

@ -2143,9 +2143,9 @@ static void parse_display(const char *p)
opts = nextopt; opts = nextopt;
dpy.has_gl = true; dpy.has_gl = true;
if (strstart(opts, "on", &nextopt)) { if (strstart(opts, "on", &nextopt)) {
dpy.gl = true; dpy.gl = DISPLAYGL_MODE_ON;
} else if (strstart(opts, "off", &nextopt)) { } else if (strstart(opts, "off", &nextopt)) {
dpy.gl = false; dpy.gl = DISPLAYGL_MODE_OFF;
} else { } else {
goto invalid_sdl_args; goto invalid_sdl_args;
} }
@ -2186,9 +2186,9 @@ static void parse_display(const char *p)
opts = nextopt; opts = nextopt;
dpy.has_gl = true; dpy.has_gl = true;
if (strstart(opts, "on", &nextopt)) { if (strstart(opts, "on", &nextopt)) {
dpy.gl = true; dpy.gl = DISPLAYGL_MODE_ON;
} else if (strstart(opts, "off", &nextopt)) { } else if (strstart(opts, "off", &nextopt)) {
dpy.gl = false; dpy.gl = DISPLAYGL_MODE_OFF;
} else { } else {
goto invalid_gtk_args; goto invalid_gtk_args;
} }
@ -4356,7 +4356,7 @@ int main(int argc, char **argv, char **envp)
qemu_display_early_init(&dpy); qemu_display_early_init(&dpy);
qemu_console_early_init(); 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) #if defined(CONFIG_OPENGL)
error_report("OpenGL is not supported by the display"); error_report("OpenGL is not supported by the display");
#else #else