diff options
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; |