aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools
diff options
context:
space:
mode:
authorGravatar Jim Van Verth <jvanverth@google.com>2017-09-12 11:54:11 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-09-12 17:16:00 +0000
commita950b63b442f1376d022740457b020ada62f6554 (patch)
tree8508e15a8ae8e6edc4fdba2d6e2273b5662e2add /tools
parent2ab4b2b871c01aa3dd6d2e43883461c722f01680 (diff)
Add support for additional textures in GrDrawOpAtlas
Step two in supporting growable/shrinkable atlases. Bug: skia:3550 Change-Id: I0cdec2a9f59cc8ced071bfeec2f8ed5a228c4b7a Reviewed-on: https://skia-review.googlesource.com/43260 Commit-Queue: Jim Van Verth <jvanverth@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/gpu/GrTest.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/gpu/GrTest.cpp b/tools/gpu/GrTest.cpp
index d3a1c4ff3f..3a74b6fe54 100644
--- a/tools/gpu/GrTest.cpp
+++ b/tools/gpu/GrTest.cpp
@@ -147,14 +147,14 @@ void GrContext::printGpuStats() const {
sk_sp<SkImage> GrContext::getFontAtlasImage_ForTesting(GrMaskFormat format) {
GrAtlasGlyphCache* cache = this->getAtlasGlyphCache();
- sk_sp<GrTextureProxy> proxy = cache->getProxy(format);
- if (!proxy) {
+ const sk_sp<GrTextureProxy>* proxies = cache->getProxies(format);
+ if (!proxies[0]) {
return nullptr;
}
- SkASSERT(proxy->priv().isExact());
+ SkASSERT(proxies[0]->priv().isExact());
sk_sp<SkImage> image(new SkImage_Gpu(this, kNeedNewImageUniqueID, kPremul_SkAlphaType,
- std::move(proxy), nullptr, SkBudgeted::kNo));
+ std::move(proxies[0]), nullptr, SkBudgeted::kNo));
return image;
}