* [Qemu-devel] [PATCH] spice: don't enter opengl mode in case another UI provides opengl support
@ 2017-06-06 11:06 Gerd Hoffmann
2017-06-08 12:23 ` Marc-André Lureau
0 siblings, 1 reply; 2+ messages in thread
From: Gerd Hoffmann @ 2017-06-06 11:06 UTC (permalink / raw)
To: qemu-devel; +Cc: Gerd Hoffmann
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(-)
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Qemu-devel] [PATCH] spice: don't enter opengl mode in case another UI provides opengl support
2017-06-06 11:06 [Qemu-devel] [PATCH] spice: don't enter opengl mode in case another UI provides opengl support Gerd Hoffmann
@ 2017-06-08 12:23 ` Marc-André Lureau
0 siblings, 0 replies; 2+ messages in thread
From: Marc-André Lureau @ 2017-06-08 12:23 UTC (permalink / raw)
To: Gerd Hoffmann, qemu-devel
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-06-08 12:23 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-06-06 11:06 [Qemu-devel] [PATCH] spice: don't enter opengl mode in case another UI provides opengl support Gerd Hoffmann
2017-06-08 12:23 ` Marc-André Lureau
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.