[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 7/7] spice: don't enter opengl mode in case another U
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 7/7] spice: don't enter opengl mode in case another UI provides opengl support |
Date: |
Thu, 8 Jun 2017 09:07:16 +0200 |
Signed-off-by: Gerd Hoffmann <address@hidden>
Message-id: address@hidden
---
include/ui/spice-display.h | 2 ++
ui/spice-core.c | 1 +
ui/spice-display.c | 3 ++-
3 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/include/ui/spice-display.h b/include/ui/spice-display.h
index 184d4c373a..4ba9444dba 100644
--- a/include/ui/spice-display.h
+++ b/include/ui/spice-display.h
@@ -140,6 +140,8 @@ struct SimpleSpiceCursor {
QXLCursor cursor;
};
+extern bool spice_opengl;
+
int qemu_spice_rect_is_empty(const QXLRect* r);
void qemu_spice_rect_union(QXLRect *dest, const QXLRect *r);
diff --git a/ui/spice-core.c b/ui/spice-core.c
index 804abc5c0f..7c9ec0f0dd 100644
--- a/ui/spice-core.c
+++ b/ui/spice-core.c
@@ -847,6 +847,7 @@ void qemu_spice_init(void)
exit(1);
}
display_opengl = 1;
+ spice_opengl = 1;
}
#endif
}
diff --git a/ui/spice-display.c b/ui/spice-display.c
index b353445f58..042292cc90 100644
--- a/ui/spice-display.c
+++ b/ui/spice-display.c
@@ -27,6 +27,7 @@
#include "ui/spice-display.h"
static int debug = 0;
+bool spice_opengl;
static void GCC_FMT_ATTR(2, 3) dprint(int level, const char *fmt, ...)
{
@@ -1013,7 +1014,7 @@ static void qemu_spice_display_init_one(QemuConsole *con)
ssd->dcl.ops = &display_listener_ops;
#ifdef HAVE_SPICE_GL
- if (display_opengl) {
+ if (spice_opengl) {
ssd->dcl.ops = &display_listener_gl_ops;
ssd->gl_unblock_bh = qemu_bh_new(qemu_spice_gl_unblock_bh, ssd);
ssd->gl_unblock_timer = timer_new_ms(QEMU_CLOCK_REALTIME,
--
2.9.3
- [Qemu-devel] [PULL 0/7] ui patch queue, Gerd Hoffmann, 2017/06/08
- [Qemu-devel] [PULL 6/7] sdl: add deprecation warning for sdl1, Gerd Hoffmann, 2017/06/08
- [Qemu-devel] [PULL 3/7] gtk: prefer gtk3 over gtk2, Gerd Hoffmann, 2017/06/08
- [Qemu-devel] [PULL 5/7] gtk: add deprecation warning for gtk2, Gerd Hoffmann, 2017/06/08
- [Qemu-devel] [PULL 2/7] spice: Use proper enum type for kbd led state, Gerd Hoffmann, 2017/06/08
- [Qemu-devel] [PULL 1/7] Improve Cocoa modifier key handling, Gerd Hoffmann, 2017/06/08
- [Qemu-devel] [PULL 4/7] sdl: prefer sdl2 over sdl1, Gerd Hoffmann, 2017/06/08
- [Qemu-devel] [PULL 7/7] spice: don't enter opengl mode in case another UI provides opengl support,
Gerd Hoffmann <=
- Re: [Qemu-devel] [PULL 0/7] ui patch queue, Peter Maydell, 2017/06/12
- Re: [Qemu-devel] [PULL 0/7] ui patch queue, Gerd Hoffmann, 2017/06/13