diff options
| author | Gunnar Sletta <gunnar.sletta@digia.com> | 2013-08-01 16:19:15 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-02 12:37:58 +0200 |
| commit | 4f69825c5bfd93b63f890a8188ece93af1283f1f (patch) | |
| tree | 01826e730ac8a2ad1c011124a25c32ed2ea67362 /src/particles/qquickimageparticle.cpp | |
| parent | da1f3b9ff318663fa575daa15ca3a373eb44e129 (diff) | |
avoid redundant calls to glActiveTexture
Change-Id: I00b5c82d76473a10f64f5a3aa0cd19ef88319ed6
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Diffstat (limited to 'src/particles/qquickimageparticle.cpp')
| -rw-r--r-- | src/particles/qquickimageparticle.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/particles/qquickimageparticle.cpp b/src/particles/qquickimageparticle.cpp index 5c1aee7c93..64a90bd8d4 100644 --- a/src/particles/qquickimageparticle.cpp +++ b/src/particles/qquickimageparticle.cpp @@ -365,7 +365,6 @@ public: } void updateState(const DeformableMaterialData* d, const DeformableMaterialData*) { - glFuncs->glActiveTexture(GL_TEXTURE0); d->texture->bind(); program()->setUniformValue(m_timestamp_id, (float) d->timestamp); @@ -405,7 +404,7 @@ public: QList<QByteArray> attributes() const { return QList<QByteArray>() << "vPosTex" << "vData" << "vVec" << "vColor" << "vDeformVec" << "vRotation" << "vAnimData" << "vAnimPos"; - }; + } void initialize() { QSGSimpleMaterialShader<SpriteMaterialData>::initialize(); @@ -496,7 +495,6 @@ public: } void updateState(const ColoredMaterialData* d, const ColoredMaterialData*) { - glFuncs->glActiveTexture(GL_TEXTURE0); d->texture->bind(); program()->setUniformValue(m_timestamp_id, (float) d->timestamp); @@ -561,7 +559,6 @@ public: } void updateState(const SimpleMaterialData* d, const SimpleMaterialData*) { - glFuncs->glActiveTexture(GL_TEXTURE0); d->texture->bind(); program()->setUniformValue(m_timestamp_id, (float) d->timestamp); |