diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2011-08-23 13:08:08 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-08-24 12:27:43 +0200 |
| commit | b9a16a039692327a9f6975456667b5bd36afb4c8 (patch) | |
| tree | d831338c3696025cdea8dbd9a66310259e331595 /src | |
| parent | 017265b9383cbd616aaa2f5fee17dae8e28a161b (diff) | |
Lift particle limits on desktop
Change-Id: I65d897273cd0e3a2ea58c78b0cde08a388506f84
Reviewed-on: http://codereview.qt.nokia.com/3355
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/declarative/particles/qsgcustomparticle.cpp | 4 | ||||
| -rw-r--r-- | src/declarative/particles/qsgimageparticle.cpp | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/declarative/particles/qsgcustomparticle.cpp b/src/declarative/particles/qsgcustomparticle.cpp index ae6c269962..2d86306dc2 100644 --- a/src/declarative/particles/qsgcustomparticle.cpp +++ b/src/declarative/particles/qsgcustomparticle.cpp @@ -411,10 +411,12 @@ void QSGCustomParticle::prepareNextFrame(){ QSGShaderEffectNode* QSGCustomParticle::buildCustomNodes() { +#ifdef QT_OPENGL_ES_2 if (m_count * 4 > 0xffff) { - printf("CustomParticle: Too many particles... \n");//####Why is this here? + printf("CustomParticle: Too many particles... \n"); return 0; } +#endif if (m_count <= 0) { printf("CustomParticle: Too few particles... \n"); diff --git a/src/declarative/particles/qsgimageparticle.cpp b/src/declarative/particles/qsgimageparticle.cpp index 3b58bfc208..57461a414b 100644 --- a/src/declarative/particles/qsgimageparticle.cpp +++ b/src/declarative/particles/qsgimageparticle.cpp @@ -846,10 +846,12 @@ static QSGGeometry::AttributeSet SpriteParticle_AttributeSet = QSGGeometryNode* QSGImageParticle::buildParticleNodes() { - if (m_count * 4 > 0xffff) {//TODO: Lift this limit for desktop? +#ifdef QT_OPENGL_ES_2 + if (m_count * 4 > 0xffff) { printf("ImageParticle: Too many particles - maximum 16,000 per ImageParticle.\n");//ES 2 vertex count limit is ushort return 0; } +#endif if (count() <= 0) return 0; |