[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 05/13] egl-headless: switch over to new display regis
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 05/13] egl-headless: switch over to new display registry |
Date: |
Mon, 5 Mar 2018 09:48:36 +0100 |
Signed-off-by: Gerd Hoffmann <address@hidden>
Message-id: address@hidden
---
include/ui/console.h | 3 ---
ui/egl-headless.c | 20 +++++++++++++++++++-
vl.c | 12 ------------
3 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/include/ui/console.h b/include/ui/console.h
index 3ea6cf0870..94726cf190 100644
--- a/include/ui/console.h
+++ b/include/ui/console.h
@@ -456,7 +456,4 @@ int vnc_init_func(void *opaque, QemuOpts *opts, Error
**errp);
/* input.c */
int index_from_key(const char *key, size_t key_length);
-/* egl-headless.c */
-void egl_headless_init(DisplayOptions *opts);
-
#endif
diff --git a/ui/egl-headless.c b/ui/egl-headless.c
index b33e0b21fd..7c877122d3 100644
--- a/ui/egl-headless.c
+++ b/ui/egl-headless.c
@@ -164,7 +164,12 @@ static const DisplayChangeListenerOps egl_ops = {
.dpy_gl_update = egl_scanout_flush,
};
-void egl_headless_init(DisplayOptions *opts)
+static void early_egl_headless_init(DisplayOptions *opts)
+{
+ display_opengl = 1;
+}
+
+static void egl_headless_init(DisplayState *ds, DisplayOptions *opts)
{
QemuConsole *con;
egl_dpy *edpy;
@@ -188,3 +193,16 @@ void egl_headless_init(DisplayOptions *opts)
register_displaychangelistener(&edpy->dcl);
}
}
+
+static QemuDisplay qemu_display_egl = {
+ .type = DISPLAY_TYPE_EGL_HEADLESS,
+ .early_init = early_egl_headless_init,
+ .init = egl_headless_init,
+};
+
+static void register_egl(void)
+{
+ qemu_display_register(&qemu_display_egl);
+}
+
+type_init(register_egl);
diff --git a/vl.c b/vl.c
index 5b2fca8bd3..93fc841e7c 100644
--- a/vl.c
+++ b/vl.c
@@ -2160,13 +2160,7 @@ static void parse_display(const char *p)
exit(1);
}
} else if (strstart(p, "egl-headless", &opts)) {
-#ifdef CONFIG_OPENGL_DMABUF
- display_opengl = 1;
dpy.type = DISPLAY_TYPE_EGL_HEADLESS;
-#else
- error_report("egl support is disabled");
- exit(1);
-#endif
} else if (strstart(p, "curses", &opts)) {
dpy.type = DISPLAY_TYPE_CURSES;
} else if (strstart(p, "gtk", &opts)) {
@@ -4672,12 +4666,6 @@ int main(int argc, char **argv, char **envp)
qemu_spice_display_init();
}
-#ifdef CONFIG_OPENGL_DMABUF
- if (dpy.type == DISPLAY_TYPE_EGL_HEADLESS) {
- egl_headless_init(&dpy);
- }
-#endif
-
if (foreach_device_config(DEV_GDB, gdbserver_start) < 0) {
exit(1);
}
--
2.9.3
- [Qemu-devel] [PULL 00/13] Ui 20180305 patches, Gerd Hoffmann, 2018/03/05
- [Qemu-devel] [PULL 12/13] audio: rename CONFIG_* to CONFIG_AUDIO_*, Gerd Hoffmann, 2018/03/05
- [Qemu-devel] [PULL 02/13] sdl: switch over to new display registry, Gerd Hoffmann, 2018/03/05
- [Qemu-devel] [PULL 05/13] egl-headless: switch over to new display registry,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 04/13] curses: switch over to new display registry, Gerd Hoffmann, 2018/03/05
- [Qemu-devel] [PULL 07/13] console: add ui module loading support, Gerd Hoffmann, 2018/03/05
- [Qemu-devel] [PULL 03/13] cocoa: switch over to new display registry, Gerd Hoffmann, 2018/03/05
- [Qemu-devel] [PULL 13/13] ui/sdl: build as module, Gerd Hoffmann, 2018/03/05
- [Qemu-devel] [PULL 06/13] console: add and use qemu_display_find_default, Gerd Hoffmann, 2018/03/05
- [Qemu-devel] [PULL 10/13] ui/gtk: build as module, Gerd Hoffmann, 2018/03/05
- [Qemu-devel] [PULL 08/13] configure: add X11 vars to config-host.mak, Gerd Hoffmann, 2018/03/05
- [Qemu-devel] [PULL 01/13] console: add qemu display registry, add gtk, Gerd Hoffmann, 2018/03/05
- [Qemu-devel] [PULL 09/13] configure: opengl doesn't depend on x11, Gerd Hoffmann, 2018/03/05
- [Qemu-devel] [PULL 11/13] ui/curses: build as module, Gerd Hoffmann, 2018/03/05