diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-10-17 12:05:57 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-18 08:21:19 +0200 |
commit | da68749fdbbdca0a946d6b6334d2709c47f8a23d (patch) | |
tree | 1715f900cfe3ff506b6f3aaeecdce2bfab5d2fc0 /src/opengl/gl2paintengineex | |
parent | 730382a968b064df8901982e519c1b0756c1a696 (diff) |
OpenGL: Remove Q_WS_ defines.
Change-Id: I351a910968ff7f46550af5b3742959cb0cab540d
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Diffstat (limited to 'src/opengl/gl2paintengineex')
-rw-r--r-- | src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp | 33 | ||||
-rw-r--r-- | src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp | 3 |
2 files changed, 0 insertions, 36 deletions
diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp index e6a12cd40c..b6168d62d5 100644 --- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp +++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp @@ -89,13 +89,7 @@ QT_BEGIN_NAMESPACE -#if defined(Q_WS_WIN) -extern Q_GUI_EXPORT bool qt_cleartype_enabled; -#endif -#ifdef Q_WS_MAC -extern bool qt_applefontsmoothing_enabled; -#endif Q_GUI_EXPORT QImage qt_imageForBrush(int brushStyle, bool invert); @@ -1560,13 +1554,6 @@ namespace { } -#if defined(Q_WS_WIN) -static bool fontSmoothingApproximately(qreal target) -{ - extern Q_GUI_EXPORT qreal qt_fontsmoothing_gamma; // qapplication_win.cpp - return (qAbs(qt_fontsmoothing_gamma - target) < 0.2); -} -#endif // #define QT_OPENGL_DRAWCACHEDGLYPHS_INDEX_ARRAY_VBO @@ -1830,19 +1817,6 @@ void QGL2PaintEngineExPrivate::drawCachedGlyphs(QFontEngineGlyphCache::Type glyp } bool srgbFrameBufferEnabled = false; - if (ctx->d_ptr->extension_flags & QGLExtensions::SRGBFrameBuffer) { -#if defined(Q_WS_MAC) - if (glyphType == QFontEngineGlyphCache::Raster_RGBMask) -#elif defined(Q_WS_WIN) - if (glyphType != QFontEngineGlyphCache::Raster_RGBMask || fontSmoothingApproximately(2.1)) -#else - if (false) -#endif - { - glEnable(FRAMEBUFFER_SRGB_EXT); - srgbFrameBufferEnabled = true; - } - } #if defined(QT_OPENGL_DRAWCACHEDGLYPHS_INDEX_ARRAY_VBO) glDrawElements(GL_TRIANGLE_STRIP, 6 * numGlyphs, GL_UNSIGNED_SHORT, 0); @@ -2024,13 +1998,6 @@ bool QGL2PaintEngineEx::begin(QPaintDevice *pdev) d->glyphCacheType = QFontEngineGlyphCache::Raster_A8; #if !defined(QT_OPENGL_ES_2) -#if defined(Q_WS_WIN) - if (qt_cleartype_enabled - && (fontSmoothingApproximately(1.0) || fontSmoothingApproximately(2.1))) -#endif -#if defined(Q_WS_MAC) - if (qt_applefontsmoothing_enabled) -#endif d->glyphCacheType = QFontEngineGlyphCache::Raster_RGBMask; #endif diff --git a/src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp b/src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp index af6cb53a3a..a6f7f67e60 100644 --- a/src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp +++ b/src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp @@ -45,9 +45,6 @@ QT_BEGIN_NAMESPACE -#ifdef Q_WS_WIN -extern Q_GUI_EXPORT bool qt_cleartype_enabled; -#endif QBasicAtomicInt qgltextureglyphcache_serial_number = Q_BASIC_ATOMIC_INITIALIZER(1); |