From 6af2a668f4343bc0db87d27d28b0edc60f5cd6b9 Mon Sep 17 00:00:00 2001 From: Robert Phillips Date: Tue, 25 Jul 2017 14:11:29 +0000 Subject: 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 > Commit-Queue: Robert Phillips 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 Commit-Queue: Robert Phillips --- src/gpu/effects/GrTextureStripAtlas.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/gpu/effects') diff --git a/src/gpu/effects/GrTextureStripAtlas.cpp b/src/gpu/effects/GrTextureStripAtlas.cpp index 65e3c97cc6..dcc53625a1 100644 --- a/src/gpu/effects/GrTextureStripAtlas.cpp +++ b/src/gpu/effects/GrTextureStripAtlas.cpp @@ -207,8 +207,7 @@ void GrTextureStripAtlas::lockTexture() { builder[0] = static_cast(fCacheKey); builder.finish(); - sk_sp proxy = fDesc.fContext->resourceProvider()->findProxyByUniqueKey( - key, kTopLeft_GrSurfaceOrigin); + sk_sp proxy = fDesc.fContext->resourceProvider()->findProxyByUniqueKey(key); if (!proxy) { GrSurfaceDesc texDesc; texDesc.fOrigin = kTopLeft_GrSurfaceOrigin; -- cgit v1.2.3