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/qglextensions_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/qglextensions_p.h')
| -rw-r--r-- | src/opengl/qglextensions_p.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/opengl/qglextensions_p.h b/src/opengl/qglextensions_p.h index 3510765..40840b5 100644 --- a/src/opengl/qglextensions_p.h +++ b/src/opengl/qglextensions_p.h @@ -152,7 +152,6 @@ 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 @@ -248,7 +247,6 @@ struct QGLExtensionFuncs // Extras for GL2 engine: qt_glActiveTexture = 0; qt_glStencilOpSeparate = 0; - qt_glBlendColor = 0; qt_glActiveStencilFaceEXT = 0; qt_glMultiTexCoord4f = 0; @@ -362,8 +360,6 @@ struct QGLExtensionFuncs // Extras needed for GL2 engine: _glActiveTexture qt_glActiveTexture; _glStencilOpSeparate qt_glStencilOpSeparate; - _glBlendColor qt_glBlendColor; - #endif // FBOs @@ -578,10 +574,6 @@ 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 @@ -725,7 +717,6 @@ 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) |