1 files changed, 39 insertions, 16 deletions

diff --git a/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp b/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp
index a89dbc0ea2..f277475dbf 100644
--- a/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp
+++ b/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp
@@ -2763,6 +2763,21 @@ void Renderer::render()
         m_vao->release();
 }
 
+struct RenderNodeState : public QSGRenderNode::RenderState
+{
+    const QMatrix4x4 *projectionMatrix() const override { return m_projectionMatrix; }
+    QRect scissorRect() const { return m_scissorRect; }
+    bool scissorEnabled() const { return m_scissorEnabled; }
+    int stencilValue() const { return m_stencilValue; }
+    bool stencilEnabled() const { return m_stencilEnabled; }
+
+    const QMatrix4x4 *m_projectionMatrix;
+    QRect m_scissorRect;
+    bool m_scissorEnabled;
+    int m_stencilValue;
+    bool m_stencilEnabled;
+};
+
 void Renderer::renderRenderNode(Batch *batch)
 {
     if (Q_UNLIKELY(debug_render()))
@@ -2774,24 +2789,25 @@ void Renderer::renderRenderNode(Batch *batch)
     setActiveShader(0, 0);
 
     QSGNode *clip = e->renderNode->parent();
-    e->renderNode->m_clip_list = 0;
+    QSGRenderNodePrivate *rd = QSGRenderNodePrivate::get(e->renderNode);
+    rd->m_clip_list = 0;
     while (clip != rootNode()) {
         if (clip->type() == QSGNode::ClipNodeType) {
-            e->renderNode->m_clip_list = static_cast<QSGClipNode *>(clip);
+            rd->m_clip_list = static_cast<QSGClipNode *>(clip);
             break;
         }
         clip = clip->parent();
     }
 
-    updateClip(e->renderNode->m_clip_list, batch);
+    updateClip(rd->m_clip_list, batch);
 
-    QSGRenderNode::RenderState state;
+    RenderNodeState state;
     QMatrix4x4 pm = projectionMatrix();
-    state.projectionMatrix = &pm;
-    state.scissorEnabled = m_currentClipType & ScissorClip;
-    state.stencilEnabled = m_currentClipType & StencilClip;
-    state.scissorRect = m_currentScissorRect;
-    state.stencilValue = m_currentStencilValue;
+    state.m_projectionMatrix = &pm;
+    state.m_scissorEnabled = m_currentClipType & ScissorClip;
+    state.m_stencilEnabled = m_currentClipType & StencilClip;
+    state.m_scissorRect = m_currentScissorRect;
+    state.m_stencilValue = m_currentStencilValue;
 
     QSGNode *xform = e->renderNode->parent();
     QMatrix4x4 matrix;
@@ -2807,13 +2823,13 @@ void Renderer::renderRenderNode(Batch *batch)
         }
         xform = xform->parent();
     }
-    e->renderNode->m_matrix = &matrix;
+    rd->m_matrix = &matrix;
 
     QSGNode *opacity = e->renderNode->parent();
-    e->renderNode->m_opacity = 1.0;
+    rd->m_opacity = 1.0;
     while (opacity != rootNode()) {
         if (opacity->type() == QSGNode::OpacityNodeType) {
-            e->renderNode->m_opacity = static_cast<QSGOpacityNode *>(opacity)->combinedOpacity();
+            rd->m_opacity = static_cast<QSGOpacityNode *>(opacity)->combinedOpacity();
             break;
         }
         opacity = opacity->parent();
@@ -2825,12 +2841,17 @@ void Renderer::renderRenderNode(Batch *batch)
     glBindBuffer(GL_ARRAY_BUFFER, 0);
     glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
 
-    e->renderNode->render(state);
+    QSGRenderNode::StateFlags changes = e->renderNode->changedStates();
+
+    GLuint prevFbo = 0;
+    if (changes & QSGRenderNode::RenderTargetState)
+        glGetIntegerv(GL_FRAMEBUFFER_BINDING, (GLint *) &prevFbo);
 
-    e->renderNode->m_matrix = 0;
-    e->renderNode->m_clip_list = 0;
+    e->renderNode->render(&state);
+
+    rd->m_matrix = 0;
+    rd->m_clip_list = 0;
 
-    QSGRenderNode::StateFlags changes = e->renderNode->changedStates();
     if (changes & QSGRenderNode::ViewportState) {
         QRect r = viewportRect();
         glViewport(r.x(), deviceRect().bottom() - r.bottom(), r.width(), r.height());
@@ -2864,6 +2885,8 @@ void Renderer::renderRenderNode(Batch *batch)
         glDisable(GL_CULL_FACE);
     }
 
+    if (changes & QSGRenderNode::RenderTargetState)
+        glBindFramebuffer(GL_FRAMEBUFFER, prevFbo);
 }
 
 class VisualizeShader : public QOpenGLShaderProgram