diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-03-17 09:32:34 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-03-17 09:52:19 +0100 |
| commit | fb0cb17cb55c9ed44b7fcbc92efcc244e96c9b36 (patch) | |
| tree | 2ba609d4c6416036d3cb5f345a6c1125e0f105d6 /src/particles/qquickimageparticle.cpp | |
| parent | 4dc68ba888c7dbb7bd16455991f6d5814df13cba (diff) | |
| parent | 84155a8e1a6250d3e4b0949a42464eee5dfef537 (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: I6033aba359ac551f450ad517d20a0986bf4655f6
Diffstat (limited to 'src/particles/qquickimageparticle.cpp')
| -rw-r--r-- | src/particles/qquickimageparticle.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/particles/qquickimageparticle.cpp b/src/particles/qquickimageparticle.cpp index 0f6cd29a87..c0e1b4e422 100644 --- a/src/particles/qquickimageparticle.cpp +++ b/src/particles/qquickimageparticle.cpp @@ -148,8 +148,8 @@ public: program()->setUniformValue(m_timestamp_id, (float) d->timestamp); program()->setUniformValue(m_entry_id, (float) d->entry); - program()->setUniformValueArray(m_sizetable_id, (float*) d->sizeTable, UNIFORM_ARRAY_SIZE, 1); - program()->setUniformValueArray(m_opacitytable_id, (float*) d->opacityTable, UNIFORM_ARRAY_SIZE, 1); + program()->setUniformValueArray(m_sizetable_id, (const float*) d->sizeTable, UNIFORM_ARRAY_SIZE, 1); + program()->setUniformValueArray(m_opacitytable_id, (const float*) d->opacityTable, UNIFORM_ARRAY_SIZE, 1); } int m_entry_id; @@ -295,8 +295,8 @@ public: program()->setUniformValue(m_timestamp_id, (float) d->timestamp); program()->setUniformValue(m_entry_id, (float) d->entry); - program()->setUniformValueArray(m_sizetable_id, (float*) d->sizeTable, 64, 1); - program()->setUniformValueArray(m_opacitytable_id, (float*) d->opacityTable, UNIFORM_ARRAY_SIZE, 1); + program()->setUniformValueArray(m_sizetable_id, (const float*) d->sizeTable, 64, 1); + program()->setUniformValueArray(m_opacitytable_id, (const float*) d->opacityTable, UNIFORM_ARRAY_SIZE, 1); } int m_timestamp_id; @@ -1281,7 +1281,7 @@ void QQuickImageParticle::finishBuildParticleNodes(QSGNode** node) #ifdef Q_OS_LINUX // Nouveau drivers can potentially freeze a machine entirely when taking the point-sprite path. - if (perfLevel < Deformable && strstr((char *) glGetString(GL_VENDOR), "nouveau")) + if (perfLevel < Deformable && strstr((const char *) glGetString(GL_VENDOR), "nouveau")) perfLevel = Deformable; #endif |