diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2012-08-20 21:09:48 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-21 17:30:07 +0200 |
| commit | 4fdf98a11f6919c04c5ef3fb78ecd39dd5f4b1fa (patch) | |
| tree | 3b59a83fa29af74d64490ed355141e7262df3523 /src/quick/scenegraph | |
| parent | cd6eabb2d68321536c7fbc032a2a93990e891936 (diff) | |
Fix compilation on OSX 10.6
OS X 10.6 does not support the GL_ARB_framebuffer_sRGB extension.
Change-Id: Ifea8eaf3ffca6242d908538afeb983131a113c73
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/quick/scenegraph')
| -rw-r--r-- | src/quick/scenegraph/qsgdefaultglyphnode_p.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp b/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp index 6616173253..27339abf7e 100644 --- a/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp +++ b/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp @@ -128,7 +128,7 @@ void QSGTextMaskMaterialData::activate() QSGMaterialShader::activate(); glBlendFunc(GL_CONSTANT_COLOR, GL_ONE_MINUS_SRC_COLOR); -#if !defined(QT_OPENGL_ES_2) +#if !defined(QT_OPENGL_ES_2) && defined(GL_ARB_framebuffer_sRGB) // 0.25 was found to be acceptable error margin by experimentation. On Mac, the gamma is 2.0, // but using sRGB looks okay. if (qAbs(fontSmoothingGamma() - 2.2) < 0.25) @@ -141,7 +141,7 @@ void QSGTextMaskMaterialData::deactivate() QSGMaterialShader::deactivate(); glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA); -#if !defined(QT_OPENGL_ES_2) +#if !defined(QT_OPENGL_ES_2) && defined(GL_ARB_framebuffer_sRGB) if (qAbs(fontSmoothingGamma() - 2.2) < 0.25) glDisable(GL_FRAMEBUFFER_SRGB); #endif |