falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

egl-headless: switch over to new display registry 

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-id: 20180301100547.18962-6-kraxel@redhat.com
This commit is contained in:
Gerd Hoffmann 2018-03-01 11:05:39 +01:00
parent b0766612d1
commit 16ab0a74e4
3 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/ui/console.h
View File

@ -456,7 +456,4 @@ int vnc_init_func(void *opaque, QemuOpts *opts, Error **errp);
/* input.c */ /* input.c */
int index_from_key(const char *key, size_t key_length); int index_from_key(const char *key, size_t key_length);
/* egl-headless.c */
void egl_headless_init(DisplayOptions *opts);
#endif #endif

20
ui/egl-headless.c
View File

@ -164,7 +164,12 @@ static const DisplayChangeListenerOps egl_ops = {
.dpy_gl_update = egl_scanout_flush, .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; QemuConsole *con;
egl_dpy *edpy; egl_dpy *edpy;
@ -188,3 +193,16 @@ void egl_headless_init(DisplayOptions *opts)
register_displaychangelistener(&edpy->dcl); 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);

12
vl.c
View File

@ -2160,13 +2160,7 @@ static void parse_display(const char *p)
exit(1); exit(1);
} }
} else if (strstart(p, "egl-headless", &opts)) { } else if (strstart(p, "egl-headless", &opts)) {
#ifdef CONFIG_OPENGL_DMABUF
display_opengl = 1;
dpy.type = DISPLAY_TYPE_EGL_HEADLESS; dpy.type = DISPLAY_TYPE_EGL_HEADLESS;
#else
error_report("egl support is disabled");
exit(1);
#endif
} else if (strstart(p, "curses", &opts)) { } else if (strstart(p, "curses", &opts)) {
dpy.type = DISPLAY_TYPE_CURSES; dpy.type = DISPLAY_TYPE_CURSES;
} else if (strstart(p, "gtk", &opts)) { } else if (strstart(p, "gtk", &opts)) {
@ -4672,12 +4666,6 @@ int main(int argc, char **argv, char **envp)
qemu_spice_display_init(); 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) { if (foreach_device_config(DEV_GDB, gdbserver_start) < 0) {
exit(1); exit(1);
} }