diff options
| author | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-09-21 23:56:52 (GMT) |
|---|---|---|
| committer | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-09-21 23:56:52 (GMT) |
| commit | 40bdb6a5bed66385c3c2320447b1530e99befeb3 (patch) | |
| tree | a835568f63a6c82be2e19556ebd55a4f42b3c0d2 /src/opengl/gl2paintengineex/qglengineshadermanager_p.h | |
| parent | c3a61f2a5d85503df84a818a7c15ef7c644fb981 (diff) | |
| download | Qt-40bdb6a5bed66385c3c2320447b1530e99befeb3.zip Qt-40bdb6a5bed66385c3c2320447b1530e99befeb3.tar.gz Qt-40bdb6a5bed66385c3c2320447b1530e99befeb3.tar.bz2 | |
Revert "Resubmit support for subpixel antialiasing on text in the GL2 engine."
This reverts commit 1b34feacef7a2d3ac005449a7cfbcb08a6bbf947.
Diffstat (limited to 'src/opengl/gl2paintengineex/qglengineshadermanager_p.h')
| -rw-r--r-- | src/opengl/gl2paintengineex/qglengineshadermanager_p.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/opengl/gl2paintengineex/qglengineshadermanager_p.h b/src/opengl/gl2paintengineex/qglengineshadermanager_p.h index 47d9a2a..3c5a5f5 100644 --- a/src/opengl/gl2paintengineex/qglengineshadermanager_p.h +++ b/src/opengl/gl2paintengineex/qglengineshadermanager_p.h @@ -142,8 +142,7 @@ Masks are implementations of "qcolorp vec4 applyMask(qcolorp vec4 src)": qglslMaskFragmentShader - qglslRgbMaskFragmentShaderPass1 - qglslRgbMaskFragmentShaderPass2 + qglslRgbMaskFragmentShader qglslRgbMaskWithGammaFragmentShader Composition modes are "qcolorp vec4 compose(qcolorp vec4 src)": @@ -322,8 +321,7 @@ public: ShockingPinkSrcFragmentShader, MaskFragmentShader, - RgbMaskFragmentShaderPass1, - RgbMaskFragmentShaderPass2, + RgbMaskFragmentShader, RgbMaskWithGammaFragmentShader, MultiplyCompositionModeFragmentShader, @@ -378,7 +376,7 @@ public: QGLEngineShaderManager(QGLContext* context); ~QGLEngineShaderManager(); - enum MaskType {NoMask, PixelMask, SubPixelMaskPass1, SubPixelMaskPass2, SubPixelWithGammaMask}; + enum MaskType {NoMask, PixelMask, SubPixelMask, SubPixelWithGammaMask}; enum PixelSrcType { ImageSrc = Qt::TexturePattern+1, NonPremultipliedImageSrc = Qt::TexturePattern+2, |