[Spice-devel] [Qemu-devel] [PATCH Qemu] Change spice-server protocol for GL texture passing

[Frediano Ziglio]

Forgot to add RFC to the subject

Frediano

> 
> ---
>  ui/spice-core.c    |  5 -----
>  ui/spice-display.c | 29 ++++++++---------------------
>  2 files changed, 8 insertions(+), 26 deletions(-)
> 
> diff --git a/ui/spice-core.c b/ui/spice-core.c
> index da05054..f7647f7 100644
> --- a/ui/spice-core.c
> +++ b/ui/spice-core.c
> @@ -828,11 +828,6 @@ void qemu_spice_init(void)
>  
>  #ifdef HAVE_SPICE_GL
>      if (qemu_opt_get_bool(opts, "gl", 0)) {
> -        if ((port != 0) || (tls_port != 0)) {
> -            error_report("SPICE GL support is local-only for now and "
> -                         "incompatible with -spice port/tls-port");
> -            exit(1);
> -        }
>          if (egl_rendernode_init() != 0) {
>              error_report("Failed to initialize EGL render node for SPICE
>              GL");
>              exit(1);
> diff --git a/ui/spice-display.c b/ui/spice-display.c
> index 2a77a54..72137bd 100644
> --- a/ui/spice-display.c
> +++ b/ui/spice-display.c
> @@ -852,6 +852,10 @@ static void qemu_spice_gl_block_timer(void *opaque)
>  static QEMUGLContext qemu_spice_gl_create_context(DisplayChangeListener
>  *dcl,
>                                                    QEMUGLParams *params)
>  {
> +    SimpleSpiceDisplay *ssd = container_of(dcl, SimpleSpiceDisplay, dcl);
> +
> +    spice_qxl_gl_init(&ssd->qxl, qemu_egl_display, qemu_egl_rn_ctx);
> +
>      eglMakeCurrent(qemu_egl_display, EGL_NO_SURFACE, EGL_NO_SURFACE,
>                     qemu_egl_rn_ctx);
>      return qemu_egl_create_context(dcl, params);
> @@ -864,28 +868,11 @@ static void qemu_spice_gl_scanout(DisplayChangeListener
> *dcl,
>                                    uint32_t w, uint32_t h)
>  {
>      SimpleSpiceDisplay *ssd = container_of(dcl, SimpleSpiceDisplay, dcl);
> -    EGLint stride = 0, fourcc = 0;
> -    int fd = -1;
> -
> -    if (tex_id) {
> -        fd = egl_get_fd_for_texture(tex_id, &stride, &fourcc);
> -        if (fd < 0) {
> -            fprintf(stderr, "%s: failed to get fd for texture\n", __func__);
> -            return;
> -        }
> -        dprint(1, "%s: %dx%d (stride %d, fourcc 0x%x)\n", __func__,
> -               w, h, stride, fourcc);
> -    } else {
> -        dprint(1, "%s: no texture (no framebuffer)\n", __func__);
> -    }
> -
> -    assert(!tex_id || fd >= 0);
>  
> -    /* note: spice server will close the fd */
> -    spice_qxl_gl_scanout(&ssd->qxl, fd,
> -                         surface_width(ssd->ds),
> -                         surface_height(ssd->ds),
> -                         stride, fourcc, y_0_top);
> +    spice_qxl_gl_scanout_texture(&ssd->qxl, tex_id,
> +                                 surface_width(ssd->ds),
> +                                 surface_height(ssd->ds),
> +                                 y_0_top);
>  
>      qemu_spice_gl_monitor_config(ssd, x, y, w, h);
>  }