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>

diff --git a/src/declarative/particles/qsgcustomparticle.cpp b/src/declarative/particles/qsgcustomparticle.cpp
index ae6c269..2d86306 100644 (file)
--- 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 3b58bfc..57461a4 100644 (file)
--- 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;