From b09169282b3976075d434ae1cfd12de76ccbdcfd Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Tue, 20 Feb 2018 12:04:32 +0100 Subject: egl-headless: cursor_dmabuf: handle NULL cursor The cursor dmabuf can be NULL, in case no cursor defined by the guest. Happens for example when linux guests show the framebuffer console. Signed-off-by: Gerd Hoffmann Message-id: 20180220110433.20353-3-kraxel@redhat.com --- ui/egl-headless.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'ui') diff --git a/ui/egl-headless.c b/ui/egl-headless.c index 00ff2c036a..b33e0b21fd 100644 --- a/ui/egl-headless.c +++ b/ui/egl-headless.c @@ -89,13 +89,16 @@ static void egl_cursor_dmabuf(DisplayChangeListener *dcl, { egl_dpy *edpy = container_of(dcl, egl_dpy, dcl); - egl_dmabuf_import_texture(dmabuf); - if (!dmabuf->texture) { - return; + if (dmabuf) { + egl_dmabuf_import_texture(dmabuf); + if (!dmabuf->texture) { + return; + } + egl_fb_setup_for_tex(&edpy->cursor_fb, dmabuf->width, dmabuf->height, + dmabuf->texture, false); + } else { + egl_fb_destroy(&edpy->cursor_fb); } - - egl_fb_setup_for_tex(&edpy->cursor_fb, dmabuf->width, dmabuf->height, - dmabuf->texture, false); } static void egl_cursor_position(DisplayChangeListener *dcl, -- cgit v1.2.3