[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 18/24] egl-headless: hook up to display registry
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 18/24] egl-headless: hook up to display registry |
Date: |
Fri, 17 Nov 2017 11:30:40 +0100 |
Signed-off-by: Gerd Hoffmann <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 c93a331d35..6c89599355 100644
--- a/include/ui/console.h
+++ b/include/ui/console.h
@@ -478,7 +478,4 @@ static inline 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 38b3766548..655ef4eecb 100644
--- a/ui/egl-headless.c
+++ b/ui/egl-headless.c
@@ -154,7 +154,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;
@@ -178,3 +183,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 07f049044b..df0c10398d 100644
--- a/vl.c
+++ b/vl.c
@@ -2189,13 +2189,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
- fprintf(stderr, "egl support is disabled\n");
- exit(1);
-#endif
} else if (strstart(p, "curses", &opts)) {
dpy.type = DISPLAY_TYPE_CURSES;
} else if (strstart(p, "gtk", &opts)) {
@@ -4778,12 +4772,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
- Re: [Qemu-devel] [PATCH 02/24] sdl: remove -alt-grab and -ctrl-grab support, (continued)
[Qemu-devel] [PATCH 17/24] curses: hook up to display registry, Gerd Hoffmann, 2017/11/17
[Qemu-devel] [PATCH 18/24] egl-headless: hook up to display registry,
Gerd Hoffmann <=
[Qemu-devel] [PATCH 01/24] sdl: remove -no-frame support, Gerd Hoffmann, 2017/11/17
[Qemu-devel] [PATCH 23/24] curses: build as module, Gerd Hoffmann, 2017/11/17
[Qemu-devel] [PATCH 16/24] cocoa: hook up to display registry, Gerd Hoffmann, 2017/11/17
[Qemu-devel] [PATCH 24/24] build: opengl should not need X11, Gerd Hoffmann, 2017/11/17
[Qemu-devel] [PATCH 14/24] console: add qemu display registry, add gtk, Gerd Hoffmann, 2017/11/17
[Qemu-devel] [PATCH 20/24] console: add ui module loading support, Gerd Hoffmann, 2017/11/17