diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2021-01-25 15:10:36 +0400 |
|---|---|---|
| committer | Marc-André Lureau <marcandre.lureau@redhat.com> | 2021-12-21 10:50:21 +0400 |
| commit | ac32b2fff127843355b4f7e7ac9f93dd4a395adf (patch) | |
| tree | 796c3741bb0b7b985c7882a896340088d38f966c | |
| parent | 4f4181499170dcf80182745b319607802ea32896 (diff) | |
| download | focaccia-qemu-ac32b2fff127843355b4f7e7ac9f93dd4a395adf.tar.gz focaccia-qemu-ac32b2fff127843355b4f7e7ac9f93dd4a395adf.zip | |
ui: associate GL context outside of display listener registration
Consoles can have an associated GL context, without listeners (they may be added or removed later on). Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Acked-by: Gerd Hoffmann <kraxel@redhat.com>
| -rw-r--r-- | ui/console.c | 7 | ||||
| -rw-r--r-- | ui/egl-headless.c | 1 | ||||
| -rw-r--r-- | ui/gtk.c | 3 | ||||
| -rw-r--r-- | ui/sdl2.c | 3 | ||||
| -rw-r--r-- | ui/spice-display.c | 3 |
5 files changed, 15 insertions, 2 deletions
diff --git a/ui/console.c b/ui/console.c index 7b83e6cdea..87f897e46d 100644 --- a/ui/console.c +++ b/ui/console.c @@ -1465,8 +1465,11 @@ void register_displaychangelistener(DisplayChangeListener *dcl) assert(!dcl->ds); - if (dcl->ops->dpy_gl_ctx_create) { - qemu_console_set_display_gl_ctx(dcl->con, dcl); + if (dcl->con && dcl->con->gl && + dcl->con->gl != dcl) { + error_report("Display %s is incompatible with the GL context", + dcl->ops->dpy_name); + exit(1); } if (dcl->con) { diff --git a/ui/egl-headless.c b/ui/egl-headless.c index a26a2520c4..08327c40c6 100644 --- a/ui/egl-headless.c +++ b/ui/egl-headless.c @@ -197,6 +197,7 @@ static void egl_headless_init(DisplayState *ds, DisplayOptions *opts) edpy->dcl.con = con; edpy->dcl.ops = &egl_ops; edpy->gls = qemu_gl_init_shader(); + qemu_console_set_display_gl_ctx(con, &edpy->dcl); register_displaychangelistener(&edpy->dcl); } } diff --git a/ui/gtk.c b/ui/gtk.c index c0d8a9f061..25896023ff 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -2083,6 +2083,9 @@ static GSList *gd_vc_gfx_init(GtkDisplayState *s, VirtualConsole *vc, vc->gfx.kbd = qkbd_state_init(con); vc->gfx.dcl.con = con; + if (display_opengl) { + qemu_console_set_display_gl_ctx(con, &vc->gfx.dcl); + } register_displaychangelistener(&vc->gfx.dcl); gd_connect_vc_gfx_signals(vc); diff --git a/ui/sdl2.c b/ui/sdl2.c index 9ba3bc49e7..bb186a381a 100644 --- a/ui/sdl2.c +++ b/ui/sdl2.c @@ -866,6 +866,9 @@ static void sdl2_display_init(DisplayState *ds, DisplayOptions *o) #endif sdl2_console[i].dcl.con = con; sdl2_console[i].kbd = qkbd_state_init(con); + if (display_opengl) { + qemu_console_set_display_gl_ctx(con, &sdl2_console[i].dcl); + } register_displaychangelistener(&sdl2_console[i].dcl); #if defined(SDL_VIDEO_DRIVER_WINDOWS) || defined(SDL_VIDEO_DRIVER_X11) diff --git a/ui/spice-display.c b/ui/spice-display.c index 52d9f3260a..2c204bceee 100644 --- a/ui/spice-display.c +++ b/ui/spice-display.c @@ -1156,6 +1156,9 @@ static void qemu_spice_display_init_one(QemuConsole *con) qemu_spice_create_host_memslot(ssd); + if (spice_opengl) { + qemu_console_set_display_gl_ctx(con, &ssd->dcl); + } register_displaychangelistener(&ssd->dcl); } |