diff options
| author | Alexis Menard <alexis.menard@nokia.com> | 2009-10-20 08:46:31 (GMT) |
|---|---|---|
| committer | Alexis Menard <alexis.menard@nokia.com> | 2009-10-20 08:46:31 (GMT) |
| commit | e87b66fc81600e43eb1b9696c6e97d6c4ff4ab90 (patch) | |
| tree | 7d0c29bcba56d9be5b6623f5e98b5b8e81e1bda2 /src/opengl/util/composition_mode_difference.glsl | |
| parent | a210a1efb3a255235ab22e618c61d0aaccba3d9f (diff) | |
| parent | 1a11cc88e8516097e73d7aefc44c9a97ea0b5aef (diff) | |
| download | Qt-e87b66fc81600e43eb1b9696c6e97d6c4ff4ab90.zip Qt-e87b66fc81600e43eb1b9696c6e97d6c4ff4ab90.tar.gz Qt-e87b66fc81600e43eb1b9696c6e97d6c4ff4ab90.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/opengl/util/composition_mode_difference.glsl')
| -rw-r--r-- | src/opengl/util/composition_mode_difference.glsl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/opengl/util/composition_mode_difference.glsl b/src/opengl/util/composition_mode_difference.glsl index ca13ce7..3c46ec7 100644 --- a/src/opengl/util/composition_mode_difference.glsl +++ b/src/opengl/util/composition_mode_difference.glsl @@ -3,7 +3,7 @@ vec4 composite(vec4 src, vec4 dst) { vec4 result; - result.rgb = src.rgb + dst.rgb - 2 * min(src.rgb * dst.a, dst.rgb * src.a); + result.rgb = src.rgb + dst.rgb - 2.0 * min(src.rgb * dst.a, dst.rgb * src.a); result.a = src.a + dst.a - src.a * dst.a; return result; } |