commit cbeae03caee3b6c26c22f5f24c817521c78f8e43
author Jim Van Verth <jvanverth@google.com> Wed May 16 14:54:41 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed May 16 19:28:32 2018 +0000
tree bc24b50ca9e52de8fc783e087656027af1db53ce
parent af0f79c286ac955a94b2a0834099f3abd61584b5

Fix check for valid proxies returned by AtlasManager.

Also renames a lot of variables to make it clearer that getProxies()
returns the number of instantiated proxies, not the number of all
proxies.

Bug: skia:
Change-Id: Ifbc910cbd6635dccdb4e7f0df2e69a0f341130af
Reviewed-on: https://skia-review.googlesource.com/128660
Commit-Queue: Jim Van Verth <jvanverth@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>

src/gpu/effects/GrBitmapTextGeoProc.cpp

diff --git a/src/gpu/effects/GrBitmapTextGeoProc.cpp b/src/gpu/effects/GrBitmapTextGeoProc.cpp
index 3efba9f..1412679 100644
--- a/src/gpu/effects/GrBitmapTextGeoProc.cpp
+++ b/src/gpu/effects/GrBitmapTextGeoProc.cpp
@@ -122,7 +122,7 @@
 
 GrBitmapTextGeoProc::GrBitmapTextGeoProc(GrColor color,
                                          const sk_sp<GrTextureProxy>* proxies,
-                                         int numProxies,
+                                         int numActiveProxies,
                                          const GrSamplerState& params, GrMaskFormat format,
                                          const SkMatrix& localMatrix, bool usesLocalCoords)
         : INHERITED(kGrBitmapTextGeoProc_ClassID)
@@ -131,7 +131,7 @@
         , fUsesLocalCoords(usesLocalCoords)
         , fInColor(nullptr)
         , fMaskFormat(format) {
-    SkASSERT(numProxies <= kMaxTextures);
+    SkASSERT(numActiveProxies <= kMaxTextures);
 
     fInPosition = &this->addVertexAttrib("inPosition", kFloat2_GrVertexAttribType);
 
@@ -142,7 +142,7 @@
     }
 
     fInTextureCoords = &this->addVertexAttrib("inTextureCoords", kUShort2_GrVertexAttribType);
-    for (int i = 0; i < numProxies; ++i) {
+    for (int i = 0; i < numActiveProxies; ++i) {
         SkASSERT(proxies[i]);
 
         fTextureSamplers[i].reset(std::move(proxies[i]), params);
@@ -151,11 +151,11 @@
 }
 
 void GrBitmapTextGeoProc::addNewProxies(const sk_sp<GrTextureProxy>* proxies,
-                                        int numProxies,
+                                        int numActiveProxies,
                                         const GrSamplerState& params) {
-    SkASSERT(numProxies <= kMaxTextures);
+    SkASSERT(numActiveProxies <= kMaxTextures);
 
-    for (int i = 0; i < numProxies; ++i) {
+    for (int i = 0; i < numActiveProxies; ++i) {
         SkASSERT(proxies[i]);
 
         if (!fTextureSamplers[i].isInitialized()) {