diff options
| author | Kim Motoyoshi Kalland <kim.kalland@nokia.com> | 2009-09-08 12:30:19 (GMT) |
|---|---|---|
| committer | Kim Motoyoshi Kalland <kim.kalland@nokia.com> | 2009-09-21 14:21:18 (GMT) |
| commit | 1b34feacef7a2d3ac005449a7cfbcb08a6bbf947 (patch) | |
| tree | 939e0efa6c753c6fa963044a364942953c09f05a /src/opengl/gl2paintengineex/qglengineshadermanager_p.h | |
| parent | 423cbcf1a26ce208d5440ffa0c7cd150ccfd8b3a (diff) | |
| download | Qt-1b34feacef7a2d3ac005449a7cfbcb08a6bbf947.zip Qt-1b34feacef7a2d3ac005449a7cfbcb08a6bbf947.tar.gz Qt-1b34feacef7a2d3ac005449a7cfbcb08a6bbf947.tar.bz2 | |
Resubmit support for subpixel antialiasing on text in the GL2 engine.
The antialiasing is currently not gamma corrected and is disabled on
OpenGL ES 2.0.
Reviewed-by: Samuel
Diffstat (limited to 'src/opengl/gl2paintengineex/qglengineshadermanager_p.h')
| -rw-r--r-- | src/opengl/gl2paintengineex/qglengineshadermanager_p.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/opengl/gl2paintengineex/qglengineshadermanager_p.h b/src/opengl/gl2paintengineex/qglengineshadermanager_p.h index 3c5a5f5..47d9a2a 100644 --- a/src/opengl/gl2paintengineex/qglengineshadermanager_p.h +++ b/src/opengl/gl2paintengineex/qglengineshadermanager_p.h @@ -142,7 +142,8 @@ Masks are implementations of "qcolorp vec4 applyMask(qcolorp vec4 src)": qglslMaskFragmentShader - qglslRgbMaskFragmentShader + qglslRgbMaskFragmentShaderPass1 + qglslRgbMaskFragmentShaderPass2 qglslRgbMaskWithGammaFragmentShader Composition modes are "qcolorp vec4 compose(qcolorp vec4 src)": @@ -321,7 +322,8 @@ public: ShockingPinkSrcFragmentShader, MaskFragmentShader, - RgbMaskFragmentShader, + RgbMaskFragmentShaderPass1, + RgbMaskFragmentShaderPass2, RgbMaskWithGammaFragmentShader, MultiplyCompositionModeFragmentShader, @@ -376,7 +378,7 @@ public: QGLEngineShaderManager(QGLContext* context); ~QGLEngineShaderManager(); - enum MaskType {NoMask, PixelMask, SubPixelMask, SubPixelWithGammaMask}; + enum MaskType {NoMask, PixelMask, SubPixelMaskPass1, SubPixelMaskPass2, SubPixelWithGammaMask}; enum PixelSrcType { ImageSrc = Qt::TexturePattern+1, NonPremultipliedImageSrc = Qt::TexturePattern+2, |