diff options
| author |  Robert Phillips <robertphillips@google.com> | 2017-07-25 14:11:29 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-07-25 14:11:45 +0000 |
| commit | 6af2a668f4343bc0db87d27d28b0edc60f5cd6b9 (patch) | |
| tree | 1c3272b266424d38a8b68850ac81806987276bc0 /src/gpu/GrTextureAdjuster.cpp | |
| parent | 0e05a823f6ff6e9d799172f002e77ab9f2015f0f (diff) | |
Revert "Reduce dependence on GrSurface's origin field (take 2)"
This reverts commit 22115b4fc6ab169d45a1cfb65dae2dc7e544c80a.
Reason for revert: GrAHardwareBufferImageGenerator.cpp
Original change's description:
> Reduce dependence on GrSurface's origin field (take 2)
>
> TBR=bsalomon@google.com
> Change-Id: Ia238fc66b0fe10a3626c7967b2ac1f1a4bf4cd71
> Reviewed-on: https://skia-review.googlesource.com/25800
> Reviewed-by: Robert Phillips <robertphillips@google.com>
> Commit-Queue: Robert Phillips <robertphillips@google.com>
TBR=bsalomon@google.com,robertphillips@google.com
Change-Id: I6dc77f02eed3073317128c48f0b426b81926787f
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/26480
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'src/gpu/GrTextureAdjuster.cpp')
| -rw-r--r-- | src/gpu/GrTextureAdjuster.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/gpu/GrTextureAdjuster.cpp b/src/gpu/GrTextureAdjuster.cpp index 166cb9d54b..11cb5b3c90 100644 --- a/src/gpu/GrTextureAdjuster.cpp +++ b/src/gpu/GrTextureAdjuster.cpp @@ -46,8 +46,7 @@ sk_sp<GrTextureProxy> GrTextureAdjuster::refTextureProxyCopy(const CopyParams& c GrUniqueKey key; this->makeCopyKey(copyParams, &key, nullptr); if (key.isValid()) { - sk_sp<GrTextureProxy> cachedCopy = fContext->resourceProvider()->findProxyByUniqueKey( - key, this->originalProxy()->origin()); + sk_sp<GrTextureProxy> cachedCopy = fContext->resourceProvider()->findProxyByUniqueKey(key); if (cachedCopy) { return cachedCopy; } |