diff options
author | Erik Verbruggen <erik.verbruggen@qt.io> | 2016-06-23 10:37:03 +0200 |
---|---|---|
committer | Erik Verbruggen <erik.verbruggen@qt.io> | 2016-07-05 08:00:21 +0000 |
commit | 8c745d808527684836d04da9014ee33c7cf8b6f1 (patch) | |
tree | 7f1ab16a2639f91afe153e1d897ed36ac091d446 /src/particles/qquickcustomparticle_p.h | |
parent | 5b470b6b6ad07975f9f9a56425a09b4827e87650 (diff) |
QtQuick: clean up shader effect property connections
- Don't use a signal mapper, but handle the mapping using a custom slot
object and a lambda to do the dispatching ourselves.
- Don't do meta-calls by property name, but by index.
- Cache the meta-object.
- Resolve the property indices by using the QML property cache.
For a shader with 6 property connections, the time spent goes from 320k
instructions to 80k instructions (valgrind on x86_64).
Task-number: QTBUG-53901
Change-Id: I2809198cf62f9716b3683798222203fc3e97fbb3
Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
Diffstat (limited to 'src/particles/qquickcustomparticle_p.h')
-rw-r--r-- | src/particles/qquickcustomparticle_p.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/particles/qquickcustomparticle_p.h b/src/particles/qquickcustomparticle_p.h index d9690aa96a..e9d68cbe5c 100644 --- a/src/particles/qquickcustomparticle_p.h +++ b/src/particles/qquickcustomparticle_p.h @@ -99,9 +99,10 @@ protected: private Q_SLOTS: void sourceDestroyed(QObject *object); - void propertyChanged(int mappedId); private: + void propertyChanged(int mappedId); + typedef QQuickOpenGLShaderEffectMaterialKey Key; typedef QQuickOpenGLShaderEffectMaterial::UniformData UniformData; @@ -109,6 +110,7 @@ private: void updateVertexShader(); QQuickOpenGLShaderEffectCommon m_common; + const QMetaObject *m_myMetaObject; QHash<int, QQuickOpenGLShaderEffectNode*> m_nodes; qreal m_lastTime; |