13 files changed, 131 insertions, 160 deletions

diff --git a/src/render/materialsystem/qeffect.cpp b/src/render/materialsystem/qeffect.cpp
index 35f4d64a9..8637a92d4 100644
--- a/src/render/materialsystem/qeffect.cpp
+++ b/src/render/materialsystem/qeffect.cpp
@@ -65,6 +65,8 @@ QEffectPrivate::QEffectPrivate()
 
     An QEffect instance should be shared among several QMaterial instances when possible.
 
+    \note QEffect node can not be disabled.
+
     \code
     QEffect *effect = new QEffect();
 
@@ -111,6 +113,8 @@ QEffectPrivate::QEffectPrivate()
     A Parameter defined on an Effect is overridden by a QParameter (of the same
     name) defined in a Material, TechniqueFilter, RenderPassFilter.
 
+    \note Effect node can not be disabled.
+
     \code
     Effect {
         id: effect
@@ -188,7 +192,7 @@ void QEffect::addParameter(QParameter *parameter)
         if (!parameter->parent())
             parameter->setParent(this);
 
-        d->update();
+        d->updateNode(parameter, "parameter", Qt3DCore::PropertyValueAdded);
     }
 }
 
@@ -202,7 +206,7 @@ void QEffect::removeParameter(QParameter *parameter)
     d->m_parameters.removeOne(parameter);
     // Remove bookkeeping connection
     d->unregisterDestructionHelper(parameter);
-    d->update();
+    d->updateNode(parameter, "parameter", Qt3DCore::PropertyValueRemoved);
 }
 
 /*!
@@ -234,7 +238,7 @@ void QEffect::addTechnique(QTechnique *t)
         if (!t->parent())
             t->setParent(this);
 
-        d->update();
+        d->updateNode(t, "technique", Qt3DCore::PropertyValueAdded);
     }
 }
 
@@ -245,7 +249,7 @@ void QEffect::removeTechnique(QTechnique *t)
 {
     Q_D(QEffect);
     if (t)
-        d->update();
+        d->updateNode(t, "technique", Qt3DCore::PropertyValueRemoved);
     d->m_techniques.removeOne(t);
     // Remove bookkeeping connection
     d->unregisterDestructionHelper(t);
diff --git a/src/render/materialsystem/qfilterkey.cpp b/src/render/materialsystem/qfilterkey.cpp
index dc968400b..2105da987 100644
--- a/src/render/materialsystem/qfilterkey.cpp
+++ b/src/render/materialsystem/qfilterkey.cpp
@@ -60,6 +60,8 @@ QFilterKeyPrivate::QFilterKeyPrivate()
 
     Filter keys are used by QTechnique and QRenderPass to specify at which stage of rendering the
     technique or the render pass is used.
+
+    \note QFilterKey node can not be disabled.
 */
 
 /*!
@@ -73,6 +75,8 @@ QFilterKeyPrivate::QFilterKeyPrivate()
     A FilterKey is a storage type for filter key and value pair.
     Filter keys are used by Technique and RenderPass to specify at which stage of rendering the
     technique or the render pass is used.
+
+    \note FilterKey node can not be disabled.
 */
 
 QFilterKey::QFilterKey(QNode *parent)
diff --git a/src/render/materialsystem/qmaterial.cpp b/src/render/materialsystem/qmaterial.cpp
index db286de6b..edd227500 100644
--- a/src/render/materialsystem/qmaterial.cpp
+++ b/src/render/materialsystem/qmaterial.cpp
@@ -272,7 +272,7 @@ void QMaterial::addParameter(QParameter *parameter)
         if (!parameter->parent())
             parameter->setParent(this);
 
-        d->update();
+        d->updateNode(parameter, "parameter", Qt3DCore::PropertyValueAdded);
     }
 }
 
@@ -283,7 +283,7 @@ void QMaterial::removeParameter(QParameter *parameter)
 {
     Q_ASSERT(parameter);
     Q_D(QMaterial);
-    d->update();
+    d->updateNode(parameter, "parameter", Qt3DCore::PropertyValueRemoved);
     d->m_parameters.removeOne(parameter);
 }
 
diff --git a/src/render/materialsystem/qparameter.cpp b/src/render/materialsystem/qparameter.cpp
index 77eda8c8e..969882564 100644
--- a/src/render/materialsystem/qparameter.cpp
+++ b/src/render/materialsystem/qparameter.cpp
@@ -76,6 +76,8 @@
     \note when the targeted uniform is an array, the name should be the name
     of the uniform with [0] appended to it.
 
+    \note Parameter node can not be disabled.
+
     \code
     Parameter {
         name: "diffuseValues[0]"
@@ -138,6 +140,8 @@
     \note when the targeted uniform is an array, the name should be the name
     of the uniform with [0] appended to it.
 
+    \note QParameter node can not be disabled.
+
     \code
     QParameter *param = new QParameter();
     QVariantList values = QVariantList() << 0.0f << 1.0f << 2.0f << 3.0f << 4.0f << 883.0f << 1340.0f << 1584.0f;
diff --git a/src/render/materialsystem/qrenderpass.cpp b/src/render/materialsystem/qrenderpass.cpp
index e9dd50325..dcb831b13 100644
--- a/src/render/materialsystem/qrenderpass.cpp
+++ b/src/render/materialsystem/qrenderpass.cpp
@@ -274,7 +274,7 @@ void QRenderPass::addFilterKey(QFilterKey *filterKey)
         if (!filterKey->parent())
             filterKey->setParent(this);
 
-        d->update();
+        d->updateNode(filterKey, "filterKeys", Qt3DCore::PropertyValueAdded);
     }
 }
 
@@ -285,7 +285,7 @@ void QRenderPass::removeFilterKey(QFilterKey *filterKey)
 {
     Q_ASSERT(filterKey);
     Q_D(QRenderPass);
-    d->update();
+    d->updateNode(filterKey, "filterKeys", Qt3DCore::PropertyValueRemoved);
     d->m_filterKeyList.removeOne(filterKey);
     // Remove bookkeeping connection
     d->unregisterDestructionHelper(filterKey);
@@ -322,7 +322,7 @@ void QRenderPass::addRenderState(QRenderState *state)
         if (!state->parent())
             state->setParent(this);
 
-        d->update();
+        d->updateNode(state, "renderState", Qt3DCore::PropertyValueAdded);
     }
 }
 
@@ -333,7 +333,7 @@ void QRenderPass::removeRenderState(QRenderState *state)
 {
     Q_ASSERT(state);
     Q_D(QRenderPass);
-    d->update();
+    d->updateNode(state, "renderState", Qt3DCore::PropertyValueRemoved);
     d->m_renderStates.removeOne(state);
     // Remove bookkeeping connection
     d->unregisterDestructionHelper(state);
@@ -369,7 +369,7 @@ void QRenderPass::addParameter(QParameter *parameter)
         if (!parameter->parent())
             parameter->setParent(this);
 
-        d->update();
+        d->updateNode(parameter, "parameter", Qt3DCore::PropertyValueAdded);
     }
 }
 
@@ -380,7 +380,7 @@ void QRenderPass::removeParameter(QParameter *parameter)
 {
     Q_ASSERT(parameter);
     Q_D(QRenderPass);
-    d->update();
+    d->updateNode(parameter, "parameter", Qt3DCore::PropertyValueRemoved);
     d->m_parameters.removeOne(parameter);
     // Remove bookkeeping connection
     d->unregisterDestructionHelper(parameter);
diff --git a/src/render/materialsystem/qshaderprogrambuilder.cpp b/src/render/materialsystem/qshaderprogrambuilder.cpp
index cafe23ee4..6613661d1 100644
--- a/src/render/materialsystem/qshaderprogrambuilder.cpp
+++ b/src/render/materialsystem/qshaderprogrambuilder.cpp
@@ -79,6 +79,47 @@ QShaderProgramBuilderPrivate::QShaderProgramBuilderPrivate()
 {
 }
 
+void QShaderProgramBuilderPrivate::setShaderCode(const QByteArray &code, QShaderProgram::ShaderType type)
+{
+    Q_Q(QShaderProgramBuilder);
+    const bool blocked = q->blockNotifications(true);
+
+    switch (type) {
+    case QShaderProgram::Vertex: {
+        m_vertexShaderCode = code;
+        emit q->vertexShaderCodeChanged(m_vertexShaderCode);
+        break;
+    }
+    case QShaderProgram::Fragment:{
+        m_fragmentShaderCode = code;
+        emit q->fragmentShaderCodeChanged(m_fragmentShaderCode);
+        break;
+    }
+    case QShaderProgram::Geometry: {
+        m_geometryShaderCode = code;
+        emit q->geometryShaderCodeChanged(m_geometryShaderCode);
+        break;
+    }
+    case QShaderProgram::Compute: {
+        m_computeShaderCode = code;
+        emit q->computeShaderCodeChanged(m_computeShaderCode);
+        break;
+    }
+    case QShaderProgram::TessellationControl: {
+        m_tessControlShaderCode = code;
+        emit q->tessellationControlShaderCodeChanged(m_tessControlShaderCode);
+        break;
+    }
+    case QShaderProgram::TessellationEvaluation: {
+        m_tessEvalShaderCode = code;
+        emit q->tessellationEvaluationShaderCodeChanged(m_tessEvalShaderCode);
+        break;
+    }
+    }
+
+    q->blockNotifications(blocked);
+}
+
 QShaderProgramBuilder::QShaderProgramBuilder(QNode *parent)
     : QNode(*new QShaderProgramBuilderPrivate, parent)
 {
@@ -94,53 +135,6 @@ QShaderProgramBuilder::QShaderProgramBuilder(QShaderProgramBuilderPrivate &dd, Q
 {
 }
 
-void QShaderProgramBuilder::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change)
-{
-    Q_D(QShaderProgramBuilder);
-    if (change->type() == Qt3DCore::PropertyUpdated) {
-        const Qt3DCore::QPropertyUpdatedChangePtr e = qSharedPointerCast<Qt3DCore::QPropertyUpdatedChange>(change);
-        if (e->propertyName() == QByteArrayLiteral("generatedShaderCode")) {
-            const bool blocked = blockNotifications(true);
-            const QPair<int, QByteArray> data = e->value().value<QPair<int, QByteArray>>();
-
-            switch (data.first) {
-            case QShaderProgram::Vertex: {
-                d->m_vertexShaderCode = data.second;
-                emit vertexShaderCodeChanged(d->m_vertexShaderCode);
-                break;
-            }
-            case QShaderProgram::Fragment:{
-                d->m_fragmentShaderCode = data.second;
-                emit fragmentShaderCodeChanged(d->m_fragmentShaderCode);
-                break;
-            }
-            case QShaderProgram::Geometry: {
-                d->m_geometryShaderCode = data.second;
-                emit geometryShaderCodeChanged(d->m_geometryShaderCode);
-                break;
-            }
-            case QShaderProgram::Compute: {
-                d->m_computeShaderCode = data.second;
-                emit computeShaderCodeChanged(d->m_computeShaderCode);
-                break;
-            }
-            case QShaderProgram::TessellationControl: {
-                d->m_tessControlShaderCode = data.second;
-                emit tessellationControlShaderCodeChanged(d->m_tessControlShaderCode);
-                break;
-            }
-            case QShaderProgram::TessellationEvaluation: {
-                d->m_tessEvalShaderCode = data.second;
-                emit tessellationEvaluationShaderCodeChanged(d->m_tessEvalShaderCode);
-                break;
-            }
-            }
-
-            blockNotifications(blocked);
-        }
-    }
-}
-
 /*!
     \qmlproperty string ShaderProgramBuilder::shaderProgram
 
diff --git a/src/render/materialsystem/qshaderprogrambuilder.h b/src/render/materialsystem/qshaderprogrambuilder.h
index 184093730..5dc6b54ff 100644
--- a/src/render/materialsystem/qshaderprogrambuilder.h
+++ b/src/render/materialsystem/qshaderprogrambuilder.h
@@ -117,7 +117,6 @@ Q_SIGNALS:
 
 protected:
     explicit QShaderProgramBuilder(QShaderProgramBuilderPrivate &dd, Qt3DCore::QNode *parent = nullptr);
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) override;
 
 private:
     Q_DECLARE_PRIVATE(QShaderProgramBuilder)
diff --git a/src/render/materialsystem/qshaderprogrambuilder_p.h b/src/render/materialsystem/qshaderprogrambuilder_p.h
index 2ac765a1d..22f8e6e58 100644
--- a/src/render/materialsystem/qshaderprogrambuilder_p.h
+++ b/src/render/materialsystem/qshaderprogrambuilder_p.h
@@ -52,6 +52,8 @@
 //
 
 #include <private/qnode_p.h>
+#include <Qt3DRender/private/qt3drender_global_p.h>
+#include <Qt3DRender/qshaderprogram.h>
 #include <Qt3DRender/qshaderprogrambuilder.h>
 
 #include <QtCore/qurl.h>
@@ -60,7 +62,7 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
 
-class QShaderProgramBuilderPrivate : public Qt3DCore::QNodePrivate
+class Q_3DRENDERSHARED_PRIVATE_EXPORT QShaderProgramBuilderPrivate : public Qt3DCore::QNodePrivate
 {
 public:
     QShaderProgramBuilderPrivate();
@@ -80,6 +82,8 @@ public:
     QByteArray m_geometryShaderCode;
     QByteArray m_fragmentShaderCode;
     QByteArray m_computeShaderCode;
+
+    void setShaderCode(const QByteArray &code, QShaderProgram::ShaderType type);
 };
 
 struct QShaderProgramBuilderData
diff --git a/src/render/materialsystem/qtechnique.cpp b/src/render/materialsystem/qtechnique.cpp
index 2b96aa285..a9b7ca82b 100644
--- a/src/render/materialsystem/qtechnique.cpp
+++ b/src/render/materialsystem/qtechnique.cpp
@@ -87,6 +87,8 @@ QTechniquePrivate::~QTechniquePrivate()
     QSurfaceFormat::setDefaultFormat(). Setting the QSurfaceFormat on the view
     will likely have no effect on Qt3D related rendering.
 
+    \note Technique node can not be disabled.
+
     \qml
     Technique {
         id: gl3Technique
@@ -152,6 +154,8 @@ QTechniquePrivate::~QTechniquePrivate()
     QSurfaceFormat::setDefaultFormat(). Setting the QSurfaceFormat on the view
     will likely have no effect on Qt3D related rendering.
 
+    \note QTechnique node can not be disabled.
+
     \code
     QTechnique *gl3Technique = new QTechnique();
 
@@ -254,7 +258,7 @@ void QTechnique::addFilterKey(QFilterKey *filterKey)
         if (!filterKey->parent())
             filterKey->setParent(this);
 
-        d->update();
+        d->updateNode(filterKey, "filterKeys", Qt3DCore::PropertyValueAdded);
     }
 }
 
@@ -265,7 +269,7 @@ void QTechnique::removeFilterKey(QFilterKey *filterKey)
 {
     Q_ASSERT(filterKey);
     Q_D(QTechnique);
-    d->update();
+    d->updateNode(filterKey, "filterKeys", Qt3DCore::PropertyValueRemoved);
     d->m_filterKeys.removeOne(filterKey);
     // Remove bookkeeping connection
     d->unregisterDestructionHelper(filterKey);
@@ -301,7 +305,7 @@ void QTechnique::addParameter(QParameter *parameter)
         if (!parameter->parent())
             parameter->setParent(this);
 
-        d->update();
+        d->updateNode(parameter, "parameter", Qt3DCore::PropertyValueAdded);
     }
 }
 
@@ -312,7 +316,7 @@ void QTechnique::removeParameter(QParameter *parameter)
 {
     Q_ASSERT(parameter);
     Q_D(QTechnique);
-    d->update();
+    d->updateNode(parameter, "parameter", Qt3DCore::PropertyValueRemoved);
     d->m_parameters.removeOne(parameter);
     // Remove bookkeeping connection
     d->unregisterDestructionHelper(parameter);
@@ -338,7 +342,7 @@ void QTechnique::addRenderPass(QRenderPass *pass)
         if (!pass->parent())
             pass->setParent(this);
 
-        d->update();
+        d->updateNode(pass, "pass", Qt3DCore::PropertyValueAdded);
     }
 }
 
@@ -349,7 +353,7 @@ void QTechnique::removeRenderPass(QRenderPass *pass)
 {
     Q_ASSERT(pass);
     Q_D(QTechnique);
-    d->update();
+    d->updateNode(pass, "pass", Qt3DCore::PropertyValueAdded);
     d->m_renderPasses.removeOne(pass);
     // Remove bookkeeping connection
     d->unregisterDestructionHelper(pass);
diff --git a/src/render/materialsystem/shader.cpp b/src/render/materialsystem/shader.cpp
index f35fba9fa..58709b37e 100644
--- a/src/render/materialsystem/shader.cpp
+++ b/src/render/materialsystem/shader.cpp
@@ -64,6 +64,7 @@ Shader::Shader()
     , m_dna(0)
     , m_graphicsContext(nullptr)
     , m_status(QShaderProgram::NotReady)
+    , m_requiresFrontendSync(false)
 {
     m_shaderCode.resize(static_cast<int>(QShaderProgram::Compute) + 1);
 }
@@ -170,8 +171,9 @@ void Shader::setShaderCode(QShaderProgram::ShaderType type, const QByteArray &co
 
     m_shaderCode[type] = code;
     m_isLoaded = false;
-    setStatus(QShaderProgram::NotReady);
+    m_status = QShaderProgram::NotReady;
     updateDNA();
+    m_requiresFrontendSync = true;
     markDirty(AbstractRenderer::ShadersDirty);
 }
 
@@ -237,20 +239,13 @@ ShaderStorageBlock Shader::storageBlockForBlockName(const QString &blockName)
     return ShaderStorageBlock();
 }
 
-// To be called from a worker thread
-void Shader::submitPendingNotifications()
-{
-    const  QVector<Qt3DCore::QPropertyUpdatedChangePtr> notifications = std::move(m_pendingNotifications);
-    for (const Qt3DCore::QPropertyUpdatedChangePtr &notification : notifications)
-        notifyObservers(notification);
-}
-
 void Shader::prepareUniforms(ShaderParameterPack &pack)
 {
     const PackUniformHash &values = pack.uniforms();
 
     auto it = values.cbegin();
     const auto end = values.cend();
+
     while (it != end) {
         // Find if there's a uniform with the same name id
         for (const ShaderUniform &uniform : qAsConst(m_uniforms)) {
@@ -412,32 +407,21 @@ void Shader::initializeFromReference(const Shader &other)
     m_shaderStorageBlockNames = other.m_shaderStorageBlockNames;
     m_shaderStorageBlocks = other.m_shaderStorageBlocks;
     m_isLoaded = other.m_isLoaded;
-    setStatus(other.status());
-    setLog(other.log());
+    m_status = other.m_status;
+    m_log = other.m_log;
+    m_requiresFrontendSync = true;
 }
 
 void Shader::setLog(const QString &log)
 {
-    if (log != m_log) {
-        m_log = log;
-        Qt3DCore::QPropertyUpdatedChangePtr e = Qt3DCore::QPropertyUpdatedChangePtr::create(peerId());
-        e->setDeliveryFlags(Qt3DCore::QSceneChange::DeliverToAll);
-        e->setPropertyName("log");
-        e->setValue(QVariant::fromValue(m_log));
-        m_pendingNotifications.push_back(e);
-    }
+    m_log = log;
+    m_requiresFrontendSync = true;
 }
 
 void Shader::setStatus(QShaderProgram::Status status)
 {
-    if (status != m_status) {
-        m_status = status;
-        Qt3DCore::QPropertyUpdatedChangePtr e = Qt3DCore::QPropertyUpdatedChangePtr::create(peerId());
-        e->setDeliveryFlags(Qt3DCore::QSceneChange::DeliverToAll);
-        e->setPropertyName("status");
-        e->setValue(QVariant::fromValue(m_status));
-        m_pendingNotifications.push_back(e);
-    }
+    m_status = status;
+    m_requiresFrontendSync = true;
 }
 
 } // namespace Render
diff --git a/src/render/materialsystem/shader_p.h b/src/render/materialsystem/shader_p.h
index f8cdde3b7..fe1a401d9 100644
--- a/src/render/materialsystem/shader_p.h
+++ b/src/render/materialsystem/shader_p.h
@@ -122,8 +122,8 @@ public:
     inline QString log() const { return m_log; }
     inline QShaderProgram::Status status() const { return m_status; }
 
-    void submitPendingNotifications();
-    inline bool hasPendingNotifications() const { return !m_pendingNotifications.empty(); }
+    inline bool requiresFrontendSync() const { return m_requiresFrontendSync; }
+    inline void unsetRequiresFrontendSync() { m_requiresFrontendSync = false; }
 
 private:
     QVector<QString> m_uniformsNames;
@@ -155,8 +155,7 @@ private:
     QMetaObject::Connection m_contextConnection;
     QString m_log;
     QShaderProgram::Status m_status;
-
-    QVector<Qt3DCore::QPropertyUpdatedChangePtr> m_pendingNotifications;
+    bool m_requiresFrontendSync;
 
     void updateDNA();
 
diff --git a/src/render/materialsystem/shaderbuilder.cpp b/src/render/materialsystem/shaderbuilder.cpp
index 6116ca56b..23f1400c9 100644
--- a/src/render/materialsystem/shaderbuilder.cpp
+++ b/src/render/materialsystem/shaderbuilder.cpp
@@ -115,31 +115,6 @@ using namespace Qt3DCore;
 namespace Qt3DRender {
 namespace Render {
 
-
-namespace {
-
-QShaderProgram::ShaderType toQShaderProgramType(ShaderBuilder::ShaderType type)
-{
-    switch (type) {
-    case ShaderBuilder::ShaderType::Vertex:
-        return QShaderProgram::Vertex;
-    case ShaderBuilder::ShaderType::TessellationControl:
-        return QShaderProgram::TessellationControl;
-    case ShaderBuilder::ShaderType::TessellationEvaluation:
-        return QShaderProgram::TessellationEvaluation;
-    case ShaderBuilder::ShaderType::Geometry:
-        return QShaderProgram::Geometry;
-    case ShaderBuilder::ShaderType::Fragment:
-        return QShaderProgram::Fragment;
-    case ShaderBuilder::ShaderType::Compute:
-        return QShaderProgram::Compute;
-    default:
-        Q_UNREACHABLE();
-    }
-}
-
-} // anonymous
-
 QString ShaderBuilder::getPrototypesFile()
 {
     return qt3dGlobalShaderPrototypes->prototypesFile();
@@ -170,6 +145,7 @@ void ShaderBuilder::cleanup()
     m_enabledLayers.clear();
     m_graphs.clear();
     m_dirtyTypes.clear();
+    m_pendingUpdates.clear();
     QBackendNode::setEnabled(false);
 }
 
@@ -191,7 +167,7 @@ void ShaderBuilder::setEnabledLayers(const QStringList &layers)
 
     m_enabledLayers = layers;
 
-    for (QHash<ShaderType, QUrl>::const_iterator it = m_graphs.cbegin(); it != m_graphs.cend(); ++it) {
+    for (auto it = m_graphs.cbegin(); it != m_graphs.cend(); ++it) {
         if (!it.value().isEmpty())
             m_dirtyTypes.insert(it.key());
     }
@@ -208,18 +184,18 @@ void ShaderBuilder::setGraphicsApi(const GraphicsApiFilterData &graphicsApi)
         return;
 
     m_graphicsApi = graphicsApi;
-    for (QHash<ShaderType, QUrl>::const_iterator it = m_graphs.cbegin(); it != m_graphs.cend(); ++it) {
+    for (auto it = m_graphs.cbegin(); it != m_graphs.cend(); ++it) {
         if (!it.value().isEmpty())
             m_dirtyTypes.insert(it.key());
     }
 }
 
-QUrl ShaderBuilder::shaderGraph(ShaderBuilder::ShaderType type) const
+QUrl ShaderBuilder::shaderGraph(QShaderProgram::ShaderType type) const
 {
     return m_graphs.value(type);
 }
 
-void ShaderBuilder::setShaderGraph(ShaderBuilder::ShaderType type, const QUrl &url)
+void ShaderBuilder::setShaderGraph(QShaderProgram::ShaderType type, const QUrl &url)
 {
     if (url != m_graphs.value(type)) {
         m_graphs.insert(type, url);
@@ -227,17 +203,17 @@ void ShaderBuilder::setShaderGraph(ShaderBuilder::ShaderType type, const QUrl &u
     }
 }
 
-QByteArray ShaderBuilder::shaderCode(ShaderBuilder::ShaderType type) const
+QByteArray ShaderBuilder::shaderCode(QShaderProgram::ShaderType type) const
 {
     return m_codes.value(type);
 }
 
-bool ShaderBuilder::isShaderCodeDirty(ShaderBuilder::ShaderType type) const
+bool ShaderBuilder::isShaderCodeDirty(QShaderProgram::ShaderType type) const
 {
     return m_dirtyTypes.contains(type);
 }
 
-void ShaderBuilder::generateCode(ShaderBuilder::ShaderType type)
+void ShaderBuilder::generateCode(QShaderProgram::ShaderType type)
 {
     const auto graphPath = QUrlHelper::urlToLocalFileOrQrc(shaderGraph(type));
     QFile file(graphPath);
@@ -273,12 +249,9 @@ void ShaderBuilder::generateCode(ShaderBuilder::ShaderType type)
     m_codes.insert(type, QShaderProgramPrivate::deincludify(code, graphPath + QStringLiteral(".glsl")));
     m_dirtyTypes.remove(type);
 
-    // Send notification to the frontend
-    Qt3DCore::QPropertyUpdatedChangePtr propertyChange = Qt3DCore::QPropertyUpdatedChangePtr::create(peerId());
-    propertyChange->setDeliveryFlags(Qt3DCore::QSceneChange::DeliverToAll);
-    propertyChange->setPropertyName("generatedShaderCode");
-    propertyChange->setValue(QVariant::fromValue(qMakePair(int(toQShaderProgramType(type)), m_codes.value(type))));
-    notifyObservers(propertyChange);
+    m_pendingUpdates.push_back({ peerId(),
+                                 type,
+                                 m_codes.value(type) });
 }
 
 void ShaderBuilder::syncFromFrontEnd(const QNode *frontEnd, bool firstTime)
@@ -305,13 +278,13 @@ void ShaderBuilder::syncFromFrontEnd(const QNode *frontEnd, bool firstTime)
         markDirty(AbstractRenderer::ShadersDirty);
     }
 
-    static const std::pair<ShaderType, QUrl (QShaderProgramBuilder::*)() const> shaderTypesToGetters[] = {
-        {Vertex, &QShaderProgramBuilder::vertexShaderGraph},
-        {TessellationControl, &QShaderProgramBuilder::tessellationControlShaderGraph},
-        {TessellationEvaluation, &QShaderProgramBuilder::tessellationEvaluationShaderGraph},
-        {Geometry, &QShaderProgramBuilder::geometryShaderGraph},
-        {Fragment, &QShaderProgramBuilder::fragmentShaderGraph},
-        {Compute, &QShaderProgramBuilder::computeShaderGraph},
+    static const std::pair<QShaderProgram::ShaderType, QUrl (QShaderProgramBuilder::*)() const> shaderTypesToGetters[] = {
+        {QShaderProgram::Vertex, &QShaderProgramBuilder::vertexShaderGraph},
+        {QShaderProgram::TessellationControl, &QShaderProgramBuilder::tessellationControlShaderGraph},
+        {QShaderProgram::TessellationEvaluation, &QShaderProgramBuilder::tessellationEvaluationShaderGraph},
+        {QShaderProgram::Geometry, &QShaderProgramBuilder::geometryShaderGraph},
+        {QShaderProgram::Fragment, &QShaderProgramBuilder::fragmentShaderGraph},
+        {QShaderProgram::Compute, &QShaderProgramBuilder::computeShaderGraph},
     };
 
     for (auto it = std::cbegin(shaderTypesToGetters), end = std::cend(shaderTypesToGetters); it != end; ++it) {
diff --git a/src/render/materialsystem/shaderbuilder_p.h b/src/render/materialsystem/shaderbuilder_p.h
index 6b92d3114..0a799afaa 100644
--- a/src/render/materialsystem/shaderbuilder_p.h
+++ b/src/render/materialsystem/shaderbuilder_p.h
@@ -51,6 +51,7 @@
 // We mean it.
 //
 
+#include <Qt3DRender/qshaderprogram.h>
 #include <Qt3DRender/private/backendnode_p.h>
 #include <Qt3DRender/private/qgraphicsapifilter_p.h>
 
@@ -60,18 +61,16 @@ namespace Qt3DRender {
 
 namespace Render {
 
+struct ShaderBuilderUpdate
+{
+    Qt3DCore::QNodeId builderId;
+    Qt3DRender::QShaderProgram::ShaderType shaderType;
+    QByteArray shaderCode;
+};
+
 class Q_3DRENDERSHARED_PRIVATE_EXPORT ShaderBuilder : public BackendNode
 {
 public:
-    enum ShaderType {
-        Vertex = 0,
-        TessellationControl,
-        TessellationEvaluation,
-        Geometry,
-        Fragment,
-        Compute
-    };
-
     static QString getPrototypesFile();
     static void setPrototypesFile(const QString &file);
     static QStringList getPrototypeNames();
@@ -86,25 +85,28 @@ public:
     GraphicsApiFilterData graphicsApi() const;
     void setGraphicsApi(const GraphicsApiFilterData &graphicsApi);
 
-    QUrl shaderGraph(ShaderType type) const;
-    void setShaderGraph(ShaderType type, const QUrl &url);
+    QUrl shaderGraph(QShaderProgram::ShaderType type) const;
+    void setShaderGraph(QShaderProgram::ShaderType type, const QUrl &url);
 
-    QByteArray shaderCode(ShaderType type) const;
-    bool isShaderCodeDirty(ShaderType type) const;
+    QByteArray shaderCode(QShaderProgram::ShaderType type) const;
+    bool isShaderCodeDirty(QShaderProgram::ShaderType type) const;
 
-    void generateCode(ShaderType type);
+    void generateCode(QShaderProgram::ShaderType type);
 
     void syncFromFrontEnd(const Qt3DCore::QNode *frontEnd, bool firstTime) override;
 
+    QVector<ShaderBuilderUpdate> takePendingUpdates() { return std::move(m_pendingUpdates); }
+
 private:
     void setEnabledLayers(const QStringList &layers);
 
     GraphicsApiFilterData m_graphicsApi;
     Qt3DCore::QNodeId m_shaderProgramId;
     QStringList m_enabledLayers;
-    QHash<ShaderType, QUrl> m_graphs;
-    QHash<ShaderType, QByteArray> m_codes;
-    QSet<ShaderType> m_dirtyTypes;
+    QHash<QShaderProgram::ShaderType, QUrl> m_graphs;
+    QHash<QShaderProgram::ShaderType, QByteArray> m_codes;
+    QSet<QShaderProgram::ShaderType> m_dirtyTypes;
+    QVector<ShaderBuilderUpdate> m_pendingUpdates;
 };
 
 } // namespace Render