From 294894610b02a2cd4682fafe139a60b2b96f3289 Mon Sep 17 00:00:00 2001
From: Paul Lemire <paul.lemire@kdab.com>
Date: Thu, 13 Feb 2020 11:51:38 +0100
Subject: Destroy FBOs when RenderTarget node is destroyed

It appears we never destroyed FBOs which lead to bugs
when destroying and recreating a RenderTarget

Change-Id: I99b3df95b821670aa3bbd63209ff9bcc21afbf79
Reviewed-by: Mike Krus <mike.krus@kdab.com>
---
 src/render/backend/rendertarget.cpp | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

(limited to 'src/render/backend/rendertarget.cpp')

diff --git a/src/render/backend/rendertarget.cpp b/src/render/backend/rendertarget.cpp
index 088818c94..f78d149db 100644
--- a/src/render/backend/rendertarget.cpp
+++ b/src/render/backend/rendertarget.cpp
@@ -41,6 +41,7 @@
 #include <Qt3DRender/qrendertarget.h>
 #include <Qt3DRender/private/qrendertarget_p.h>
 #include <Qt3DRender/qrendertargetoutput.h>
+#include <Qt3DRender/private/managers_p.h>
 #include <QVariant>
 
 QT_BEGIN_NAMESPACE
@@ -94,6 +95,33 @@ QVector<Qt3DCore::QNodeId> RenderTarget::renderOutputs() const
     return m_renderOutputs;
 }
 
+RenderTargetFunctor::RenderTargetFunctor(AbstractRenderer *renderer, RenderTargetManager *manager)
+    : m_renderer(renderer)
+    , m_renderTargetManager(manager)
+{
+}
+
+QBackendNode *RenderTargetFunctor::create(const QNodeCreatedChangeBasePtr &change) const
+{
+    RenderTarget *backend = m_renderTargetManager->getOrCreateResource(change->subjectId());
+    // Remove from the list of ids to destroy in case we were added to it
+    m_renderTargetManager->removeRenderTargetToCleanup(change->subjectId());
+    backend->setRenderer(m_renderer);
+    return backend;
+}
+
+QBackendNode *RenderTargetFunctor::get(QNodeId id) const
+{
+    return m_renderTargetManager->lookupResource(id);
+}
+
+void RenderTargetFunctor::destroy(QNodeId id) const
+{
+    // We add ourselves to the dirty list to tell the renderer that this rendertarget has been destroyed
+    m_renderTargetManager->addRenderTargetIdToCleanup(id);
+    m_renderTargetManager->releaseResource(id);
+}
+
 } // namespace Render
 } // namespace Qt3DRender
 
-- 
cgit v1.2.3