diff options
| author | Kim Motoyoshi Kalland <kim.kalland@nokia.com> | 2012-06-08 12:11:29 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-11 11:04:23 +0200 |
| commit | e7fdd1bfa0af53dbfb87a7f6a30175ca0917dd3b (patch) | |
| tree | 7271493edb2d74f0a5406f68322be01cc31e4232 /src/quick/items/qquickshadereffectnode_p.h | |
| parent | 6f7bb92e5df069716bef9639c965b4c8a9aaaabf (diff) | |
Add support for using atlas textures directly in ShaderEffects.
Change-Id: Ib2b68c13513e2c1102264a3eb1d91ed840134159
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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/items/qquickshadereffectnode_p.h b/src/quick/items/qquickshadereffectnode_p.h index 2b2aab5365..e0837430a6 100644 --- a/src/quick/items/qquickshadereffectnode_p.h +++ b/src/quick/items/qquickshadereffectnode_p.h @@ -79,7 +79,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickShaderEffectMaterial : public QSGMaterial public: struct UniformData { - enum SpecialType { None, Sampler, Opacity, Matrix }; + enum SpecialType { None, Sampler, SubRect, Opacity, Matrix }; QByteArray name; QVariant value; @@ -100,7 +100,7 @@ public: QVector<QByteArray> attributes; QVector<UniformData> uniforms[QQuickShaderEffectMaterialKey::ShaderTypeCount]; - QVector<QPair<QByteArray, QSGTextureProvider *> > textureProviders; + QVector<QSGTextureProvider *> textureProviders; CullMode cullMode; void setProgramSource(const QQuickShaderEffectMaterialKey &source); |