ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ui: factor out qemu_console_set_display_gl_ctx() 

The next patch will make use of this function to dissociate
DisplayChangeListener from GL context.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
This commit is contained in:
Marc-André Lureau 2021-01-25 14:53:18 +04:00
parent ca19ef5299
commit 4f41814991
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/ui/console.h
View File

@ -411,6 +411,9 @@ void graphic_hw_gl_flushed(QemuConsole *con);
void qemu_console_early_init(void); void qemu_console_early_init(void);
void qemu_console_set_display_gl_ctx(QemuConsole *con,
DisplayChangeListener *dcl);
QemuConsole *qemu_console_lookup_by_index(unsigned int index); QemuConsole *qemu_console_lookup_by_index(unsigned int index);
QemuConsole *qemu_console_lookup_by_device(DeviceState *dev, uint32_t head); QemuConsole *qemu_console_lookup_by_device(DeviceState *dev, uint32_t head);
QemuConsole *qemu_console_lookup_by_device_name(const char *device_id, QemuConsole *qemu_console_lookup_by_device_name(const char *device_id,

22
ui/console.c
View File

@ -1443,6 +1443,19 @@ static bool dpy_compatible_with(QemuConsole *con,
return true; return true;
} }
void qemu_console_set_display_gl_ctx(QemuConsole *con,
DisplayChangeListener *dcl)
{
/* display has opengl support */
assert(dcl->con);
if (dcl->con->gl) {
fprintf(stderr, "can't register two opengl displays (%s, %s)\n",
dcl->ops->dpy_name, dcl->con->gl->ops->dpy_name);
exit(1);
}
dcl->con->gl = dcl;
}
void register_displaychangelistener(DisplayChangeListener *dcl) void register_displaychangelistener(DisplayChangeListener *dcl)
{ {
static const char nodev[] = static const char nodev[] =
@ -1453,14 +1466,7 @@ void register_displaychangelistener(DisplayChangeListener *dcl)
assert(!dcl->ds); assert(!dcl->ds);
if (dcl->ops->dpy_gl_ctx_create) { if (dcl->ops->dpy_gl_ctx_create) {
/* display has opengl support */ qemu_console_set_display_gl_ctx(dcl->con, dcl);
assert(dcl->con);
if (dcl->con->gl) {
fprintf(stderr, "can't register two opengl displays (%s, %s)\n",
dcl->ops->dpy_name, dcl->con->gl->ops->dpy_name);
exit(1);
}
dcl->con->gl = dcl;
} }
if (dcl->con) { if (dcl->con) {