From fe5c44f9c95be3f74fb58902077ac587998d1392 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Tue, 6 Jun 2017 13:06:18 +0200 Subject: spice: don't enter opengl mode in case another UI provides opengl support Signed-off-by: Gerd Hoffmann Message-id: 20170606110618.10393-1-kraxel@redhat.com --- ui/spice-core.c | 1 + ui/spice-display.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'ui') diff --git a/ui/spice-core.c b/ui/spice-core.c index a087ad5da9..182f550f1f 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, -- cgit v1.2.3