diff options
author | 2017-09-15 17:14:20 +0000 | |
---|---|---|
committer | 2017-09-15 17:14:25 +0000 | |
commit | ad70c41f678771f889449c296a8ab48640742050 (patch) | |
tree | 3a2b1175d806b3b1fe3b1af7cc298477fc82015f /src/gpu/effects/GrBitmapTextGeoProc.cpp | |
parent | 4127456bd631e79f1755fe974de90dd6c42e767f (diff) |
Revert "Allow GrDrawOpAtlas to grow as needed"
This reverts commit 03168b8a62a0d3d14b7a0d14642df4d82203b87c.
Reason for revert: Assert in resetting texture proxies.
Original change's description:
> Allow GrDrawOpAtlas to grow as needed
>
> Bug: skia:3550
> Change-Id: Ib5312c8c06ba8549d90545658df6686c45058255
> Reviewed-on: https://skia-review.googlesource.com/45841
> Commit-Queue: Jim Van Verth <jvanverth@google.com>
> Reviewed-by: Robert Phillips <robertphillips@google.com>
TBR=jvanverth@google.com,robertphillips@google.com
Change-Id: I05e084b4cefa57e558f296d6087d4f03fa16ac81
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:3550
Reviewed-on: https://skia-review.googlesource.com/47140
Reviewed-by: Jim Van Verth <jvanverth@google.com>
Commit-Queue: Jim Van Verth <jvanverth@google.com>
Diffstat (limited to 'src/gpu/effects/GrBitmapTextGeoProc.cpp')
-rw-r--r-- | src/gpu/effects/GrBitmapTextGeoProc.cpp | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/gpu/effects/GrBitmapTextGeoProc.cpp b/src/gpu/effects/GrBitmapTextGeoProc.cpp index 4df5cdf4a4..2d665c50cb 100644 --- a/src/gpu/effects/GrBitmapTextGeoProc.cpp +++ b/src/gpu/effects/GrBitmapTextGeoProc.cpp @@ -149,17 +149,6 @@ GrBitmapTextGeoProc::GrBitmapTextGeoProc(GrColor color, } } -void GrBitmapTextGeoProc::resetProxies(const sk_sp<GrTextureProxy> proxies[kMaxTextures], - const GrSamplerState& params) { - this->resetTextureSamplers(); - for (int i = 0; i < kMaxTextures; ++i) { - if (proxies[i]) { - fTextureSamplers[i].reset(std::move(proxies[i]), params); - this->addTextureSampler(&fTextureSamplers[i]); - } - } -} - void GrBitmapTextGeoProc::getGLSLProcessorKey(const GrShaderCaps& caps, GrProcessorKeyBuilder* b) const { GrGLBitmapTextGeoProc::GenKey(*this, caps, b); |