diff options
author | Yoann Lopes <yoann.lopes@nokia.com> | 2011-08-09 16:03:42 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-08-10 08:57:29 +0200 |
commit | 939f74ca4a5ff1df30c7fcd167fd6fb15945c6ab (patch) | |
tree | bc746915af5a57e986f5e0976a83ea34e0fa6752 /src/declarative/scenegraph/qsgdistancefieldglyphnode.cpp | |
parent | 2601011f1c0168f080c488be09c888042812f7cb (diff) |
QSGDistanceFieldGlyphCache code refactoring.
The distance field glyph caches are now contained in the QSGContext.
Change-Id: Ifc5d155917314b1cc5905ef86fdad0bbc5635c7d
Reviewed-on: http://codereview.qt.nokia.com/2787
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Diffstat (limited to 'src/declarative/scenegraph/qsgdistancefieldglyphnode.cpp')
-rw-r--r-- | src/declarative/scenegraph/qsgdistancefieldglyphnode.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/declarative/scenegraph/qsgdistancefieldglyphnode.cpp b/src/declarative/scenegraph/qsgdistancefieldglyphnode.cpp index 26326d0c75..c087a09835 100644 --- a/src/declarative/scenegraph/qsgdistancefieldglyphnode.cpp +++ b/src/declarative/scenegraph/qsgdistancefieldglyphnode.cpp @@ -46,8 +46,9 @@ QT_BEGIN_NAMESPACE -QSGDistanceFieldGlyphNode::QSGDistanceFieldGlyphNode() +QSGDistanceFieldGlyphNode::QSGDistanceFieldGlyphNode(QSGDistanceFieldGlyphCacheManager *cacheManager) : m_material(0) + , m_glyph_cacheManager(cacheManager) , m_glyph_cache(0) , m_geometry(QSGGeometry::defaultAttributes_TexturedPoint2D(), 0) , m_style(QSGText::Normal) @@ -58,10 +59,7 @@ QSGDistanceFieldGlyphNode::QSGDistanceFieldGlyphNode() { m_geometry.setDrawingMode(GL_TRIANGLES); setGeometry(&m_geometry); - -#ifndef QT_OPENGL_ES - setPreferredAntialiasingMode(QSGGlyphNode::SubPixelAntialiasing); -#endif + setPreferredAntialiasingMode(cacheManager->defaultAntialiasingMode()); } QSGDistanceFieldGlyphNode::~QSGDistanceFieldGlyphNode() @@ -245,7 +243,7 @@ void QSGDistanceFieldGlyphNode::updateGeometry() void QSGDistanceFieldGlyphNode::updateFont() { - m_glyph_cache = QSGDistanceFieldGlyphCache::get(QGLContext::currentContext(), m_glyphs.rawFont()); + m_glyph_cache = m_glyph_cacheManager->cache(m_glyphs.rawFont()); m_dirtyFont = false; } |