xemu-project/xemu
1
0
Fork 0
mirror of https://github.com/xemu-project/xemu.git synced 2024-11-23 19:49:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

spice: don't enter opengl mode in case another UI provides opengl support

Browse Source 
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-id: 20170606110618.10393-1-kraxel@redhat.com
This commit is contained in:
Gerd Hoffmann 2017-06-06 13:06:18 +02:00
parent 8f4ea9cd0b
commit fe5c44f9c9
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/ui/spice-display.h
View File

@ -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);

1
ui/spice-core.c
View File

@ -847,6 +847,7 @@ void qemu_spice_init(void)
exit(1);
}
display_opengl = 1;
spice_opengl = 1;
}
#endif
}

3
ui/spice-display.c
View File

@ -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,