diff options
| author | Ariya Hidayat <ariya.hidayat@nokia.com> | 2009-06-03 08:59:43 (GMT) |
|---|---|---|
| committer | Ariya Hidayat <ariya.hidayat@nokia.com> | 2009-06-03 08:59:43 (GMT) |
| commit | f5c8e82e409e0b9ac2047ed848bf1825bb382f39 (patch) | |
| tree | 76b17403d460ae08be374e33e216052ea05c5f49 /src/opengl/gl2paintengineex/qglengineshadersource_p.h | |
| parent | 295c3927eb236483e6fd2e59f7588f35baa75ea2 (diff) | |
| parent | e11ff338951954f08866aef15607e8fae2bc150c (diff) | |
| download | Qt-f5c8e82e409e0b9ac2047ed848bf1825bb382f39.zip Qt-f5c8e82e409e0b9ac2047ed848bf1825bb382f39.tar.gz Qt-f5c8e82e409e0b9ac2047ed848bf1825bb382f39.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-graphicseffect
Diffstat (limited to 'src/opengl/gl2paintengineex/qglengineshadersource_p.h')
| -rw-r--r-- | src/opengl/gl2paintengineex/qglengineshadersource_p.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/opengl/gl2paintengineex/qglengineshadersource_p.h b/src/opengl/gl2paintengineex/qglengineshadersource_p.h index fdbba72..920d0bc 100644 --- a/src/opengl/gl2paintengineex/qglengineshadersource_p.h +++ b/src/opengl/gl2paintengineex/qglengineshadersource_p.h @@ -89,6 +89,12 @@ static const char* const qglslPositionOnlyVertexShader = "\ gl_Position = pmvMatrix * vertexCoordsArray;\ }"; +static const char* const qglslUntransformedPositionVertexShader = "\ + attribute highp vec4 vertexCoordsArray;\ + void setPosition(void)\ + {\ + gl_Position = vertexCoordsArray;\ + }"; // Pattern Brush - This assumes the texture size is 8x8 and thus, the inverted size is 0.125 static const char* const qglslPositionWithPatternBrushVertexShader = "\ @@ -354,7 +360,7 @@ static const char* const qglslMaskFragmentShader = "\ lowp vec4 applyMask(lowp vec4 src) \ {\ lowp vec4 mask = texture2D(maskTexture, textureCoords); \ - return src * mask.r; \ + return src * mask.a; \ }"; /* @@ -375,7 +381,6 @@ static const char* const qglslMaskFragmentShader = "\ ExclusionCompositionModeFragmentShader, */ - QT_END_NAMESPACE QT_END_HEADER |