diff options
author | Tom Cooksey <thomas.cooksey@nokia.com> | 2009-04-22 15:25:36 (GMT) |
---|---|---|
committer | Tom Cooksey <thomas.cooksey@nokia.com> | 2009-04-22 15:41:48 (GMT) |
commit | aa295fbfdae1a687bc7bd9f7f364721a35566828 (patch) | |
tree | 78e711c4a044ecc01a09a3dd03071e1e493fb6c7 /src/opengl/gl2paintengineex | |
parent | 93c617026e093ea788ead5d0eb34686c4a84a77f (diff) | |
download | Qt-aa295fbfdae1a687bc7bd9f7f364721a35566828.zip Qt-aa295fbfdae1a687bc7bd9f7f364721a35566828.tar.gz Qt-aa295fbfdae1a687bc7bd9f7f364721a35566828.tar.bz2 |
Change fragment shaders to apply the mask as the final step
I.e. After composition, not before.
Diffstat (limited to 'src/opengl/gl2paintengineex')
-rw-r--r-- | src/opengl/gl2paintengineex/qglengineshadersource_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/opengl/gl2paintengineex/qglengineshadersource_p.h b/src/opengl/gl2paintengineex/qglengineshadersource_p.h index f2facac..bf896b1 100644 --- a/src/opengl/gl2paintengineex/qglengineshadersource_p.h +++ b/src/opengl/gl2paintengineex/qglengineshadersource_p.h @@ -294,7 +294,7 @@ static const char* const qglslMainFragmentShader_CMO = "\ lowp vec4 applyMask(lowp vec4); \ lowp vec4 compose(lowp vec4); \ void main() { \ - gl_FragColor = compose(applyMask(srcPixel()*globalOpacity)); \ + gl_FragColor = applyMask(compose(srcPixel()*globalOpacity))); \ }"; static const char* const qglslMainFragmentShader_CM = "\ @@ -302,7 +302,7 @@ static const char* const qglslMainFragmentShader_CM = "\ lowp vec4 applyMask(lowp vec4); \ lowp vec4 compose(lowp vec4); \ void main() { \ - gl_FragColor = compose(applyMask(srcPixel())); \ + gl_FragColor = applyMask(compose(srcPixel())); \ }"; static const char* const qglslMainFragmentShader_MO = "\ |