diff options
| author |  Hal Canary <halcanary@google.com> | 2018-01-16 18:33:07 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-01-16 18:33:14 +0000 |
| commit | be46e24d57537f7ab6854fcd6f6ec07e2c50495c (patch) | |
| tree | 8a0304af3a4ea0561af8ecced5b645250f0dd55b /src/gpu/GrDrawOpAtlas.cpp | |
| parent | 301152cc58e937561dfd6fa93099778fad5b01b3 (diff) | |
Revert "Move resourceProvider accessor to GrContextPriv"
This reverts commit 1f9ed8501b0007846b3032f4bfc38aee98c175a1.
Reason for revert:
1. breaking android roll
2. breaking Build-Debian9-Clang-arm-Release-Android_API26
Original change's description:
> Move resourceProvider accessor to GrContextPriv
>
> Change-Id: I5cddd620a7ec4b006b7359864ede58e9d4dd684e
> Reviewed-on: https://skia-review.googlesource.com/94340
> Reviewed-by: Brian Salomon <bsalomon@google.com>
> Reviewed-by: Greg Daniel <egdaniel@google.com>
> Commit-Queue: Robert Phillips <robertphillips@google.com>
TBR=egdaniel@google.com,bsalomon@google.com,robertphillips@google.com
Change-Id: I20b2d267c0925f20453b635663654967199a1197
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/94964
Reviewed-by: Hal Canary <halcanary@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
Diffstat (limited to 'src/gpu/GrDrawOpAtlas.cpp')
| -rw-r--r-- | src/gpu/GrDrawOpAtlas.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gpu/GrDrawOpAtlas.cpp b/src/gpu/GrDrawOpAtlas.cpp index 24e19f5b5e..0ba9deca04 100644 --- a/src/gpu/GrDrawOpAtlas.cpp +++ b/src/gpu/GrDrawOpAtlas.cpp @@ -188,7 +188,7 @@ inline bool GrDrawOpAtlas::updatePlot(GrDeferredUploadTarget* target, AtlasID* i // MDB TODO: this is currently fine since the atlas' proxy is always pre-instantiated. // Once it is deferred more care must be taken upon instantiation failure. - if (!fProxies[pageIdx]->instantiate(fContext->contextPriv().resourceProvider())) { + if (!fProxies[pageIdx]->instantiate(fContext->resourceProvider())) { return false; } @@ -309,7 +309,7 @@ bool GrDrawOpAtlas::addToAtlas(AtlasID* id, GrDeferredUploadTarget* target, int sk_sp<Plot> plotsp(SkRef(newPlot.get())); // MDB TODO: this is currently fine since the atlas' proxy is always pre-instantiated. // Once it is deferred more care must be taken upon instantiation failure. - if (!fProxies[pageIdx]->instantiate(fContext->contextPriv().resourceProvider())) { + if (!fProxies[pageIdx]->instantiate(fContext->resourceProvider())) { return false; } GrTextureProxy* proxy = fProxies[pageIdx].get(); |