Message ID | 20170606110618.10393-1-kraxel@redhat.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Hi On Tue, Jun 6, 2017 at 3:11 PM Gerd Hoffmann <kraxel@redhat.com> wrote: > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> > Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> --- > 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 > > > -- Marc-André Lureau
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,
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> --- include/ui/spice-display.h | 2 ++ ui/spice-core.c | 1 + ui/spice-display.c | 3 ++- 3 files changed, 5 insertions(+), 1 deletion(-)