aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/scenegraph/qsgdefaultdistancefieldglyphcache.cpp
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@live.com>2015-03-02 16:32:50 -0600
committerMichael Brasser <michael.brasser@live.com>2015-03-03 14:15:08 +0000
commit4d8b9373c62b9b58c54548f41f1e9d84e9522c6e (patch)
tree82634f29d99f42ba32bc092841797b1fdf39433a /src/quick/scenegraph/qsgdefaultdistancefieldglyphcache.cpp
parent63f7a61cbfc787804b658729ecaf2a8d8da26e70 (diff)
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 <gunnar@sletta.org> Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
Diffstat (limited to 'src/quick/scenegraph/qsgdefaultdistancefieldglyphcache.cpp')
-rw-r--r--src/quick/scenegraph/qsgdefaultdistancefieldglyphcache.cpp8
1 files changed, 1 insertions, 7 deletions
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