aboutsummaryrefslogtreecommitdiffstats
path: root/src/declarative/particles/defaultshaders/deformablefragment.shader
diff options
context:
space:
mode:
authorAlan Alpert <alan.alpert@nokia.com>2011-08-18 20:47:23 +1000
committerQt by Nokia <qt-info@nokia.com>2011-08-23 07:31:41 +0200
commit4ce1af458c67d824fd2412c1a2f847af39b04902 (patch)
treef786222aa56ae69beb50544da991c8b6e4c10bf1 /src/declarative/particles/defaultshaders/deformablefragment.shader
parente30f56ee23b62eb5cd33505b544e7d1fa2766211 (diff)
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>
Diffstat (limited to 'src/declarative/particles/defaultshaders/deformablefragment.shader')
-rw-r--r--src/declarative/particles/defaultshaders/deformablefragment.shader5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/declarative/particles/defaultshaders/deformablefragment.shader b/src/declarative/particles/defaultshaders/deformablefragment.shader
index 494053e319..1ac25ba208 100644
--- a/src/declarative/particles/defaultshaders/deformablefragment.shader
+++ b/src/declarative/particles/defaultshaders/deformablefragment.shader
@@ -1,8 +1,9 @@
uniform sampler2D texture;
+uniform lowp float qt_Opacity;
varying highp vec2 fTex;
-varying lowp float fFade;
+varying lowp vec4 fColor;
void main() {
- gl_FragColor = (texture2D(texture, fTex)) * fFade;
+ gl_FragColor = (texture2D(texture, fTex)) * fColor * qt_Opacity;
}