Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2

1 files changed, 9 insertions, 0 deletions

diff --git a/src/declarative/scenegraph/qsgdistancefieldglyphcache.cpp b/src/declarative/scenegraph/qsgdistancefieldglyphcache.cpp
index a21fccefcf..27da408d65 100644
--- a/src/declarative/scenegraph/qsgdistancefieldglyphcache.cpp
+++ b/src/declarative/scenegraph/qsgdistancefieldglyphcache.cpp
@@ -678,6 +678,15 @@ int QSGDistanceFieldGlyphCache::distanceFieldRadius() const
 
 void QSGDistanceFieldGlyphCache::populate(int count, const glyph_t *glyphs)
 {
+    // Avoid useless and costly glyph re-generation
+    if (cacheIsFull() && !m_textureData->unusedGlyphs.isEmpty()) {
+        for (int i = 0; i < count; ++i) {
+            glyph_t glyphIndex = glyphs[i];
+            if (m_textureData->texCoords.contains(glyphIndex) && m_textureData->unusedGlyphs.contains(glyphIndex))
+                m_textureData->unusedGlyphs.remove(glyphIndex);
+        }
+    }
+
     for (int i = 0; i < count; ++i) {
         glyph_t glyphIndex = glyphs[i];
         if ((int) glyphIndex >= glyphCount()) {