On Sat, Jul 19, 2025 at 3:43 AM Vivek Kasireddy
<vivek.kasire...@intel.com> wrote:
>
> The temporary egl fb scanout_tex_fb is only needed to facilitate the
> blit to the display surface's texture (ssd->ds->texture). Therefore,
> destroy it after the blit is submitted. And, also make sure that it
> is empty initialized before it is actually used.
>
> Fixes: f851cd65 ("ui/spice: Blit the scanout texture if its memory layout is
> not linear")
> Reported-by: Peter Maydell <peter.mayd...@linaro.org>
> Cc: Marc-André Lureau <marcandre.lur...@redhat.com>
> Signed-off-by: Vivek Kasireddy <vivek.kasire...@intel.com>
Reviewed-by: Marc-André Lureau <marcandre.lur...@redhat.com>
> ---
> v2:
> - Make scanout_tex_fb local to spice_gl_blit_scanout_texture() since
> it is not used outside of it (Peter)
> ---
> ui/spice-display.c | 14 ++++++--------
> 1 file changed, 6 insertions(+), 8 deletions(-)
>
> diff --git a/ui/spice-display.c b/ui/spice-display.c
> index 9ce622cefc..669832c561 100644
> --- a/ui/spice-display.c
> +++ b/ui/spice-display.c
> @@ -1183,20 +1183,20 @@ static void
> qemu_spice_gl_release_dmabuf(DisplayChangeListener *dcl,
> egl_dmabuf_release_texture(dmabuf);
> }
>
> -static bool spice_gl_blit_scanout_texture(SimpleSpiceDisplay *ssd,
> - egl_fb *scanout_tex_fb)
> +static bool spice_gl_blit_scanout_texture(SimpleSpiceDisplay *ssd)
> {
> uint32_t offsets[DMABUF_MAX_PLANES], strides[DMABUF_MAX_PLANES];
> int fds[DMABUF_MAX_PLANES], num_planes, fourcc;
> + egl_fb scanout_tex_fb = {};
> uint64_t modifier;
> bool ret;
>
> - egl_fb_destroy(scanout_tex_fb);
> - egl_fb_setup_for_tex(scanout_tex_fb,
> + egl_fb_setup_for_tex(&scanout_tex_fb,
> surface_width(ssd->ds), surface_height(ssd->ds),
> ssd->ds->texture, false);
> - egl_fb_blit(scanout_tex_fb, &ssd->guest_fb, false);
> + egl_fb_blit(&scanout_tex_fb, &ssd->guest_fb, false);
> glFlush();
> + egl_fb_destroy(&scanout_tex_fb);
>
> if (!ssd->new_scanout_texture) {
> return true;
> @@ -1330,9 +1330,7 @@ static void qemu_spice_gl_update(DisplayChangeListener
> *dcl,
> }
>
> if (spice_remote_client && ssd->blit_scanout_texture) {
> - egl_fb scanout_tex_fb;
> -
> - ret = spice_gl_blit_scanout_texture(ssd, &scanout_tex_fb);
> + ret = spice_gl_blit_scanout_texture(ssd);
> if (!ret) {
> return;
> }
> --
> 2.49.0
>
>
--
Marc-André Lureau
