Fixed toImage() not working on a multisample QGLFramebufferObject.

Need to blit into a regular QGLFramebufferObject first to force a
multisample resolve.

Reviewed-by: Trond

1 files changed, 10 insertions, 0 deletions

diff --git a/src/opengl/qglframebufferobject.cpp b/src/opengl/qglframebufferobject.cpp
index 859afc7..8fd113a 100644
--- a/src/opengl/qglframebufferobject.cpp
+++ b/src/opengl/qglframebufferobject.cpp
@@ -875,6 +875,16 @@ QImage QGLFramebufferObject::toImage() const
     if (!d->valid)
         return QImage();
 
+    // qt_gl_read_framebuffer doesn't work on a multisample FBO
+    if (format().samples() != 0) {
+        QGLFramebufferObject temp(size());
+
+        QRect rect(QPoint(0, 0), size());
+        blitFramebuffer(&temp, rect, const_cast<QGLFramebufferObject *>(this), rect);
+
+        return temp.toImage();
+    }
+
     bool wasBound = isBound();
     if (!wasBound)
         const_cast<QGLFramebufferObject *>(this)->bind();