diff options
| author |  Robert Phillips <robertphillips@google.com> | 2017-07-21 08:44:46 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-07-21 14:05:33 +0000 |
| commit | 467022b1861033d968195687da15270c208279ff (patch) | |
| tree | 34de5b201fb4dc64090c292cdc7bf924d073cae6 /src/gpu/GrBitmapTextureMaker.cpp | |
| parent | 594838a44dd1253e71c1b0330018d2b5180ccc32 (diff) | |
Reduce dependence on GrSurface's origin field
Unfortunately, GrGPU and its ilk are still using the GrSurface's origin a lot. I will clean that up in a second CL.
Change-Id: Iba729440ce8ea8d24bb7f4e5de55ed576a0f176d
Reviewed-on: https://skia-review.googlesource.com/24700
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/gpu/GrBitmapTextureMaker.cpp')
| -rw-r--r-- | src/gpu/GrBitmapTextureMaker.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gpu/GrBitmapTextureMaker.cpp b/src/gpu/GrBitmapTextureMaker.cpp index 762b72c811..85e791ef90 100644 --- a/src/gpu/GrBitmapTextureMaker.cpp +++ b/src/gpu/GrBitmapTextureMaker.cpp @@ -37,7 +37,8 @@ sk_sp<GrTextureProxy> GrBitmapTextureMaker::refOriginalTextureProxy(bool willBeM sk_sp<GrTextureProxy> proxy; if (fOriginalKey.isValid()) { - proxy = this->context()->resourceProvider()->findProxyByUniqueKey(fOriginalKey); + proxy = this->context()->resourceProvider()->findProxyByUniqueKey( + fOriginalKey, kTopLeft_GrSurfaceOrigin); if (proxy) { return proxy; } @@ -50,6 +51,7 @@ sk_sp<GrTextureProxy> GrBitmapTextureMaker::refOriginalTextureProxy(bool willBeM dstColorSpace); } if (proxy && fOriginalKey.isValid()) { + SkASSERT(proxy->origin() == kTopLeft_GrSurfaceOrigin); this->context()->resourceProvider()->assignUniqueKeyToProxy(fOriginalKey, proxy.get()); // MDB TODO (caching): this has to play nice with the GrSurfaceProxy's caching GrInstallBitmapUniqueKeyInvalidator(fOriginalKey, fBitmap.pixelRef()); |