From 4d8b9373c62b9b58c54548f41f1e9d84e9522c6e Mon Sep 17 00:00:00 2001 From: Michael Brasser Date: Mon, 2 Mar 2015 16:32:50 -0600 Subject: Use of fullsize distance field textures should be font-dependent. This shouldn't be a static decision as the glyph count depends on the font. Change-Id: I67ea98595505df4a3a30b16e867e76f89b28c1ef Task-number: QTBUG-29264 Reviewed-by: Gunnar Sletta Reviewed-by: Robin Burchell --- src/quick/scenegraph/qsgdefaultdistancefieldglyphcache.cpp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'src/quick/scenegraph') diff --git a/src/quick/scenegraph/qsgdefaultdistancefieldglyphcache.cpp b/src/quick/scenegraph/qsgdefaultdistancefieldglyphcache.cpp index b705ef48af..136f23f339 100644 --- a/src/quick/scenegraph/qsgdefaultdistancefieldglyphcache.cpp +++ b/src/quick/scenegraph/qsgdefaultdistancefieldglyphcache.cpp @@ -496,13 +496,7 @@ bool QSGDefaultDistanceFieldGlyphCache::useTextureUploadWorkaround() const bool QSGDefaultDistanceFieldGlyphCache::createFullSizeTextures() const { - static bool set = false; - static bool fullSize = false; - if (!set) { - fullSize = qsgPreferFullSizeGlyphCacheTextures() && glyphCount() > QT_DISTANCEFIELD_HIGHGLYPHCOUNT; - set = true; - } - return fullSize; + return qsgPreferFullSizeGlyphCacheTextures() && glyphCount() > QT_DISTANCEFIELD_HIGHGLYPHCOUNT; } int QSGDefaultDistanceFieldGlyphCache::maxTextureSize() const -- cgit v1.2.3