summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrediano Ziglio <fziglio@redhat.com>2016-12-18 13:58:00 +0000
committerPavel Grunt <pgrunt@redhat.com>2017-02-21 13:30:07 +0100
commit521d7c0c4427f984978fb196c571983e0753c0b6 (patch)
tree015b7df14db06258ee38c088a239bdb3cf764950
parentb856256179f14c33a513d0b9cc3e4be355b95f43 (diff)
pass EGL to spice-server
-rw-r--r--ui/spice-core.c5
-rw-r--r--ui/spice-display.c4
2 files changed, 4 insertions, 5 deletions
diff --git a/ui/spice-core.c b/ui/spice-core.c
index 39ccab7561..681575f283 100644
--- a/ui/spice-core.c
+++ b/ui/spice-core.c
@@ -831,11 +831,6 @@ void qemu_spice_init(void)
#ifdef HAVE_SPICE_GL
if (qemu_opt_get_bool(opts, "gl", 0)) {
- if ((port != 0) || (tls_port != 0)) {
- error_report("SPICE GL support is local-only for now and "
- "incompatible with -spice port/tls-port");
- exit(1);
- }
if (egl_rendernode_init(qemu_opt_get(opts, "rendernode")) != 0) {
error_report("Failed to initialize EGL render node for SPICE GL");
exit(1);
diff --git a/ui/spice-display.c b/ui/spice-display.c
index 64e472eeb0..2394a4902f 100644
--- a/ui/spice-display.c
+++ b/ui/spice-display.c
@@ -923,6 +923,10 @@ static void spice_gl_switch(DisplayChangeListener *dcl,
static QEMUGLContext qemu_spice_gl_create_context(DisplayChangeListener *dcl,
QEMUGLParams *params)
{
+ SimpleSpiceDisplay *ssd = container_of(dcl, SimpleSpiceDisplay, dcl);
+
+ spice_qxl_gl_setup(&ssd->qxl, qemu_egl_display);
+
eglMakeCurrent(qemu_egl_display, EGL_NO_SURFACE, EGL_NO_SURFACE,
qemu_egl_rn_ctx);
return qemu_egl_create_context(dcl, params);