diff options
author | Kim Motoyoshi Kalland <kim.kalland@nokia.com> | 2012-01-11 17:34:58 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-16 15:07:33 +0100 |
commit | e79eedcb1eaf56280035550f4c6bb2395a51fd16 (patch) | |
tree | 45e6d0c6aa05ddd59762159b7dc27bd877f57134 /src/quick/items/qquickshadereffectnode_p.h | |
parent | 7911627f718d0e4876c42adbb5f3e02cf3c9f4eb (diff) |
Added log and status properties to ShaderEffect.
Task-number: QTBUG-23531
Change-Id: I136f6d9642ff9d4074fe8dae1f5714a05349107a
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Diffstat (limited to 'src/quick/items/qquickshadereffectnode_p.h')
-rw-r--r-- | src/quick/items/qquickshadereffectnode_p.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/quick/items/qquickshadereffectnode_p.h b/src/quick/items/qquickshadereffectnode_p.h index 5f90e71cab..4fd84b969a 100644 --- a/src/quick/items/qquickshadereffectnode_p.h +++ b/src/quick/items/qquickshadereffectnode_p.h @@ -78,6 +78,7 @@ struct QQuickShaderEffectProgram : public QQuickShaderEffectMaterialKey class QQuickCustomMaterialShader; +class QQuickShaderEffectNode; class QQuickShaderEffectMaterial : public QSGMaterial { public: @@ -88,7 +89,7 @@ public: FrontFaceCulling }; - QQuickShaderEffectMaterial(); + explicit QQuickShaderEffectMaterial(QQuickShaderEffectNode *node = 0); virtual QSGMaterialType *type() const; virtual QSGMaterialShader *createShader() const; virtual int compare(const QSGMaterial *other) const; @@ -117,6 +118,8 @@ protected: QVector<QPair<QByteArray, QVariant> > m_uniformValues; QVector<QPair<QByteArray, QSGTextureProvider *> > m_textures; CullMode m_cullMode; + QQuickShaderEffectNode *m_node; + bool m_emittedLogChanged; static QHash<QQuickShaderEffectMaterialKey, QSharedPointer<QSGMaterialType> > materialMap; }; @@ -135,6 +138,9 @@ public: QQuickShaderEffectMaterial *shaderMaterial() { return &m_material; } +Q_SIGNALS: + void logAndStatusChanged(const QString &, int status); + private Q_SLOTS: void markDirtyTexture(); |