diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2018-02-02 12:10:17 +0100 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2018-02-20 12:12:04 +0100 |
| commit | 0d2dd9f0096327831121e2e4b75249b551f8d8ef (patch) | |
| tree | 0220fd08c66070b4ca1f8ee316c0d55d68f2a82c | |
| parent | 78782712a62d56b4bfdd2a3a641eb40e255b5371 (diff) | |
egl-headless: use DisplayOptions
Switch egl-headless ui to use qapi DisplayOptions for configuration.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-id: 20180202111022.19269-8-kraxel@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
| -rw-r--r-- | include/ui/console.h | 2 | ||||
| -rw-r--r-- | qapi/ui.json | 5 | ||||
| -rw-r--r-- | ui/egl-headless.c | 2 | ||||
| -rw-r--r-- | vl.c | 3 |
4 files changed, 7 insertions, 5 deletions
diff --git a/include/ui/console.h b/include/ui/console.h index 4e4d027936..183d9f2913 100644 --- a/include/ui/console.h +++ b/include/ui/console.h @@ -505,6 +505,6 @@ static inline void early_gtk_display_init(DisplayOptions *opts) #endif /* egl-headless.c */ -void egl_headless_init(void); +void egl_headless_init(DisplayOptions *opts); #endif diff --git a/qapi/ui.json b/qapi/ui.json index 2efe9675b7..43de75fa27 100644 --- a/qapi/ui.json +++ b/qapi/ui.json @@ -1020,7 +1020,7 @@ # ## { 'enum' : 'DisplayType', - 'data' : [ 'none', 'gtk', 'sdl' ] } + 'data' : [ 'none', 'gtk', 'sdl', 'egl-headless' ] } ## # @DisplayOptions: @@ -1043,4 +1043,5 @@ 'discriminator' : 'type', 'data' : { 'none' : 'DisplayNoOpts', 'gtk' : 'DisplayGTK', - 'sdl' : 'DisplayNoOpts' } } + 'sdl' : 'DisplayNoOpts', + 'egl-headless' : 'DisplayNoOpts' } } diff --git a/ui/egl-headless.c b/ui/egl-headless.c index 5d50226869..38b3766548 100644 --- a/ui/egl-headless.c +++ b/ui/egl-headless.c @@ -154,7 +154,7 @@ static const DisplayChangeListenerOps egl_ops = { .dpy_gl_update = egl_scanout_flush, }; -void egl_headless_init(void) +void egl_headless_init(DisplayOptions *opts) { QemuConsole *con; egl_dpy *edpy; @@ -2178,6 +2178,7 @@ static LegacyDisplayType select_display(const char *p) request_opengl = 1; display_opengl = 1; display = DT_EGL; + dpy.type = DISPLAY_TYPE_EGL_HEADLESS; #else error_report("egl support is disabled"); exit(1); @@ -4726,7 +4727,7 @@ int main(int argc, char **argv, char **envp) #ifdef CONFIG_OPENGL_DMABUF if (display_type == DT_EGL) { - egl_headless_init(); + egl_headless_init(&dpy); } #endif |