diff options
author | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-09-17 01:22:05 (GMT) |
---|---|---|
committer | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-09-17 01:22:05 (GMT) |
commit | 7d4026fb6efe84cda30c44e998a5bd0bdbc5e004 (patch) | |
tree | bf5d1861d389be75fa07192e84e7458c64f00dd1 /src/opengl/gl2paintengineex/qglengineshadersource_p.h | |
parent | 031498abcef715ab5db5379c0f03c03bce3e2364 (diff) | |
download | Qt-7d4026fb6efe84cda30c44e998a5bd0bdbc5e004.zip Qt-7d4026fb6efe84cda30c44e998a5bd0bdbc5e004.tar.gz Qt-7d4026fb6efe84cda30c44e998a5bd0bdbc5e004.tar.bz2 |
Revert "Added support for subpixel antialiasing on text in the GL2 engine."
Breaks the GL2 paint engine on X11 and OpenGL/ES 2.0.
This reverts commit b8ff02a67ebd8246253823b53cfed98eef400547.
Diffstat (limited to 'src/opengl/gl2paintengineex/qglengineshadersource_p.h')
-rw-r--r-- | src/opengl/gl2paintengineex/qglengineshadersource_p.h | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/src/opengl/gl2paintengineex/qglengineshadersource_p.h b/src/opengl/gl2paintengineex/qglengineshadersource_p.h index 8ae86d3..6bcf010 100644 --- a/src/opengl/gl2paintengineex/qglengineshadersource_p.h +++ b/src/opengl/gl2paintengineex/qglengineshadersource_p.h @@ -401,39 +401,6 @@ static const char* const qglslMaskFragmentShader = "\ return src * mask.a; \ }"; -// For source over with subpixel antialiasing, the final color is calculated per component as follows -// (.a is alpha component, .c is red, green or blue component): -// alpha = src.a * mask.c * opacity -// dest.c = dest.c * (1 - alpha) + src.c * alpha -// -// In the first pass, calculate: dest.c = dest.c * (1 - alpha) with blend funcs: zero, 1 - source color -// In the second pass, calculate: dest.c = dest.c + src.c * alpha with blend funcs: one, one -// -// If source is a solid color (src is constant), only the first pass is needed, with blend funcs: constant, 1 - source color - -// For source composition with subpixel antialiasing, the final color is calculated per component as follows: -// alpha = src.a * mask.c * opacity -// dest.c = dest.c * (1 - mask.c) + src.c * alpha -// - -static const char* const qglslRgbMaskFragmentShaderPass1 = "\ - varying highp vec2 textureCoords;\ - uniform lowp sampler2D maskTexture;\ - lowp vec4 applyMask(lowp vec4 src) \ - {\ - lowp vec4 mask = texture2D(maskTexture, textureCoords); \ - return src.a * mask; \ - }"; - -static const char* const qglslRgbMaskFragmentShaderPass2 = "\ - varying highp vec2 textureCoords;\ - uniform lowp sampler2D maskTexture;\ - lowp vec4 applyMask(lowp vec4 src) \ - {\ - lowp vec4 mask = texture2D(maskTexture, textureCoords); \ - return src * mask; \ - }"; - /* Left to implement: RgbMaskFragmentShader, |