Add the rest of the tiered shaders to QSGImageParticle

Also simplifies the use of multiple shaders.

Change-Id: Ib4e16406865407626e4e736e7daeba4855dc0574
Reviewed-on: http://codereview.qt.nokia.com/3174
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>

1 files changed, 8 insertions, 1 deletions

diff --git a/src/declarative/particles/defaultshaders/spritefragment.shader b/src/declarative/particles/defaultshaders/spritefragment.shader
index 4d89d69c6a..86002f03fb 100644
--- a/src/declarative/particles/defaultshaders/spritefragment.shader
+++ b/src/declarative/particles/defaultshaders/spritefragment.shader
@@ -1,10 +1,17 @@
 uniform sampler2D texture;
+uniform sampler2D colortable;
+uniform sampler2D opacitytable;
+uniform lowp float qt_Opacity;
 
 varying highp vec2 fTexA;
 varying highp vec2 fTexB;
 varying lowp float progress;
 varying lowp vec4 fColor;
+varying lowp float tt;
 
 void main() {
-    gl_FragColor = mix(texture2D(texture, fTexA), texture2D(texture, fTexB), progress) * fColor.w;
+    gl_FragColor = mix(texture2D(texture, fTexA), texture2D(texture, fTexB), progress)
+            * fColor
+            * texture2D(colortable, vec2(tt, 0.5))
+            * (texture2D(opacitytable, vec2(tt, 0.5)).w * qt_Opacity);
 }