diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-13 08:54:45 +0200 |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-13 08:54:45 +0200 |
| commit | b62bd0584a7872b6917917009b707785b3abd077 (patch) | |
| tree | 9981f274712c098cabbff0c4667672a3934e5393 /src/opengl/util/composition_mode_multiply.glsl | |
| parent | 5e10745dca1d10025404a9f268f03ae697fb10cc (diff) | |
| parent | 97baad65f65783d2b5ff938f6217aec9434f2e5f (diff) | |
Merge branch 'refactor'
Conflicts:
mkspecs/qws/linux-lsb-g++/qmake.conf
src/gui/image/qpixmap_mac.cpp
src/gui/painting/qpaintengine_x11.cpp
src/gui/painting/qtessellator.cpp
src/gui/text/qfontengine_qws.cpp
src/gui/text/qfontengine_x11.cpp
src/gui/widgets/qlinecontrol.cpp
src/opengl/qgl.h
src/opengl/qgl_x11egl.cpp
src/plugins/plugins.pro
Change-Id: If52dcd55cd55f2983a756c2f843967702b60a310
Diffstat (limited to 'src/opengl/util/composition_mode_multiply.glsl')
| -rw-r--r-- | src/opengl/util/composition_mode_multiply.glsl | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/opengl/util/composition_mode_multiply.glsl b/src/opengl/util/composition_mode_multiply.glsl deleted file mode 100644 index f90b7f00ad..0000000000 --- a/src/opengl/util/composition_mode_multiply.glsl +++ /dev/null @@ -1,9 +0,0 @@ -// Dca' = Sca.Dca + Sca.(1 - Da) + Dca.(1 - Sa) -// Da' = Sa + Da - Sa.Da -vec4 composite(vec4 src, vec4 dst) -{ - vec4 result; - result.rgb = src.rgb * dst.rgb + src.rgb * (1.0 - dst.a) + dst.rgb * (1.0 - src.a); - result.a = src.a + dst.a - src.a * dst.a; - return result; -} |