3 files changed, 24 insertions, 0 deletions
diff --git a/src/plugins/platforms/ios/qioscontext.mm b/src/plugins/platforms/ios/qioscontext.mm
index a35b4f164c..1ea040308f 100644
--- a/src/plugins/platforms/ios/qioscontext.mm
+++ b/src/plugins/platforms/ios/qioscontext.mm
@@ -113,6 +113,11 @@ bool QIOSContext::makeCurrent(QPlatformSurface *surface)
     Q_ASSERT(surface && surface->surface()->surfaceType() == QSurface::OpenGLSurface);
 
     [EAGLContext setCurrentContext:m_eaglContext];
+
+    // For offscreen surfaces we don't prepare a default FBO
+    if (surface->surface()->surfaceClass() == QSurface::Offscreen)
+        return true;
+
     FramebufferObject &framebufferObject = backingFramebufferObjectFor(surface);
 
     // We bind the default FBO even if it's incomplete, so that clients who
@@ -131,6 +136,10 @@ void QIOSContext::doneCurrent()
 void QIOSContext::swapBuffers(QPlatformSurface *surface)
 {
     Q_ASSERT(surface && surface->surface()->surfaceType() == QSurface::OpenGLSurface);
+
+    if (surface->surface()->surfaceClass() == QSurface::Offscreen)
+        return; // Nothing to do
+
     Q_ASSERT(surface->surface()->surfaceClass() == QSurface::Window);
     QIOSWindow *window = static_cast<QIOSWindow *>(surface);
     Q_ASSERT(m_framebufferObjects.contains(window));
@@ -213,6 +222,13 @@ QIOSContext::FramebufferObject &QIOSContext::backingFramebufferObjectFor(QPlatfo
 
 GLuint QIOSContext::defaultFramebufferObject(QPlatformSurface *surface) const
 {
+    if (surface->surface()->surfaceClass() == QSurface::Offscreen) {
+        // Binding and rendering to the zero-FBO on iOS seems to be
+        // no-ops, so we can safely return 0 here, even if it's not
+        // really a valid FBO on iOS.
+        return 0;
+    }
+
     return backingFramebufferObjectFor(surface).handle;
 }
 
diff --git a/src/plugins/platforms/ios/qiosintegration.h b/src/plugins/platforms/ios/qiosintegration.h
index a28926ff99..956c112399 100644
--- a/src/plugins/platforms/ios/qiosintegration.h
+++ b/src/plugins/platforms/ios/qiosintegration.h
@@ -64,6 +64,7 @@ public:
     QPlatformBackingStore *createPlatformBackingStore(QWindow *window) const;
 
     QPlatformOpenGLContext *createPlatformOpenGLContext(QOpenGLContext *context) const;
+    QPlatformOffscreenSurface *createPlatformOffscreenSurface(QOffscreenSurface *surface) const Q_DECL_OVERRIDE;
 
     QPlatformFontDatabase *fontDatabase() const;
     QPlatformClipboard *clipboard() const;
diff --git a/src/plugins/platforms/ios/qiosintegration.mm b/src/plugins/platforms/ios/qiosintegration.mm
index 7a40e349c9..0fe7adff9f 100644
--- a/src/plugins/platforms/ios/qiosintegration.mm
+++ b/src/plugins/platforms/ios/qiosintegration.mm
@@ -51,6 +51,8 @@
 #include "qiostheme.h"
 #include "qiosservices.h"
 
+#include <qpa/qplatformoffscreensurface.h>
+
 #include <QtPlatformSupport/private/qcoretextfontdatabase_p.h>
 #include <QtPlatformSupport/private/qmacmime_p.h>
 #include <QDir>
@@ -144,6 +146,11 @@ QPlatformOpenGLContext *QIOSIntegration::createPlatformOpenGLContext(QOpenGLCont
     return new QIOSContext(context);
 }
 
+QPlatformOffscreenSurface *QIOSIntegration::createPlatformOffscreenSurface(QOffscreenSurface *surface) const
+{
+    return new QPlatformOffscreenSurface(surface);
+}
+
 QAbstractEventDispatcher *QIOSIntegration::createEventDispatcher() const
 {
     if (isQtApplication())