1 files changed, 77 insertions, 36 deletions

diff --git a/src/render/graphicshelpers/graphicscontext.cpp b/src/render/graphicshelpers/graphicscontext.cpp
index 9a20c77e7..f9229f633 100644
--- a/src/render/graphicshelpers/graphicscontext.cpp
+++ b/src/render/graphicshelpers/graphicscontext.cpp
@@ -579,38 +579,11 @@ void GraphicsContext::activateRenderTarget(Qt3DCore::QNodeId renderTargetNodeId,
                 // this is the default fbo that some platforms create (iOS), we just register it
                 // Insert FBO into hash
                 m_renderTargets.insert(renderTargetNodeId, fboId);
-            } else if ((fboId = m_glHelper->createFrameBufferObject()) != 0) {
-                // The FBO is created and its attachments are set once
-                // Insert FBO into hash
-                m_renderTargets.insert(renderTargetNodeId, fboId);
-                // Bind FBO
-                m_glHelper->bindFrameBufferObject(fboId, GraphicsHelperInterface::FBODraw);
-                bindFrameBufferAttachmentHelper(fboId, attachments);
             } else {
-                qCritical() << "Failed to create FBO";
+                fboId = createRenderTarget(renderTargetNodeId, attachments);
             }
         } else {
-            fboId = m_renderTargets.value(renderTargetNodeId);
-
-            // We need to check if  one of the attachment was resized
-            bool needsResize = !m_renderTargetsSize.contains(fboId);    // not even initialized yet?
-            if (!needsResize) {
-                // render target exists, has attachment been resized?
-                GLTextureManager *glTextureManager = m_renderer->nodeManagers()->glTextureManager();
-                const QSize s = m_renderTargetsSize[fboId];
-                const auto attachments_ = attachments.attachments();
-                for (const Attachment &attachment : attachments_) {
-                    GLTexture *rTex = glTextureManager->lookupResource(attachment.m_textureUuid);
-                    needsResize |= (rTex != nullptr && rTex->size() != s);
-                    if (attachment.m_point == QRenderTargetOutput::Color0)
-                        m_renderTargetFormat = rTex->properties().format;
-                }
-            }
-
-            if (needsResize) {
-                m_glHelper->bindFrameBufferObject(fboId, GraphicsHelperInterface::FBODraw);
-                bindFrameBufferAttachmentHelper(fboId, attachments);
-            }
+            fboId = updateRenderTarget(renderTargetNodeId, attachments, true);
         }
     }
     m_activeFBO = fboId;
@@ -619,6 +592,54 @@ void GraphicsContext::activateRenderTarget(Qt3DCore::QNodeId renderTargetNodeId,
     activateDrawBuffers(attachments);
 }
 
+GLuint GraphicsContext::createRenderTarget(Qt3DCore::QNodeId renderTargetNodeId, const AttachmentPack &attachments)
+{
+    const GLuint fboId = m_glHelper->createFrameBufferObject();
+    if (fboId) {
+        // The FBO is created and its attachments are set once
+        // Insert FBO into hash
+        m_renderTargets.insert(renderTargetNodeId, fboId);
+        // Bind FBO
+        m_glHelper->bindFrameBufferObject(fboId, GraphicsHelperInterface::FBODraw);
+        bindFrameBufferAttachmentHelper(fboId, attachments);
+    } else {
+        qCritical("Failed to create FBO");
+    }
+    return fboId;
+}
+
+GLuint GraphicsContext::updateRenderTarget(Qt3DCore::QNodeId renderTargetNodeId, const AttachmentPack &attachments, bool isActiveRenderTarget)
+{
+    const GLuint fboId = m_renderTargets.value(renderTargetNodeId);
+
+    // We need to check if  one of the attachment was resized
+    bool needsResize = !m_renderTargetsSize.contains(fboId);    // not even initialized yet?
+    if (!needsResize) {
+        // render target exists, has attachment been resized?
+        GLTextureManager *glTextureManager = m_renderer->nodeManagers()->glTextureManager();
+        const QSize s = m_renderTargetsSize[fboId];
+        const auto attachments_ = attachments.attachments();
+        for (const Attachment &attachment : attachments_) {
+            GLTexture *rTex = glTextureManager->lookupResource(attachment.m_textureUuid);
+            // ### TODO QTBUG-64757 this check is insufficient since the
+            // texture may have changed to another one with the same size. That
+            // case is not handled atm.
+            needsResize |= (rTex != nullptr && rTex->size() != s);
+            if (isActiveRenderTarget) {
+                if (attachment.m_point == QRenderTargetOutput::Color0)
+                    m_renderTargetFormat = rTex->properties().format;
+            }
+        }
+    }
+
+    if (needsResize) {
+        m_glHelper->bindFrameBufferObject(fboId, GraphicsHelperInterface::FBODraw);
+        bindFrameBufferAttachmentHelper(fboId, attachments);
+    }
+
+    return fboId;
+}
+
 void GraphicsContext::bindFrameBufferAttachmentHelper(GLuint fboId, const AttachmentPack &attachments)
 {
     // Set FBO attachments. These are normally textures, except that on Open GL
@@ -1515,20 +1536,39 @@ bool GraphicsContext::hasGLBufferForBuffer(Buffer *buffer)
     return (it != m_renderBufferHash.end());
 }
 
-void GraphicsContext::blitFramebuffer(Qt3DCore::QNodeId inputRenderTarget,
-                                      Qt3DCore::QNodeId outputRenderTarget,
+void GraphicsContext::blitFramebuffer(Qt3DCore::QNodeId inputRenderTargetId,
+                                      Qt3DCore::QNodeId outputRenderTargetId,
                                       QRect inputRect, QRect outputRect,
                                       uint defaultFboId,
                                       QRenderTargetOutput::AttachmentPoint inputAttachmentPoint,
                                       QRenderTargetOutput::AttachmentPoint outputAttachmentPoint,
                                       QBlitFramebuffer::InterpolationMethod interpolationMethod)
 {
-    //Find the context side name for the render targets
-    const GLuint inputFboId = m_renderTargets[inputRenderTarget];
+    GLuint inputFboId = defaultFboId;
+    bool inputBufferIsDefault = true;
+    if (!inputRenderTargetId.isNull()) {
+        RenderTarget *renderTarget = m_renderer->nodeManagers()->renderTargetManager()->lookupResource(inputRenderTargetId);
+        if (renderTarget) {
+            AttachmentPack attachments(renderTarget, m_renderer->nodeManagers()->attachmentManager());
+            if (m_renderTargets.contains(inputRenderTargetId))
+                inputFboId = updateRenderTarget(inputRenderTargetId, attachments, false);
+            else
+                inputFboId = createRenderTarget(inputRenderTargetId, attachments);
+        }
+        inputBufferIsDefault = false;
+    }
+
     GLuint outputFboId = defaultFboId;
     bool outputBufferIsDefault = true;
-    if (!outputRenderTarget.isNull() && m_renderTargets.contains(outputRenderTarget)) {
-        outputFboId = m_renderTargets[outputRenderTarget];
+    if (!outputRenderTargetId.isNull()) {
+        RenderTarget *renderTarget = m_renderer->nodeManagers()->renderTargetManager()->lookupResource(outputRenderTargetId);
+        if (renderTarget) {
+            AttachmentPack attachments(renderTarget, m_renderer->nodeManagers()->attachmentManager());
+            if (m_renderTargets.contains(outputRenderTargetId))
+                outputFboId = updateRenderTarget(outputRenderTargetId, attachments, false);
+            else
+                outputFboId = createRenderTarget(outputRenderTargetId, attachments);
+        }
         outputBufferIsDefault = false;
     }
 
@@ -1552,7 +1592,8 @@ void GraphicsContext::blitFramebuffer(Qt3DCore::QNodeId inputRenderTarget,
     bindFramebuffer(outputFboId, GraphicsHelperInterface::FBODraw);
 
     //Bind texture
-    readBuffer(GL_COLOR_ATTACHMENT0 + inputAttachmentPoint);
+    if (!inputBufferIsDefault)
+        readBuffer(GL_COLOR_ATTACHMENT0 + inputAttachmentPoint);
 
     if (!outputBufferIsDefault)
         drawBuffer(GL_COLOR_ATTACHMENT0 + outputAttachmentPoint);