From 20f5919a63e36fe43a9d8107992badcd8cf8c915 Mon Sep 17 00:00:00 2001 From: Fabian Bumberger Date: Wed, 16 Jan 2013 15:13:48 +0100 Subject: Remove workaround for particle shader on Blackberry Change-Id: Ibcf4b55323046fee4a18b4c5bf51c78ed8832a63 Reviewed-by: Alan Alpert --- src/particles/qquickcustomparticle.cpp | 5 ----- src/particles/qquickimageparticle.cpp | 5 ----- 2 files changed, 10 deletions(-) (limited to 'src') diff --git a/src/particles/qquickcustomparticle.cpp b/src/particles/qquickcustomparticle.cpp index 67614a92d6..4bcb86a51f 100644 --- a/src/particles/qquickcustomparticle.cpp +++ b/src/particles/qquickcustomparticle.cpp @@ -60,12 +60,7 @@ static const char qt_particles_template_vertex_code[] = " highp float size = qt_ParticleData.z;\n" " highp float endSize = qt_ParticleData.w;\n" " highp float t = (qt_Timestamp - qt_ParticleData.x) / qt_ParticleData.y;\n" -#if !defined(Q_OS_BLACKBERRY) " highp float currentSize = mix(size, endSize, t * t);\n" -#else - " highp float mixWorkaround = (endSize - size) * t * t;\n" - " highp float currentSize = mixWorkaround + size;\n" -#endif " if (t < 0. || t > 1.)\n" " currentSize = 0.;\n" " highp vec2 pos = qt_ParticlePos\n" diff --git a/src/particles/qquickimageparticle.cpp b/src/particles/qquickimageparticle.cpp index 050bfe1a68..bb6edb26a5 100644 --- a/src/particles/qquickimageparticle.cpp +++ b/src/particles/qquickimageparticle.cpp @@ -127,12 +127,7 @@ static const char vertexShaderCode[] = "#elif defined(DEFORM)\n" " fTex = vPosTex.zw;\n" "#endif\n" -#if !defined(Q_OS_BLACKBERRY) " highp float currentSize = mix(vData.z, vData.w, t * t);\n" -#else - " highp float mixWorkaround = (vData.w - vData.z) * t * t;\n" - " highp float currentSize = mixWorkaround + vData.z;\n" -#endif " lowp float fade = 1.;\n" " highp float fadeIn = min(t * 10., 1.);\n" " highp float fadeOut = 1. - clamp((t - 0.75) * 4.,0., 1.);\n" -- cgit v1.2.3