summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGiulio Camuffo <giulio.camuffo@jollamobile.com>2015-01-05 13:38:53 +0200
committerGiulio Camuffo <giulio.camuffo@jollamobile.com>2015-01-05 14:59:42 +0100
commit7fd1af437b4f53d7201d42b592e35176995c2bc0 (patch)
tree89843c95de6e1b6194001d3895d7a70b68a14145
parent846324db5a6f3ff3ddf28d6122ebc7d2b19d71e7 (diff)
Allow retrieving the egl display for a QWindow on wayland
This allows a compositor running with the wayland qpa inside another compositor to provide EGL to its clients. Change-Id: I308fb909c8168955148be152bf314a53c0e5ca43 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
-rw-r--r--src/plugins/platforms/wayland/qwaylandnativeinterface.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/platforms/wayland/qwaylandnativeinterface.cpp b/src/plugins/platforms/wayland/qwaylandnativeinterface.cpp
index fca176ac715..b4bb0604dba 100644
--- a/src/plugins/platforms/wayland/qwaylandnativeinterface.cpp
+++ b/src/plugins/platforms/wayland/qwaylandnativeinterface.cpp
@@ -86,6 +86,8 @@ void *QWaylandNativeInterface::nativeResourceForWindow(const QByteArray &resourc
if (lowerCaseResource == "surface") {
return ((QWaylandWindow *) window->handle())->object();
}
+ if (lowerCaseResource == "egldisplay" && m_integration->clientBufferIntegration())
+ return m_integration->clientBufferIntegration()->nativeResource(QWaylandClientBufferIntegration::EglDisplay);
return NULL;
}