From: Marc-André Lureau <marcandre.lur...@redhat.com> Add a new scanout callback that doesn't require any gl context in qemu (importing a dmabuf fd would require qemu egl&gl contexts, and would be unnecessary when using spice anyway)
Signed-off-by: Marc-André Lureau <marcandre.lur...@redhat.com> --- include/ui/console.h | 10 ++++++++++ ui/console.c | 12 ++++++++++++ ui/spice-display.c | 19 +++++++++++++++++++ 3 files changed, 41 insertions(+) diff --git a/include/ui/console.h b/include/ui/console.h index 52a5f65..14fd5ad 100644 --- a/include/ui/console.h +++ b/include/ui/console.h @@ -218,6 +218,11 @@ typedef struct DisplayChangeListenerOps { void (*dpy_gl_scanout)(DisplayChangeListener *dcl, uint32_t backing_id, bool backing_y_0_top, uint32_t x, uint32_t y, uint32_t w, uint32_t h); + void (*dpy_gl_scanout2)(DisplayChangeListener *dcl, + int fd, bool backing_y_0_top, + uint32_t x, uint32_t y, uint32_t w, uint32_t h, + uint32_t fd_w, uint32_t fd_h, uint32_t fd_stride, + int fd_fourcc); void (*dpy_gl_update)(DisplayChangeListener *dcl, uint32_t x, uint32_t y, uint32_t w, uint32_t h); @@ -286,6 +291,11 @@ bool dpy_gfx_check_format(QemuConsole *con, void dpy_gl_scanout(QemuConsole *con, uint32_t backing_id, bool backing_y_0_top, uint32_t x, uint32_t y, uint32_t w, uint32_t h); +void dpy_gl_scanout2(QemuConsole *con, + int fd, bool backing_y_0_top, + uint32_t x, uint32_t y, uint32_t w, uint32_t h, + uint32_t fd_w, uint32_t fd_h, uint32_t fd_stride, + int fd_fourcc); void dpy_gl_update(QemuConsole *con, uint32_t x, uint32_t y, uint32_t w, uint32_t h); diff --git a/ui/console.c b/ui/console.c index bf38579..c36f742 100644 --- a/ui/console.c +++ b/ui/console.c @@ -1712,6 +1712,18 @@ void dpy_gl_scanout(QemuConsole *con, x, y, width, height); } +void dpy_gl_scanout2(QemuConsole *con, + int fd, bool backing_y_0_top, + uint32_t x, uint32_t y, uint32_t w, uint32_t h, + uint32_t fd_w, uint32_t fd_h, uint32_t fd_stride, + int fd_fourcc) +{ + assert(con->gl); + con->gl->ops->dpy_gl_scanout2(con->gl, fd, backing_y_0_top, + x, y, w, h, fd_w, fd_h, fd_stride, + fd_fourcc); +} + void dpy_gl_update(QemuConsole *con, uint32_t x, uint32_t y, uint32_t w, uint32_t h) { diff --git a/ui/spice-display.c b/ui/spice-display.c index 0553c5e..06d2e4e 100644 --- a/ui/spice-display.c +++ b/ui/spice-display.c @@ -888,6 +888,24 @@ static void qemu_spice_gl_scanout(DisplayChangeListener *dcl, qemu_spice_gl_monitor_config(ssd, x, y, w, h); } +static void +qemu_spice_gl_scanout2(DisplayChangeListener *dcl, + int fd, bool y_0_top, + uint32_t x, uint32_t y, uint32_t w, uint32_t h, + uint32_t fd_w, uint32_t fd_h, uint32_t fd_stride, + int fd_fourcc) +{ + SimpleSpiceDisplay *ssd = container_of(dcl, SimpleSpiceDisplay, dcl); + + /* note: spice server will close the fd */ + spice_qxl_gl_scanout(&ssd->qxl, fd, + fd_w, + fd_h, + fd_stride, fd_fourcc, y_0_top); + + qemu_spice_gl_monitor_config(ssd, x, y, w, h); +} + static void qemu_spice_gl_update(DisplayChangeListener *dcl, uint32_t x, uint32_t y, uint32_t w, uint32_t h) { @@ -915,6 +933,7 @@ static const DisplayChangeListenerOps display_listener_gl_ops = { .dpy_gl_ctx_get_current = qemu_egl_get_current_context, .dpy_gl_scanout = qemu_spice_gl_scanout, + .dpy_gl_scanout2 = qemu_spice_gl_scanout2, .dpy_gl_update = qemu_spice_gl_update, }; -- 2.7.4