diff options
author | Kim Motoyoshi Kalland <kim.kalland@nokia.com> | 2009-10-14 15:22:57 (GMT) |
---|---|---|
committer | Kim Motoyoshi Kalland <kim.kalland@nokia.com> | 2009-10-14 15:42:52 (GMT) |
commit | 33d2bd641fd031d1a4e38198bf50538344a4ccdb (patch) | |
tree | 1ebdd7a17b849e901863b2adcad7c10657d62147 /src/opengl/util/composition_mode_darken.glsl | |
parent | 111558d709d7d55318bdf3de99442f26e246fcdc (diff) | |
download | Qt-33d2bd641fd031d1a4e38198bf50538344a4ccdb.zip Qt-33d2bd641fd031d1a4e38198bf50538344a4ccdb.tar.gz Qt-33d2bd641fd031d1a4e38198bf50538344a4ccdb.tar.bz2 |
Cleaned up OpenGL1 paint engine GLSL code.
Fixed warnings about int->float and float->vecN conversions. Removed
unused shader files.
Reviewed-by: Trond
Diffstat (limited to 'src/opengl/util/composition_mode_darken.glsl')
-rw-r--r-- | src/opengl/util/composition_mode_darken.glsl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/opengl/util/composition_mode_darken.glsl b/src/opengl/util/composition_mode_darken.glsl index c1e83fd..8bbb82b 100644 --- a/src/opengl/util/composition_mode_darken.glsl +++ b/src/opengl/util/composition_mode_darken.glsl @@ -3,7 +3,7 @@ vec4 composite(vec4 src, vec4 dst) { vec4 result; - result.rgb = min(src.rgb * dst.a, dst.rgb * src.a) + src.rgb * (1 - dst.a) + dst.rgb * (1 - src.a); + result.rgb = min(src.rgb * dst.a, dst.rgb * src.a) + src.rgb * (1.0 - dst.a) + dst.rgb * (1.0 - src.a); result.a = src.a + dst.a - src.a * dst.a; return result; } |