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/qglextensions_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/qglextensions_p.h')
| -rw-r--r-- | src/opengl/qglextensions_p.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/opengl/qglextensions_p.h b/src/opengl/qglextensions_p.h index 40840b5..3510765 100644 --- a/src/opengl/qglextensions_p.h +++ b/src/opengl/qglextensions_p.h @@ -152,6 +152,7 @@ typedef void (APIENTRY *_glActiveStencilFaceEXT) (GLenum ); // Needed for GL2 engine: typedef void (APIENTRY *_glStencilOpSeparate) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass); typedef void (APIENTRY *_glActiveTexture) (GLenum); +typedef void (APIENTRY *_glBlendColor) (GLclampf, GLclampf, GLclampf, GLclampf); // EXT_GL_framebuffer_object @@ -247,6 +248,7 @@ struct QGLExtensionFuncs // Extras for GL2 engine: qt_glActiveTexture = 0; qt_glStencilOpSeparate = 0; + qt_glBlendColor = 0; qt_glActiveStencilFaceEXT = 0; qt_glMultiTexCoord4f = 0; @@ -360,6 +362,8 @@ struct QGLExtensionFuncs // Extras needed for GL2 engine: _glActiveTexture qt_glActiveTexture; _glStencilOpSeparate qt_glStencilOpSeparate; + _glBlendColor qt_glBlendColor; + #endif // FBOs @@ -574,6 +578,10 @@ struct QGLExtensionFuncs #endif #ifndef GL_VERSION_1_4 +#define GL_CONSTANT_COLOR 0x8001 +#define GL_ONE_MINUS_CONSTANT_COLOR 0x8002 +#define GL_CONSTANT_ALPHA 0x8003 +#define GL_ONE_MINUS_CONSTANT_ALPHA 0x8004 #define GL_INCR_WRAP 0x8507 #define GL_DECR_WRAP 0x8508 #endif @@ -717,6 +725,7 @@ struct QGLExtensionFuncs #if !defined(QT_OPENGL_ES_2) #define glStencilOpSeparate QGLContextPrivate::extensionFuncs(ctx).qt_glStencilOpSeparate +#define glBlendColor QGLContextPrivate::extensionFuncs(ctx).qt_glBlendColor #endif #if defined(QT_OPENGL_ES_2) |