From ee616b3905106a3eedef9ee964ab283ef45c7dbc Mon Sep 17 00:00:00 2001 From: Michael Brasser Date: Tue, 22 Apr 2014 21:19:50 -0500 Subject: 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 --- src/quick/items/qquickshadereffect_p.h | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/quick/items/qquickshadereffect_p.h') 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 -- cgit v1.2.3