summaryrefslogtreecommitdiff
path: root/qapi
diff options
context:
space:
mode:
authorElie Tournier <tournier.elie@gmail.com>2018-04-13 14:58:40 +0100
committerGerd Hoffmann <kraxel@redhat.com>2018-04-27 09:51:40 +0200
commit62f27922b3f1e0253a6755d2c711cd0bc1e79f18 (patch)
treef91fd6d9f90b8e722e1151f633b3d62b4fbc8a8f /qapi
parent1bc3117abad28d6465ecdb2c944b22943df0e4f3 (diff)
downloadqemu-62f27922b3f1e0253a6755d2c711cd0bc1e79f18.tar.gz
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>
Diffstat (limited to 'qapi')
-rw-r--r--qapi/ui.json20
1 files changed, 19 insertions, 1 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' } }
+ ##
+ # @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',