diff options
author | Jim Van Verth <jvanverth@google.com> | 2018-05-16 14:54:41 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-05-16 19:28:32 +0000 |
commit | cbeae03caee3b6c26c22f5f24c817521c78f8e43 (patch) | |
tree | bc24b50ca9e52de8fc783e087656027af1db53ce /src/gpu/effects/GrBitmapTextGeoProc.cpp | |
parent | af0f79c286ac955a94b2a0834099f3abd61584b5 (diff) |
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>
Diffstat (limited to 'src/gpu/effects/GrBitmapTextGeoProc.cpp')
-rw-r--r-- | src/gpu/effects/GrBitmapTextGeoProc.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/gpu/effects/GrBitmapTextGeoProc.cpp b/src/gpu/effects/GrBitmapTextGeoProc.cpp index 3efba9f509..14126794d7 100644 --- a/src/gpu/effects/GrBitmapTextGeoProc.cpp +++ b/src/gpu/effects/GrBitmapTextGeoProc.cpp @@ -122,7 +122,7 @@ private: 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 @@ GrBitmapTextGeoProc::GrBitmapTextGeoProc(GrColor color, , fUsesLocalCoords(usesLocalCoords) , fInColor(nullptr) , fMaskFormat(format) { - SkASSERT(numProxies <= kMaxTextures); + SkASSERT(numActiveProxies <= kMaxTextures); fInPosition = &this->addVertexAttrib("inPosition", kFloat2_GrVertexAttribType); @@ -142,7 +142,7 @@ GrBitmapTextGeoProc::GrBitmapTextGeoProc(GrColor color, } 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 @@ GrBitmapTextGeoProc::GrBitmapTextGeoProc(GrColor color, } 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()) { |