[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 3/9] egl-headless: cursor_dmabuf: handle NULL cursor
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 3/9] egl-headless: cursor_dmabuf: handle NULL cursor |
Date: |
Thu, 22 Feb 2018 11:23:11 +0100 |
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 <address@hidden>
Message-id: address@hidden
---
ui/egl-headless.c | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
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,
--
2.9.3
- [Qemu-devel] [PULL 0/9] Ui 20180222 patches, Gerd Hoffmann, 2018/02/22
- [Qemu-devel] [PULL 7/9] keymap: numpad keysyms and keycodes are fixed, Gerd Hoffmann, 2018/02/22
- [Qemu-devel] [PULL 9/9] keymap: consider modifier state when picking a mapping, Gerd Hoffmann, 2018/02/22
- [Qemu-devel] [PULL 8/9] keymap: record multiple keysym -> keycode mappings, Gerd Hoffmann, 2018/02/22
- [Qemu-devel] [PULL 2/9] console/opengl: split up dpy_gl_cursor ops, Gerd Hoffmann, 2018/02/22
- [Qemu-devel] [PULL 4/9] egl-helpers: add alpha channel to texture format, Gerd Hoffmann, 2018/02/22
- [Qemu-devel] [PULL 1/9] sdl2: fix hotkey keyup, Gerd Hoffmann, 2018/02/22
- [Qemu-devel] [PULL 3/9] egl-headless: cursor_dmabuf: handle NULL cursor,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 5/9] keymap: make struct kbd_layout_t private to ui/keymaps.c, Gerd Hoffmann, 2018/02/22
- [Qemu-devel] [PULL 6/9] keymap: use glib hash for kbd_layout_t, Gerd Hoffmann, 2018/02/22
- Re: [Qemu-devel] [PULL 0/9] Ui 20180222 patches, Peter Maydell, 2018/02/22
- Re: [Qemu-devel] [PULL 0/9] Ui 20180222 patches, no-reply, 2018/02/24