diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-09-28 17:15:43 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-09-28 17:15:43 +0100 |
| commit | 79907e688d07cd3a43c28c563968b57697b6a9cf (patch) | |
| tree | 37639d9515677bbb299614ac3545afecc50ea2f0 /include | |
| parent | 3c87fafb90c108b1adb7451f6cc036480698e6f8 (diff) | |
| parent | d9d2663c336b4ff7af9528f2cd3736791f4c0da5 (diff) | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-ui-20160928-1' into staging
ui: console+vnc fixes, switch spice to pure opengl with gl=on.
# gpg: Signature made Wed 28 Sep 2016 11:57:35 BST
# gpg: using RSA key 0x4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/pull-ui-20160928-1:
ui/vnc-enc-tight: remove switch and have single return
spice/gl: render DisplaySurface via opengl
console: track gl_block state in QemuConsole
console: skip same-size resize
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/ui/console.h | 1 | ||||
| -rw-r--r-- | include/ui/spice-display.h | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/include/ui/console.h b/include/ui/console.h index d9c13d20b1..e2589e2134 100644 --- a/include/ui/console.h +++ b/include/ui/console.h @@ -387,6 +387,7 @@ QemuConsole *qemu_console_lookup_by_device_name(const char *device_id, bool qemu_console_is_visible(QemuConsole *con); bool qemu_console_is_graphic(QemuConsole *con); bool qemu_console_is_fixedsize(QemuConsole *con); +bool qemu_console_is_gl_blocked(QemuConsole *con); char *qemu_console_get_label(QemuConsole *con); int qemu_console_get_index(QemuConsole *con); uint32_t qemu_console_get_head(QemuConsole *con); diff --git a/include/ui/spice-display.h b/include/ui/spice-display.h index 42e0fdf775..184d4c373a 100644 --- a/include/ui/spice-display.h +++ b/include/ui/spice-display.h @@ -119,7 +119,10 @@ struct SimpleSpiceDisplay { /* opengl rendering */ QEMUBH *gl_unblock_bh; QEMUTimer *gl_unblock_timer; - int dmabuf_fd; + ConsoleGLState *gls; + int gl_updates; + bool have_scanout; + bool have_surface; #endif }; |