1 files changed, 23 insertions, 19 deletions

diff --git a/src/particles/qquickcustomparticle.cpp b/src/particles/qquickcustomparticle.cpp
index 3cb7f6c2bf..c08ae3d9ff 100644
--- a/src/particles/qquickcustomparticle.cpp
+++ b/src/particles/qquickcustomparticle.cpp
@@ -94,6 +94,8 @@ struct PlainVertices {
 
 QQuickCustomParticle::QQuickCustomParticle(QQuickItem* parent)
     : QQuickParticlePainter(parent)
+    , m_common(this, [this](int mappedId){this->propertyChanged(mappedId);})
+    , m_myMetaObject(nullptr)
     , m_dirtyUniforms(true)
     , m_dirtyUniformValues(true)
     , m_dirtyTextureProviders(true)
@@ -113,7 +115,10 @@ QQuickCustomParticle::~QQuickCustomParticle()
 
 void QQuickCustomParticle::componentComplete()
 {
-    m_common.updateShader(this, Key::FragmentShader);
+    if (!m_myMetaObject)
+        m_myMetaObject = metaObject();
+
+    m_common.updateShader(this, m_myMetaObject, Key::FragmentShader);
     updateVertexShader();
     reset();
     QQuickParticlePainter::componentComplete();
@@ -137,7 +142,7 @@ void QQuickCustomParticle::setFragmentShader(const QByteArray &code)
     m_common.source.sourceCode[Key::FragmentShader] = code;
     m_dirtyProgram = true;
     if (isComponentComplete()) {
-        m_common.updateShader(this, Key::FragmentShader);
+        m_common.updateShader(this, m_myMetaObject, Key::FragmentShader);
         reset();
     }
     emit fragmentShaderChanged();
@@ -201,9 +206,8 @@ void QQuickCustomParticle::setVertexShader(const QByteArray &code)
 void QQuickCustomParticle::updateVertexShader()
 {
     m_common.disconnectPropertySignals(this, Key::VertexShader);
-    qDeleteAll(m_common.signalMappers[Key::VertexShader]);
     m_common.uniformData[Key::VertexShader].clear();
-    m_common.signalMappers[Key::VertexShader].clear();
+    m_common.clearSignalMappers(Key::VertexShader);
     m_common.attributes.clear();
     m_common.attributes.append("qt_ParticlePos");
     m_common.attributes.append("qt_ParticleTex");
@@ -224,9 +228,9 @@ void QQuickCustomParticle::updateVertexShader()
 
     const QByteArray &code = m_common.source.sourceCode[Key::VertexShader];
     if (!code.isEmpty())
-        m_common.lookThroughShaderCode(this, Key::VertexShader, code);
+        m_common.lookThroughShaderCode(this, m_myMetaObject, Key::VertexShader, code);
 
-    m_common.connectPropertySignals(this, Key::VertexShader);
+    m_common.connectPropertySignals(this, m_myMetaObject, Key::VertexShader);
 }
 
 void QQuickCustomParticle::reset()
@@ -237,7 +241,7 @@ void QQuickCustomParticle::reset()
 
 QSGNode *QQuickCustomParticle::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *)
 {
-    QQuickShaderEffectNode *rootNode = static_cast<QQuickShaderEffectNode *>(oldNode);
+    QQuickOpenGLShaderEffectNode *rootNode = static_cast<QQuickOpenGLShaderEffectNode *>(oldNode);
     if (m_pleaseReset){
         delete rootNode;//Automatically deletes children
         rootNode = 0;
@@ -258,7 +262,7 @@ QSGNode *QQuickCustomParticle::updatePaintNode(QSGNode *oldNode, UpdatePaintNode
     return rootNode;
 }
 
-QQuickShaderEffectNode *QQuickCustomParticle::prepareNextFrame(QQuickShaderEffectNode *rootNode)
+QQuickOpenGLShaderEffectNode *QQuickCustomParticle::prepareNextFrame(QQuickOpenGLShaderEffectNode *rootNode)
 {
     if (!rootNode)
         rootNode = buildCustomNodes();
@@ -269,7 +273,7 @@ QQuickShaderEffectNode *QQuickCustomParticle::prepareNextFrame(QQuickShaderEffec
     if (m_dirtyProgram) {
         const bool isES = QOpenGLContext::currentContext()->isOpenGLES();
 
-        QQuickShaderEffectMaterial *material = static_cast<QQuickShaderEffectMaterial *>(rootNode->material());
+        QQuickOpenGLShaderEffectMaterial *material = static_cast<QQuickOpenGLShaderEffectMaterial *>(rootNode->material());
         Q_ASSERT(material);
 
         Key s = m_common.source;
@@ -292,7 +296,7 @@ QQuickShaderEffectNode *QQuickCustomParticle::prepareNextFrame(QQuickShaderEffec
 
         material->setProgramSource(s);
         material->attributes = m_common.attributes;
-        foreach (QQuickShaderEffectNode* node, m_nodes)
+        foreach (QQuickOpenGLShaderEffectNode* node, m_nodes)
             node->markDirty(QSGNode::DirtyMaterial);
 
         m_dirtyProgram = false;
@@ -305,9 +309,9 @@ QQuickShaderEffectNode *QQuickCustomParticle::prepareNextFrame(QQuickShaderEffec
     return rootNode;
 }
 
-QQuickShaderEffectNode* QQuickCustomParticle::buildCustomNodes()
+QQuickOpenGLShaderEffectNode* QQuickCustomParticle::buildCustomNodes()
 {
-    typedef QHash<int, QQuickShaderEffectNode*>::const_iterator NodeHashConstIt;
+    typedef QHash<int, QQuickOpenGLShaderEffectNode*>::const_iterator NodeHashConstIt;
 
     if (!QOpenGLContext::currentContext())
         return 0;
@@ -325,14 +329,14 @@ QQuickShaderEffectNode* QQuickCustomParticle::buildCustomNodes()
     if (groups().isEmpty())
         return 0;
 
-    QQuickShaderEffectNode *rootNode = 0;
-    QQuickShaderEffectMaterial *material = new QQuickShaderEffectMaterial;
+    QQuickOpenGLShaderEffectNode *rootNode = 0;
+    QQuickOpenGLShaderEffectMaterial *material = new QQuickOpenGLShaderEffectMaterial;
     m_dirtyProgram = true;
 
     for (auto groupId : groupIds()) {
         int count = m_system->groupData[groupId]->size();
 
-        QQuickShaderEffectNode* node = new QQuickShaderEffectNode();
+        QQuickOpenGLShaderEffectNode* node = new QQuickOpenGLShaderEffectNode();
         m_nodes.insert(groupId, node);
 
         node->setMaterial(material);
@@ -391,14 +395,14 @@ void QQuickCustomParticle::sourceDestroyed(QObject *object)
 void QQuickCustomParticle::propertyChanged(int mappedId)
 {
     bool textureProviderChanged;
-    m_common.propertyChanged(this, mappedId, &textureProviderChanged);
+    m_common.propertyChanged(this, m_myMetaObject, mappedId, &textureProviderChanged);
     m_dirtyTextureProviders |= textureProviderChanged;
     m_dirtyUniformValues = true;
     update();
 }
 
 
-void QQuickCustomParticle::buildData(QQuickShaderEffectNode *rootNode)
+void QQuickCustomParticle::buildData(QQuickOpenGLShaderEffectNode *rootNode)
 {
     if (!rootNode)
         return;
@@ -408,9 +412,9 @@ void QQuickCustomParticle::buildData(QQuickShaderEffectNode *rootNode)
                 m_common.uniformData[shaderType][i].value = qVariantFromValue(m_lastTime);
         }
     }
-    m_common.updateMaterial(rootNode, static_cast<QQuickShaderEffectMaterial *>(rootNode->material()),
+    m_common.updateMaterial(rootNode, static_cast<QQuickOpenGLShaderEffectMaterial *>(rootNode->material()),
                             m_dirtyUniforms, true, m_dirtyTextureProviders);
-    foreach (QQuickShaderEffectNode* node, m_nodes)
+    foreach (QQuickOpenGLShaderEffectNode* node, m_nodes)
         node->markDirty(QSGNode::DirtyMaterial);
     m_dirtyUniforms = m_dirtyUniformValues = m_dirtyTextureProviders = false;
 }