1 files changed, 18 insertions, 6 deletions
diff --git a/src/plugins/platforms/ios/qioscontext.mm b/src/plugins/platforms/ios/qioscontext.mm
index 0c4bee1ef0..7310d2904f 100644
--- a/src/plugins/platforms/ios/qioscontext.mm
+++ b/src/plugins/platforms/ios/qioscontext.mm
@@ -51,7 +51,10 @@
 
 QIOSContext::QIOSContext(QOpenGLContext *context)
     : QPlatformOpenGLContext()
-    , m_eaglContext([[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES2])
+    , m_sharedContext(static_cast<QIOSContext *>(context->shareHandle()))
+    , m_eaglContext([[EAGLContext alloc]
+        initWithAPI:kEAGLRenderingAPIOpenGLES2
+        sharegroup:m_sharedContext ? [m_sharedContext->m_eaglContext sharegroup] : nil])
     , m_format(context->format())
 {
     m_format.setRenderableType(QSurfaceFormat::OpenGLES);
@@ -110,7 +113,7 @@ void QIOSContext::swapBuffers(QPlatformSurface *surface)
 {
     Q_ASSERT(surface && surface->surface()->surfaceType() == QSurface::OpenGLSurface);
     Q_ASSERT(surface->surface()->surfaceClass() == QSurface::Window);
-    QWindow *window = static_cast<QWindow *>(surface->surface());
+    QIOSWindow *window = static_cast<QIOSWindow *>(surface);
     Q_ASSERT(m_framebufferObjects.contains(window));
 
     [EAGLContext setCurrentContext:m_eaglContext];
@@ -121,7 +124,7 @@ void QIOSContext::swapBuffers(QPlatformSurface *surface)
 GLuint QIOSContext::defaultFramebufferObject(QPlatformSurface *surface) const
 {
     Q_ASSERT(surface && surface->surface()->surfaceClass() == QSurface::Window);
-    QWindow *window = static_cast<QWindow *>(surface->surface());
+    QIOSWindow *window = static_cast<QIOSWindow *>(surface);
 
     FramebufferObject &framebufferObject = m_framebufferObjects[window];
 
@@ -152,8 +155,7 @@ GLuint QIOSContext::defaultFramebufferObject(QPlatformSurface *surface) const
     }
 
     // Ensure that the FBO's buffers match the size of the layer
-    QIOSWindow *platformWindow = static_cast<QIOSWindow *>(surface);
-    UIView *view = reinterpret_cast<UIView *>(platformWindow->winId());
+    UIView *view = reinterpret_cast<UIView *>(window->winId());
     CAEAGLLayer *layer = static_cast<CAEAGLLayer *>(view.layer);
     if (framebufferObject.renderbufferWidth != (layer.frame.size.width * layer.contentsScale) ||
         framebufferObject.renderbufferHeight != (layer.frame.size.height * layer.contentsScale)) {
@@ -188,7 +190,7 @@ GLuint QIOSContext::defaultFramebufferObject(QPlatformSurface *surface) const
 
 void QIOSContext::windowDestroyed(QObject *object)
 {
-    QWindow *window = static_cast<QWindow *>(object);
+    QIOSWindow *window = static_cast<QIOSWindow *>(object);
     if (m_framebufferObjects.contains(window)) {
         EAGLContext *originalContext = [EAGLContext currentContext];
         [EAGLContext setCurrentContext:m_eaglContext];
@@ -203,5 +205,15 @@ QFunctionPointer QIOSContext::getProcAddress(const QByteArray& functionName)
     return QFunctionPointer(dlsym(RTLD_DEFAULT, functionName.constData()));
 }
 
+bool QIOSContext::isValid() const
+{
+    return m_eaglContext;
+}
+
+bool QIOSContext::isSharing() const
+{
+    return m_sharedContext;
+}
+
 #include "moc_qioscontext.cpp"