diff options
| author | Michael Brasser <michael.brasser@live.com> | 2014-04-22 21:19:50 -0500 |
|---|---|---|
| committer | Michael Brasser <michael.brasser@live.com> | 2014-08-07 21:36:14 +0200 |
| commit | ee616b3905106a3eedef9ee964ab283ef45c7dbc (patch) | |
| tree | 8cef0f09a44419e88acf21ad893bbbfadb5c8af1 /src/quick/items/qquickshadereffect_p.h | |
| parent | 6b31418a1b5d9be47df5ed61747e8a5fb225acfa (diff) | |
Allow simple ShaderEffects to be batched by the renderer.
Identical ShaderEffects that use the standard vertex shader with a
single source texture, and that set supportsAtlasTextures, are now
candidates for batching.
Task-number: QTBUG-37914
Change-Id: Ib0ce58647a8c7c48e88bd84cf2645f1a8f28691f
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
Diffstat (limited to 'src/quick/items/qquickshadereffect_p.h')
| -rw-r--r-- | src/quick/items/qquickshadereffect_p.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/quick/items/qquickshadereffect_p.h b/src/quick/items/qquickshadereffect_p.h index 8b613b4ef0..14d11a7814 100644 --- a/src/quick/items/qquickshadereffect_p.h +++ b/src/quick/items/qquickshadereffect_p.h @@ -99,6 +99,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickShaderEffect : public QQuickItem Q_PROPERTY(CullMode cullMode READ cullMode WRITE setCullMode NOTIFY cullModeChanged) Q_PROPERTY(QString log READ log NOTIFY logChanged) Q_PROPERTY(Status status READ status NOTIFY statusChanged) + Q_PROPERTY(bool supportsAtlasTextures READ supportsAtlasTextures WRITE setSupportsAtlasTextures NOTIFY supportsAtlasTexturesChanged REVISION 1) Q_ENUMS(CullMode) Q_ENUMS(Status) @@ -138,6 +139,9 @@ public: QString log() const { return m_log; } Status status() const { return m_status; } + bool supportsAtlasTextures() const { return m_supportsAtlasTextures; } + void setSupportsAtlasTextures(bool supports); + QString parseLog(); virtual bool event(QEvent *); @@ -150,6 +154,7 @@ Q_SIGNALS: void cullModeChanged(); void logChanged(); void statusChanged(); + void supportsAtlasTexturesChanged(); protected: virtual void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry); @@ -187,6 +192,8 @@ private: uint m_dirtyParseLog : 1; uint m_dirtyMesh : 1; uint m_dirtyGeometry : 1; + uint m_customVertexShader : 1; + uint m_supportsAtlasTextures : 1; }; QT_END_NAMESPACE |