1 files changed, 8 insertions, 5 deletions

diff --git a/src/quick/scenegraph/qsgdefaultrendercontext.cpp b/src/quick/scenegraph/qsgdefaultrendercontext.cpp
index 2bf4a83a8e..1d18caa0b4 100644
--- a/src/quick/scenegraph/qsgdefaultrendercontext.cpp
+++ b/src/quick/scenegraph/qsgdefaultrendercontext.cpp
@@ -200,9 +200,14 @@ void QSGDefaultRenderContext::invalidate()
     emit invalidated();
 }
 
-void QSGDefaultRenderContext::prepareSync(qreal devicePixelRatio)
+void QSGDefaultRenderContext::prepareSync(qreal devicePixelRatio, QRhiCommandBuffer *cb)
 {
     m_currentDevicePixelRatio = devicePixelRatio;
+
+    // we store the command buffer already here, in case there is something in
+    // an updatePaintNode() implementation that leads to needing it (for
+    // example, an updateTexture() call on a QSGRhiLayer)
+    m_currentFrameCommandBuffer = cb;
 }
 
 static QBasicMutex qsg_framerender_mutex;
@@ -237,14 +242,12 @@ void QSGDefaultRenderContext::beginNextRhiFrame(QSGRenderer *renderer, QRhiRende
                                                 RenderPassCallback mainPassRecordingEnd,
                                                 void *callbackUserData)
 {
-    Q_ASSERT(!m_currentFrameCommandBuffer);
-
     renderer->setRenderTarget(rt);
     renderer->setRenderPassDescriptor(rp);
     renderer->setCommandBuffer(cb);
     renderer->setRenderPassRecordingCallbacks(mainPassRecordingStart, mainPassRecordingEnd, callbackUserData);
 
-    m_currentFrameCommandBuffer = cb;
+    m_currentFrameCommandBuffer = cb; // usually the same as what was passed to prepareSync() but cannot count on that having been called
     m_currentFrameRenderPass = rp;
 }
 
@@ -364,7 +367,7 @@ void QSGDefaultRenderContext::compileShader(QSGMaterialShader *shader, QSGMateri
         p->addCacheableShaderFromSourceCode(QOpenGLShader::Fragment, fragmentCode ? fragmentCode : shader->fragmentShader());
         p->link();
         if (!p->isLinked())
-            qWarning() << "shader compilation failed:" << endl << p->log();
+            qWarning() << "shader compilation failed:" << Qt::endl << p->log();
     } else {
         shader->compile();
     }