diff options
author | Robin Burchell <robin.burchell@crimson.no> | 2017-01-16 15:51:58 +0100 |
---|---|---|
committer | Robin Burchell <robin.burchell@crimson.no> | 2017-01-16 17:10:14 +0000 |
commit | 373cdc297f343932218782d3587b98af5f8ccc53 (patch) | |
tree | c312db1fd006f521e632d59c7bf372e9a0951c4a /src/particles/shaders | |
parent | 8990cc9e260ba1685cad23a68ba2ee672ea68a0f (diff) |
Remove remnants of blackberry platform support
The last remnants were removed from qtbase in 5.7 making this all dead code,
so match here too.
Change-Id: I10f3f1c614562f2a97ade7cdf5002065d6f79e07
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/particles/shaders')
-rw-r--r-- | src/particles/shaders/imageparticle.vert | 6 | ||||
-rw-r--r-- | src/particles/shaders/imageparticle_core.vert | 6 |
2 files changed, 2 insertions, 10 deletions
diff --git a/src/particles/shaders/imageparticle.vert b/src/particles/shaders/imageparticle.vert index 377f831686..4057a9eb4b 100644 --- a/src/particles/shaders/imageparticle.vert +++ b/src/particles/shaders/imageparticle.vert @@ -69,11 +69,7 @@ void main() fTex = vPosTex.zw; #endif highp float currentSize = mix(vData.z, vData.w, t * t); -#if defined (Q_OS_BLACKBERRY) - highp float fade = 1.; -#else lowp float fade = 1.; -#endif highp float fadeIn = min(t * 10., 1.); highp float fadeOut = 1. - clamp((t - 0.75) * 4.,0., 1.); @@ -142,4 +138,4 @@ void main() #endif } } -}
\ No newline at end of file +} diff --git a/src/particles/shaders/imageparticle_core.vert b/src/particles/shaders/imageparticle_core.vert index ed9a918eb3..cfa0d57dfd 100644 --- a/src/particles/shaders/imageparticle_core.vert +++ b/src/particles/shaders/imageparticle_core.vert @@ -69,11 +69,7 @@ void main() fTex = vPosTex.zw; #endif float currentSize = mix(vData.z, vData.w, t * t); -#if defined (Q_OS_BLACKBERRY) float fade = 1.; -#else - float fade = 1.; -#endif float fadeIn = min(t * 10., 1.); float fadeOut = 1. - clamp((t - 0.75) * 4.,0., 1.); @@ -142,4 +138,4 @@ void main() #endif } } -}
\ No newline at end of file +} |