2 files changed, 17 insertions, 3 deletions
diff --git a/src/opengl/qopenglcompositor.cpp b/src/opengl/qopenglcompositor.cpp
index 4878d722890..74d8ae7e1ff 100644
--- a/src/opengl/qopenglcompositor.cpp
+++ b/src/opengl/qopenglcompositor.cpp
@@ -85,10 +85,21 @@ void QOpenGLCompositor::update()
 QImage QOpenGLCompositor::grab()
 {
     Q_ASSERT(m_context && m_targetWindow);
+    QOpenGLFramebufferObject fbo(m_nativeTargetGeometry.size());
+    grabToFrameBufferObject(&fbo);
+    return fbo.toImage();
+}
+
+bool QOpenGLCompositor::grabToFrameBufferObject(QOpenGLFramebufferObject *fbo)
+{
+    Q_ASSERT(fbo);
+    if (fbo->size() != m_nativeTargetGeometry.size()
+        || fbo->format().textureTarget() != GL_TEXTURE_2D)
+        return false;
+
     m_context->makeCurrent(m_targetWindow);
-    QScopedPointer<QOpenGLFramebufferObject> fbo(new QOpenGLFramebufferObject(m_nativeTargetGeometry.size()));
-    renderAll(fbo.data());
-    return fbo->toImage();
+    renderAll(fbo);
+    return true;
 }
 
 void QOpenGLCompositor::handleRenderAllRequest()
diff --git a/src/opengl/qopenglcompositor_p.h b/src/opengl/qopenglcompositor_p.h
index 72cb4fd350a..9e04cb2b259 100644
--- a/src/opengl/qopenglcompositor_p.h
+++ b/src/opengl/qopenglcompositor_p.h
@@ -55,10 +55,13 @@ public:
     void setRotation(int degrees);
     QOpenGLContext *context() const { return m_context; }
     QWindow *targetWindow() const { return m_targetWindow; }
+    QRect nativeTargetGeometry() const { return m_nativeTargetGeometry; }
 
     void update();
     QImage grab();
 
+    bool grabToFrameBufferObject(QOpenGLFramebufferObject *fbo);
+
     QList<QOpenGLCompositorWindow *> windows() const { return m_windows; }
     void addWindow(QOpenGLCompositorWindow *window);
     void removeWindow(QOpenGLCompositorWindow *window);