Update QRenderSettings to use direct sync

Change-Id: I610d06ac788f839653055a80f78c3f3be5ca68f8
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

4 files changed, 15 insertions, 1 deletions

diff --git a/src/render/frontend/qrenderaspect.cpp b/src/render/frontend/qrenderaspect.cpp
index 2e90375ae..afe9cb1df 100644
--- a/src/render/frontend/qrenderaspect.cpp
+++ b/src/render/frontend/qrenderaspect.cpp
@@ -262,7 +262,7 @@ void QRenderAspectPrivate::registerBackendTypes()
     q->registerBackendType<QSceneLoader, true>(QSharedPointer<Render::RenderSceneFunctor>::create(m_renderer, m_nodeManagers->sceneManager()));
     q->registerBackendType<QRenderTarget, true>(QSharedPointer<Render::NodeFunctor<Render::RenderTarget, Render::RenderTargetManager> >::create(m_renderer));
     q->registerBackendType<QRenderTargetOutput, true>(QSharedPointer<Render::NodeFunctor<Render::RenderTargetOutput, Render::AttachmentManager> >::create(m_renderer));
-    q->registerBackendType<QRenderSettings>(QSharedPointer<Render::RenderSettingsFunctor>::create(m_renderer));
+    q->registerBackendType<QRenderSettings, true>(QSharedPointer<Render::RenderSettingsFunctor>::create(m_renderer));
     q->registerBackendType<QRenderState>(QSharedPointer<Render::NodeFunctor<Render::RenderStateNode, Render::RenderStateManager> >::create(m_renderer));
 
     // Geometry + Compute
diff --git a/src/render/frontend/qrendersettings.cpp b/src/render/frontend/qrendersettings.cpp
index 6ddef6e8a..d106e4205 100644
--- a/src/render/frontend/qrendersettings.cpp
+++ b/src/render/frontend/qrendersettings.cpp
@@ -96,6 +96,11 @@ void QRenderSettingsPrivate::init()
                      q, SLOT(_q_onWorldSpaceToleranceChanged(float)));
 }
 
+void QRenderSettingsPrivate::invalidateFrame()
+{
+    update();
+}
+
 /*! \internal */
 void QRenderSettingsPrivate::_q_onPickingMethodChanged(QPickingSettings::PickMethod pickMethod)
 {
@@ -156,6 +161,12 @@ QPickingSettings *QRenderSettings::pickingSettings()
     return &(d->m_pickingSettings);
 }
 
+const QPickingSettings *QRenderSettings::pickingSettings() const
+{
+    Q_D(const QRenderSettings);
+    return &(d->m_pickingSettings);
+}
+
 /*!
     \qmlproperty FrameGraphNode RenderSettings::activeFrameGraph
 
diff --git a/src/render/frontend/qrendersettings.h b/src/render/frontend/qrendersettings.h
index 9d2baa58b..c8771a8fa 100644
--- a/src/render/frontend/qrendersettings.h
+++ b/src/render/frontend/qrendersettings.h
@@ -71,6 +71,7 @@ public:
     Q_ENUM(RenderPolicy) // LCOV_EXCL_LINE
 
     QPickingSettings* pickingSettings();
+    const QPickingSettings* pickingSettings() const;
     QFrameGraphNode *activeFrameGraph() const;
     RenderPolicy renderPolicy() const;
 
diff --git a/src/render/frontend/qrendersettings_p.h b/src/render/frontend/qrendersettings_p.h
index f91397bd2..88f91810a 100644
--- a/src/render/frontend/qrendersettings_p.h
+++ b/src/render/frontend/qrendersettings_p.h
@@ -71,6 +71,8 @@ public:
     QFrameGraphNode *m_activeFrameGraph;
     QRenderSettings::RenderPolicy m_renderPolicy;
 
+    void invalidateFrame();
+
     void _q_onPickingMethodChanged(QPickingSettings::PickMethod pickMethod);
     void _q_onPickResultModeChanged(QPickingSettings::PickResultMode pickResultMode);
     void _q_onFaceOrientationPickingModeChanged(QPickingSettings::FaceOrientationPickingMode faceOrientationPickingMode);