All of lore.kernel.org
 help / color / mirror / Atom feed
From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Gerd Hoffmann <kraxel@redhat.com>
Subject: [Qemu-devel] [PULL 3/9] egl-headless: cursor_dmabuf: handle NULL cursor
Date: Thu, 22 Feb 2018 11:23:11 +0100	[thread overview]
Message-ID: <20180222102317.25776-4-kraxel@redhat.com> (raw)
In-Reply-To: <20180222102317.25776-1-kraxel@redhat.com>

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 <kraxel@redhat.com>
Message-id: 20180220110433.20353-3-kraxel@redhat.com
---
 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

  parent reply	other threads:[~2018-02-22 10:23 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-02-22 10:23 [Qemu-devel] [PULL 0/9] Ui 20180222 patches Gerd Hoffmann
2018-02-22 10:23 ` [Qemu-devel] [PULL 1/9] sdl2: fix hotkey keyup Gerd Hoffmann
2018-02-22 10:23 ` [Qemu-devel] [PULL 2/9] console/opengl: split up dpy_gl_cursor ops Gerd Hoffmann
2018-02-22 10:23 ` Gerd Hoffmann [this message]
2018-02-22 10:23 ` [Qemu-devel] [PULL 4/9] egl-helpers: add alpha channel to texture format Gerd Hoffmann
2018-02-22 10:23 ` [Qemu-devel] [PULL 5/9] keymap: make struct kbd_layout_t private to ui/keymaps.c Gerd Hoffmann
2018-02-22 10:23 ` [Qemu-devel] [PULL 6/9] keymap: use glib hash for kbd_layout_t Gerd Hoffmann
2018-02-22 10:23 ` [Qemu-devel] [PULL 7/9] keymap: numpad keysyms and keycodes are fixed Gerd Hoffmann
2018-02-22 10:23 ` [Qemu-devel] [PULL 8/9] keymap: record multiple keysym -> keycode mappings Gerd Hoffmann
2018-02-22 10:23 ` [Qemu-devel] [PULL 9/9] keymap: consider modifier state when picking a mapping Gerd Hoffmann
2018-02-22 15:41 ` [Qemu-devel] [PULL 0/9] Ui 20180222 patches Peter Maydell
2018-02-24 14:10 ` no-reply

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180222102317.25776-4-kraxel@redhat.com \
    --to=kraxel@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.