Update QBlitFramebuffer to use direct sync

Change-Id: I1d875e8581bfd3485f7baf5ee1e76ea7aafc398e
Reviewed-by: Mike Krus <mike.krus@kdab.com>

5 files changed, 79 insertions, 98 deletions

diff --git a/src/render/framegraph/blitframebuffer.cpp b/src/render/framegraph/blitframebuffer.cpp
index 342594baf..c45d3fdbc 100644
--- a/src/render/framegraph/blitframebuffer.cpp
+++ b/src/render/framegraph/blitframebuffer.cpp
@@ -60,48 +60,44 @@ BlitFramebuffer::BlitFramebuffer()
 {
 }
 
-void BlitFramebuffer::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
+void BlitFramebuffer::syncFromFrontEnd(const Qt3DCore::QNode *frontEnd, bool firstTime)
 {
-    if (e->type() == PropertyUpdated) {
-        QPropertyUpdatedChangePtr propertyChange = qSharedPointerCast<QPropertyUpdatedChange>(e);
-        if (propertyChange->propertyName() == QByteArrayLiteral("sourceRenderTarget")) {
-            m_sourceRenderTargetId = propertyChange->value().value<QNodeId>();
-            markDirty(AbstractRenderer::FrameGraphDirty);
-        } else if (propertyChange->propertyName() == QByteArrayLiteral("destinationRenderTarget")) {
-            m_destinationRenderTargetId = propertyChange->value().value<QNodeId>();
-            markDirty(AbstractRenderer::FrameGraphDirty);
-        } else if (propertyChange->propertyName() == QByteArrayLiteral("sourceRect")) {
-            m_sourceRect = propertyChange->value().toRect();
-            markDirty(AbstractRenderer::FrameGraphDirty);
-        } else if (propertyChange->propertyName() == QByteArrayLiteral("destinationRect")) {
-            m_destinationRect = propertyChange->value().toRect();
-            markDirty(AbstractRenderer::FrameGraphDirty);
-        } else if (propertyChange->propertyName() == QByteArrayLiteral("sourceAttachmentPoint")) {
-            m_sourceAttachmentPoint = propertyChange->value().value<Qt3DRender::QRenderTargetOutput::AttachmentPoint>();
-            markDirty(AbstractRenderer::FrameGraphDirty);
-        } else if (propertyChange->propertyName() == QByteArrayLiteral("destinationAttachmentPoint")) {
-            m_destinationAttachmentPoint = propertyChange->value().value<Qt3DRender::QRenderTargetOutput::AttachmentPoint>();
-            markDirty(AbstractRenderer::FrameGraphDirty);
-        } else if (propertyChange->propertyName() == QByteArrayLiteral("interpolationMethod")) {
-            m_interpolationMethod = propertyChange->value().value<QBlitFramebuffer::InterpolationMethod>();
-            markDirty(AbstractRenderer::FrameGraphDirty);
-        }
-    }
-    FrameGraphNode::sceneChangeEvent(e);
-}
+    const QBlitFramebuffer *node = qobject_cast<const QBlitFramebuffer *>(frontEnd);
+    if (!node)
+        return;
 
-void BlitFramebuffer::initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change)
-{
-    FrameGraphNode::initializeFromPeer(change);
-    const auto typedChange = qSharedPointerCast<Qt3DCore::QNodeCreatedChange<QBlitFramebufferData> >(change);
-    const auto &data = typedChange->data;
-    m_sourceRect = data.m_sourceRect;
-    m_destinationRect = data.m_destinationRect;
-    m_sourceRenderTargetId = data.m_sourceRenderTargetId;
-    m_destinationRenderTargetId = data.m_destinationRenderTargetId;
-    m_sourceAttachmentPoint = data.m_sourceAttachmentPoint;
-    m_destinationAttachmentPoint = data.m_destinationAttachmentPoint;
-    m_interpolationMethod = data.m_interpolationMethod;
+    FrameGraphNode::syncFromFrontEnd(frontEnd, firstTime);
+
+    if (node->sourceRect().toRect() != m_sourceRect) {
+        m_sourceRect = node->sourceRect().toRect();
+        markDirty(AbstractRenderer::FrameGraphDirty);
+    }
+    if (node->destinationRect().toRect() != m_destinationRect) {
+        m_destinationRect = node->destinationRect().toRect();
+        markDirty(AbstractRenderer::FrameGraphDirty);
+    }
+    if (node->sourceAttachmentPoint() != m_sourceAttachmentPoint) {
+        m_sourceAttachmentPoint = node->sourceAttachmentPoint();
+        markDirty(AbstractRenderer::FrameGraphDirty);
+    }
+    if (node->destinationAttachmentPoint() != m_destinationAttachmentPoint) {
+        m_destinationAttachmentPoint = node->destinationAttachmentPoint();
+        markDirty(AbstractRenderer::FrameGraphDirty);
+    }
+    if (node->interpolationMethod() != m_interpolationMethod) {
+        m_interpolationMethod = node->interpolationMethod();
+        markDirty(AbstractRenderer::FrameGraphDirty);
+    }
+    const QNodeId destinationNodeId = qIdForNode(node->destination());
+    if (destinationNodeId != m_destinationRenderTargetId) {
+        m_destinationRenderTargetId = destinationNodeId;
+        markDirty(AbstractRenderer::FrameGraphDirty);
+    }
+    const QNodeId sourceNodeId = qIdForNode(node->source());
+    if (sourceNodeId != m_sourceRenderTargetId) {
+        m_sourceRenderTargetId = sourceNodeId;
+        markDirty(AbstractRenderer::FrameGraphDirty);
+    }
 }
 
 Qt3DRender::QRenderTargetOutput::AttachmentPoint BlitFramebuffer::destinationAttachmentPoint() const
diff --git a/src/render/framegraph/blitframebuffer_p.h b/src/render/framegraph/blitframebuffer_p.h
index 796c223ca..fa9ddacd9 100644
--- a/src/render/framegraph/blitframebuffer_p.h
+++ b/src/render/framegraph/blitframebuffer_p.h
@@ -65,7 +65,7 @@ class Q_AUTOTEST_EXPORT BlitFramebuffer : public FrameGraphNode
 public:
     BlitFramebuffer();
 
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
+    void syncFromFrontEnd(const Qt3DCore::QNode *frontEnd, bool firstTime) override;
 
     Qt3DCore::QNodeId sourceRenderTargetId() const;
 
@@ -82,8 +82,6 @@ public:
     QBlitFramebuffer::InterpolationMethod interpolationMethod() const;
 
 private:
-    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) final;
-
     Qt3DCore::QNodeId m_sourceRenderTargetId;
     Qt3DCore::QNodeId m_destinationRenderTargetId;
     QRect m_sourceRect;
diff --git a/src/render/framegraph/qblitframebuffer.cpp b/src/render/framegraph/qblitframebuffer.cpp
index d0e1bdbf3..bf9e547cb 100644
--- a/src/render/framegraph/qblitframebuffer.cpp
+++ b/src/render/framegraph/qblitframebuffer.cpp
@@ -364,6 +364,7 @@ void QBlitFramebuffer::setDestination(QRenderTarget *destination)
     }
 }
 
+// TO DO Qt6: convert QRectF to QRect
 /*!
     Sets the source rectangle to \a inputRect. The coordinates are assumed to
     follow the normal Qt coordinate system, meaning Y runs from top to bottom.
diff --git a/src/render/frontend/qrenderaspect.cpp b/src/render/frontend/qrenderaspect.cpp
index d8664308f..1305fa32d 100644
--- a/src/render/frontend/qrenderaspect.cpp
+++ b/src/render/frontend/qrenderaspect.cpp
@@ -313,7 +313,7 @@ void QRenderAspectPrivate::registerBackendTypes()
     q->registerBackendType<QBufferCapture, true>(QSharedPointer<Render::FrameGraphNodeFunctor<Render::BufferCapture, QBufferCapture> >::create(m_renderer));
     q->registerBackendType<QMemoryBarrier, true>(QSharedPointer<Render::FrameGraphNodeFunctor<Render::MemoryBarrier, QMemoryBarrier> >::create(m_renderer));
     q->registerBackendType<QProximityFilter, true>(QSharedPointer<Render::FrameGraphNodeFunctor<Render::ProximityFilter, QProximityFilter> >::create(m_renderer));
-    q->registerBackendType<QBlitFramebuffer>(QSharedPointer<Render::FrameGraphNodeFunctor<Render::BlitFramebuffer, QBlitFramebuffer> >::create(m_renderer));
+    q->registerBackendType<QBlitFramebuffer, true>(QSharedPointer<Render::FrameGraphNodeFunctor<Render::BlitFramebuffer, QBlitFramebuffer> >::create(m_renderer));
     q->registerBackendType<QSetFence>(QSharedPointer<Render::FrameGraphNodeFunctor<Render::SetFence, QSetFence> >::create(m_renderer));
     q->registerBackendType<QWaitFence>(QSharedPointer<Render::FrameGraphNodeFunctor<Render::WaitFence, QWaitFence> >::create(m_renderer));
     q->registerBackendType<QNoPicking>(QSharedPointer<Render::FrameGraphNodeFunctor<Render::NoPicking, QNoPicking> >::create(m_renderer));
diff --git a/tests/auto/render/blitframebuffer/tst_blitframebuffer.cpp b/tests/auto/render/blitframebuffer/tst_blitframebuffer.cpp
index b10c2e88e..f7a6ce214 100644
--- a/tests/auto/render/blitframebuffer/tst_blitframebuffer.cpp
+++ b/tests/auto/render/blitframebuffer/tst_blitframebuffer.cpp
@@ -78,7 +78,7 @@ private Q_SLOTS:
             // WHEN
             Qt3DRender::Render::BlitFramebuffer backendBlitFramebuffer;
             backendBlitFramebuffer.setRenderer(&renderer);
-            simulateInitialization(&blitFramebuffer, &backendBlitFramebuffer);
+            simulateInitializationSync(&blitFramebuffer, &backendBlitFramebuffer);
 
             // THEN
             QCOMPARE(backendBlitFramebuffer.isEnabled(), true);
@@ -98,7 +98,7 @@ private Q_SLOTS:
             Qt3DRender::Render::BlitFramebuffer backendBlitFramebuffer;
             backendBlitFramebuffer.setRenderer(&renderer);
             blitFramebuffer.setEnabled(false);
-            simulateInitialization(&blitFramebuffer, &backendBlitFramebuffer);
+            simulateInitializationSync(&blitFramebuffer, &backendBlitFramebuffer);
 
             // THEN
             QCOMPARE(backendBlitFramebuffer.peerId(), blitFramebuffer.id());
@@ -111,98 +111,84 @@ private Q_SLOTS:
     {
         // GIVEN
         Qt3DRender::Render::BlitFramebuffer backendBlitFramebuffer;
+        Qt3DRender::QBlitFramebuffer blitFramebuffer;
         TestRenderer renderer;
         backendBlitFramebuffer.setRenderer(&renderer);
+        simulateInitializationSync(&blitFramebuffer, &backendBlitFramebuffer);
 
         {
-             // WHEN
-             const bool newValue = false;
-             const auto change = Qt3DCore::QPropertyUpdatedChangePtr::create(Qt3DCore::QNodeId());
-             change->setPropertyName("enabled");
-             change->setValue(newValue);
-             backendBlitFramebuffer.sceneChangeEvent(change);
-
-             // THEN
+            // WHEN
+            const bool newValue = false;
+            blitFramebuffer.setEnabled(newValue);
+            backendBlitFramebuffer.syncFromFrontEnd(&blitFramebuffer, false);
+
+            // THEN
             QCOMPARE(backendBlitFramebuffer.isEnabled(), newValue);
             QVERIFY(renderer.dirtyBits() & Qt3DRender::Render::AbstractRenderer::FrameGraphDirty);
             renderer.clearDirtyBits(Qt3DRender::Render::AbstractRenderer::AllDirty);
         }
         {
-             // WHEN
-            const Qt3DRender::QRenderTarget sourceRenderTarget;
-            const Qt3DCore::QNodeId newValue = sourceRenderTarget.id();
-             const auto change = Qt3DCore::QPropertyUpdatedChangePtr::create(Qt3DCore::QNodeId());
-             change->setPropertyName("sourceRenderTarget");
-             change->setValue(QVariant::fromValue(newValue));
-             backendBlitFramebuffer.sceneChangeEvent(change);
-
-             // THEN
-            QCOMPARE(backendBlitFramebuffer.sourceRenderTargetId(), newValue);
+            // WHEN
+            Qt3DRender::QRenderTarget sourceRenderTarget;
+            blitFramebuffer.setSource(&sourceRenderTarget);
+            backendBlitFramebuffer.syncFromFrontEnd(&blitFramebuffer, false);
+
+            // THEN
+            QCOMPARE(backendBlitFramebuffer.sourceRenderTargetId(), sourceRenderTarget.id());
             QVERIFY(renderer.dirtyBits() & Qt3DRender::Render::AbstractRenderer::FrameGraphDirty);
             renderer.clearDirtyBits(Qt3DRender::Render::AbstractRenderer::AllDirty);
         }
         {
-             // WHEN
-            const Qt3DRender::QRenderTarget destinationRenderTarget;
-            const Qt3DCore::QNodeId newValue = destinationRenderTarget.id();
-             const auto change = Qt3DCore::QPropertyUpdatedChangePtr::create(Qt3DCore::QNodeId());
-             change->setPropertyName("destinationRenderTarget");
-             change->setValue(QVariant::fromValue(newValue));
-             backendBlitFramebuffer.sceneChangeEvent(change);
-
-             // THEN
-            QCOMPARE(backendBlitFramebuffer.destinationRenderTargetId(), newValue);
+            // WHEN
+            Qt3DRender::QRenderTarget destinationRenderTarget;
+            blitFramebuffer.setDestination(&destinationRenderTarget);
+            backendBlitFramebuffer.syncFromFrontEnd(&blitFramebuffer, false);
+
+            // THEN
+            QCOMPARE(backendBlitFramebuffer.destinationRenderTargetId(), destinationRenderTarget.id());
             QVERIFY(renderer.dirtyBits() & Qt3DRender::Render::AbstractRenderer::FrameGraphDirty);
             renderer.clearDirtyBits(Qt3DRender::Render::AbstractRenderer::AllDirty);
         }
         {
-             // WHEN
+            // WHEN
             const auto newValue = QRect(0,0,1,1);
-             const auto change = Qt3DCore::QPropertyUpdatedChangePtr::create(Qt3DCore::QNodeId());
-             change->setPropertyName("sourceRect");
-             change->setValue(QVariant::fromValue(newValue));
-             backendBlitFramebuffer.sceneChangeEvent(change);
+            blitFramebuffer.setSourceRect(newValue);
+            backendBlitFramebuffer.syncFromFrontEnd(&blitFramebuffer, false);
 
-             // THEN
+            // THEN
             QCOMPARE(backendBlitFramebuffer.sourceRect(), newValue);
             QVERIFY(renderer.dirtyBits() & Qt3DRender::Render::AbstractRenderer::FrameGraphDirty);
             renderer.clearDirtyBits(Qt3DRender::Render::AbstractRenderer::AllDirty);
         }
         {
-             // WHEN
+            // WHEN
             const auto newValue = QRect(0,0,1,1);
-             const auto change = Qt3DCore::QPropertyUpdatedChangePtr::create(Qt3DCore::QNodeId());
-             change->setPropertyName("destinationRect");
-             change->setValue(QVariant::fromValue(newValue));
-             backendBlitFramebuffer.sceneChangeEvent(change);
+            blitFramebuffer.setDestinationRect(newValue);
+            backendBlitFramebuffer.syncFromFrontEnd(&blitFramebuffer, false);
 
-             // THEN
+            // THEN
             QCOMPARE(backendBlitFramebuffer.destinationRect(), newValue);
             QVERIFY(renderer.dirtyBits() & Qt3DRender::Render::AbstractRenderer::FrameGraphDirty);
             renderer.clearDirtyBits(Qt3DRender::Render::AbstractRenderer::AllDirty);
         }
         {
-             // WHEN
+            // WHEN
             const auto newValue = Qt3DRender::QRenderTargetOutput::Color1;
-             const auto change = Qt3DCore::QPropertyUpdatedChangePtr::create(Qt3DCore::QNodeId());
-             change->setPropertyName("sourceAttachmentPoint");
-             change->setValue(QVariant::fromValue(newValue));
-             backendBlitFramebuffer.sceneChangeEvent(change);
+            blitFramebuffer.setSourceAttachmentPoint(newValue);
+            backendBlitFramebuffer.syncFromFrontEnd(&blitFramebuffer, false);
 
-             // THEN
+            // THEN
             QCOMPARE(backendBlitFramebuffer.sourceAttachmentPoint(), newValue);
             QVERIFY(renderer.dirtyBits() & Qt3DRender::Render::AbstractRenderer::FrameGraphDirty);
             renderer.clearDirtyBits(Qt3DRender::Render::AbstractRenderer::AllDirty);
         }
         {
-             // WHEN
+            // WHEN
             const auto newValue = Qt3DRender::QRenderTargetOutput::Color1;
-             const auto change = Qt3DCore::QPropertyUpdatedChangePtr::create(Qt3DCore::QNodeId());
-             change->setPropertyName("destinationAttachmentPoint");
-             change->setValue(QVariant::fromValue(newValue));
-             backendBlitFramebuffer.sceneChangeEvent(change);
+            blitFramebuffer.setDestinationAttachmentPoint(newValue);
+            backendBlitFramebuffer.syncFromFrontEnd(&blitFramebuffer, false);
 
-             // THEN
+            // THEN
             QCOMPARE(backendBlitFramebuffer.destinationAttachmentPoint(), newValue);
             QVERIFY(renderer.dirtyBits() & Qt3DRender::Render::AbstractRenderer::FrameGraphDirty);
             renderer.clearDirtyBits(Qt3DRender::Render::AbstractRenderer::AllDirty);