commit a950b63b442f1376d022740457b020ada62f6554
author Jim Van Verth <jvanverth@google.com> Tue Sep 12 11:54:11 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Sep 12 17:16:00 2017 +0000
tree 8508e15a8ae8e6edc4fdba2d6e2273b5662e2add
parent 2ab4b2b871c01aa3dd6d2e43883461c722f01680

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>

src/gpu/ops/GrSmallPathRenderer.cpp

diff --git a/src/gpu/ops/GrSmallPathRenderer.cpp b/src/gpu/ops/GrSmallPathRenderer.cpp
index ec63e9e..1c3cbe9 100644
--- a/src/gpu/ops/GrSmallPathRenderer.cpp
+++ b/src/gpu/ops/GrSmallPathRenderer.cpp
@@ -234,7 +234,7 @@
             flags |= fGammaCorrect ? kGammaCorrect_DistanceFieldEffectFlag : 0;
 
             flushInfo.fGeometryProcessor = GrDistanceFieldPathGeoProc::Make(
-                    this->color(), this->viewMatrix(), atlas->getProxy(),
+                    this->color(), this->viewMatrix(), atlas->getProxies(),
                     GrSamplerState::ClampBilerp(), flags, fHelper.usesLocalCoords());
         } else {
             SkMatrix invert;
@@ -249,7 +249,7 @@
             }
 
             flushInfo.fGeometryProcessor = GrBitmapTextGeoProc::Make(
-                    this->color(), atlas->getProxy(), GrSamplerState::ClampNearest(),
+                    this->color(), atlas->getProxies(), GrSamplerState::ClampNearest(),
                     kA8_GrMaskFormat, invert, fHelper.usesLocalCoords());
         }