diff options
author | 2017-11-15 10:39:15 -0500 | |
---|---|---|
committer | 2017-11-15 16:30:56 +0000 | |
commit | 09b8c91b696925c6c6a25c35173f2da27abf0fbe (patch) | |
tree | 2ed2e74eb88f6db496c2638f0c0f1bbf17b4e2bf /src/gpu/GrContext.cpp | |
parent | 8bf88eb7941ba245f0613df0151ae6ea2134c31e (diff) |
Temporarily disable multitexturing for iOS
Bug: skia:7285
Change-Id: Ia55084334dab7b1887320348fa7d291f64332fdb
Reviewed-on: https://skia-review.googlesource.com/71780
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Jim Van Verth <jvanverth@google.com>
Diffstat (limited to 'src/gpu/GrContext.cpp')
-rw-r--r-- | src/gpu/GrContext.cpp | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp index ba10fdcd68..68cf42ef2a 100644 --- a/src/gpu/GrContext.cpp +++ b/src/gpu/GrContext.cpp @@ -211,10 +211,20 @@ bool GrContext::init(const GrContextOptions& options) { new GrDrawingManager(this, prcOptions, atlasTextContextOptions, &fSingleOwner)); GrDrawOpAtlas::AllowMultitexturing allowMultitexturing; - if (options.fAllowMultipleGlyphCacheTextures == GrContextOptions::Enable::kNo) { - allowMultitexturing = GrDrawOpAtlas::AllowMultitexturing::kNo; - } else { - allowMultitexturing = GrDrawOpAtlas::AllowMultitexturing::kYes; + switch (options.fAllowMultipleGlyphCacheTextures) { + case GrContextOptions::Enable::kDefault: +#ifdef SK_BUILD_FOR_IOS + allowMultitexturing = GrDrawOpAtlas::AllowMultitexturing::kNo; +#else + allowMultitexturing = GrDrawOpAtlas::AllowMultitexturing::kYes; +#endif + break; + case GrContextOptions::Enable::kNo: + allowMultitexturing = GrDrawOpAtlas::AllowMultitexturing::kNo; + break; + case GrContextOptions::Enable::kYes: + allowMultitexturing = GrDrawOpAtlas::AllowMultitexturing::kYes; + break; } fAtlasGlyphCache = new GrAtlasGlyphCache(this, options.fGlyphCacheTextureMaximumBytes, allowMultitexturing); |