Change signature of FrameGraphManager::appendNode() slightly

To make the id explicit rather than the function extracting it from
the QBackendNode. This is because under the no cloning approach the
QBackendNode does not yet have its peerId() set at this stage. We do
however have it from the change itself.

Change-Id: I2dc1607088b8e8039094755529f6afb127b607f8
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

4 files changed, 8 insertions, 8 deletions

diff --git a/src/render/backend/managers.cpp b/src/render/backend/managers.cpp
index 3e3f1e73a..c5a9985ba 100644
--- a/src/render/backend/managers.cpp
+++ b/src/render/backend/managers.cpp
@@ -51,9 +51,9 @@ bool FrameGraphManager::containsNode(Qt3DCore::QNodeId id) const
     return m_nodes.contains(id);
 }
 
-void FrameGraphManager::appendNode(FrameGraphNode *node)
+void FrameGraphManager::appendNode(Qt3DCore::QNodeId id, FrameGraphNode *node)
 {
-    m_nodes.insert(node->peerId(), node);
+    m_nodes.insert(id, node);
 }
 
 FrameGraphNode* FrameGraphManager::lookupNode(Qt3DCore::QNodeId id) const
diff --git a/src/render/backend/managers_p.h b/src/render/backend/managers_p.h
index 69f834faf..f04a1aaa9 100644
--- a/src/render/backend/managers_p.h
+++ b/src/render/backend/managers_p.h
@@ -147,7 +147,7 @@ public:
     FrameGraphManager() {}
 
     bool containsNode(Qt3DCore::QNodeId id) const;
-    void appendNode(FrameGraphNode *node);
+    void appendNode(Qt3DCore::QNodeId id, FrameGraphNode *node);
     FrameGraphNode* lookupNode(Qt3DCore::QNodeId id) const;
     void releaseNode(Qt3DCore::QNodeId id);
 
diff --git a/src/render/framegraph/framegraphnode_p.h b/src/render/framegraph/framegraphnode_p.h
index 2f924bfa0..e4ab5784c 100644
--- a/src/render/framegraph/framegraphnode_p.h
+++ b/src/render/framegraph/framegraphnode_p.h
@@ -165,7 +165,7 @@ protected:
                 QFrameGraphNode *parentFGNode = static_cast<QFrameGraphNode *>(n)->parentFrameGraphNode();
                 if (parentFGNode)
                     backend->setParentId(parentFGNode->id());
-                m_manager->appendNode(backend);
+                m_manager->appendNode(backend->peerId(), backend);
                 return backend;
             }
             return static_cast<Backend *>(m_manager->lookupNode(n->id()));
@@ -181,7 +181,7 @@ protected:
             backend->setRenderer(m_renderer);
             backend->setEnabled(change->isNodeEnabled());
             backend->setParentId(change->parentId());
-            m_manager->appendNode(backend);
+            m_manager->appendNode(change->subjectId(), backend);
             return backend;
         }
         return static_cast<Backend *>(m_manager->lookupNode(change->subjectId()));
diff --git a/tests/auto/render/framegraphnode/tst_framegraphnode.cpp b/tests/auto/render/framegraphnode/tst_framegraphnode.cpp
index 33e9e31ad..1651a94e3 100644
--- a/tests/auto/render/framegraphnode/tst_framegraphnode.cpp
+++ b/tests/auto/render/framegraphnode/tst_framegraphnode.cpp
@@ -101,7 +101,7 @@ private Q_SLOTS:
         const Qt3DCore::QNodeId childId = Qt3DCore::QNodeId::createId();
         QScopedPointer<Qt3DRender::Render::FrameGraphNode> c(new MyFrameGraphNode());
         setIdInternal(c.data(), childId);
-        manager->appendNode(c.data());
+        manager->appendNode(childId, c.data());
         n->appendChildId(childId);
         // THEN
         QCOMPARE(n->childrenIds().count(), 1);
@@ -124,8 +124,8 @@ private Q_SLOTS:
         setIdInternal(parent1, parentId);
         setIdInternal(child, childId);
 
-        manager->appendNode(parent1);
-        manager->appendNode(child);
+        manager->appendNode(parentId, parent1);
+        manager->appendNode(childId, child);
 
         parent1->setFrameGraphManager(manager.data());
         child->setFrameGraphManager(manager.data());