3 files changed, 19 insertions, 0 deletions
diff --git a/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp b/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp
index 903a98c8ed..aa46b5a509 100644
--- a/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp
+++ b/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp
@@ -959,6 +959,11 @@ static void qsg_wipeBatch(Batch *batch, bool separateIndexBuffer)
 Renderer::~Renderer()
 {
     if (m_rhi) {
+        // If setExternalRenderPassDescriptor() was called, we have to
+        // aggressively invalidate to prevent an object, the lifetime of which
+        // we have no control over, staying in the (per-window) caches.
+        invalidatePipelineCacheDependency(m_external_rp_desc);
+
         // Clean up batches and buffers
         const bool separateIndexBuffer = m_context->separateIndexBuffer();
         for (int i = 0; i < m_opaqueBatches.size(); ++i)
diff --git a/src/quick/scenegraph/coreapi/qsgrenderer.cpp b/src/quick/scenegraph/coreapi/qsgrenderer.cpp
index 00691278c0..4b3cd9f2c1 100644
--- a/src/quick/scenegraph/coreapi/qsgrenderer.cpp
+++ b/src/quick/scenegraph/coreapi/qsgrenderer.cpp
@@ -98,6 +98,7 @@ QSGRenderer::QSGRenderer(QSGRenderContext *context)
     , m_rt(nullptr)
     , m_cb(nullptr)
     , m_rp_desc(nullptr)
+    , m_external_rp_desc(nullptr)
     , m_node_updater(nullptr)
     , m_changed_emitted(false)
     , m_is_rendering(false)
diff --git a/src/quick/scenegraph/coreapi/qsgrenderer_p.h b/src/quick/scenegraph/coreapi/qsgrenderer_p.h
index 0c9a424abc..31f00dc738 100644
--- a/src/quick/scenegraph/coreapi/qsgrenderer_p.h
+++ b/src/quick/scenegraph/coreapi/qsgrenderer_p.h
@@ -115,6 +115,18 @@ public:
     void setRenderPassDescriptor(QRhiRenderPassDescriptor *rpDesc) { m_rp_desc = rpDesc; }
     QRhiRenderPassDescriptor *renderPassDescriptor() const { return m_rp_desc; }
 
+    void setExternalRenderPassDescriptor(QRhiRenderPassDescriptor *rpDesc) {
+        if (m_external_rp_desc) {
+            // Changes will be rare in practice - one has to construct a
+            // dynamic Quick 3D scene with reparenting involved for that. Play
+            // nice nonetheless and invalidate as soon as possible.
+            if (m_external_rp_desc != rpDesc)
+                invalidatePipelineCacheDependency(m_external_rp_desc);
+        }
+        m_rp_desc = rpDesc;
+        m_external_rp_desc = rpDesc;
+    }
+
     void setRenderPassRecordingCallbacks(QSGRenderContext::RenderPassCallback start,
                                          QSGRenderContext::RenderPassCallback end,
                                          void *userData)
@@ -150,6 +162,7 @@ protected:
     QRhiRenderTarget *m_rt;
     QRhiCommandBuffer *m_cb;
     QRhiRenderPassDescriptor *m_rp_desc;
+    QRhiRenderPassDescriptor *m_external_rp_desc;
     struct {
         QSGRenderContext::RenderPassCallback start = nullptr;
         QSGRenderContext::RenderPassCallback end = nullptr;