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 --- tests/ProxyConversionTest.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/ProxyConversionTest.cpp') diff --git a/tests/ProxyConversionTest.cpp b/tests/ProxyConversionTest.cpp index 23ca695d42..513b680045 100644 --- a/tests/ProxyConversionTest.cpp +++ b/tests/ProxyConversionTest.cpp @@ -29,7 +29,7 @@ static sk_sp make_wrapped_FBO0(GrResourceProvider* provider, sk_sp defaultFBO(provider->wrapBackendRenderTarget(backendRT, desc.fOrigin)); SkASSERT(!defaultFBO->asTexture()); - return GrSurfaceProxy::MakeWrapped(std::move(defaultFBO), desc.fOrigin); + return GrSurfaceProxy::MakeWrapped(std::move(defaultFBO)); } static sk_sp make_wrapped_offscreen_rt(GrResourceProvider* provider, @@ -40,7 +40,7 @@ static sk_sp make_wrapped_offscreen_rt(GrResourceProvider* provi sk_sp tex(provider->createTexture(desc, budgeted)); - return GrSurfaceProxy::MakeWrapped(std::move(tex), desc.fOrigin); + return GrSurfaceProxy::MakeWrapped(std::move(tex)); } static sk_sp make_wrapped_texture(GrResourceProvider* provider, @@ -48,7 +48,7 @@ static sk_sp make_wrapped_texture(GrResourceProvider* provider, SkBudgeted budgeted) { sk_sp tex(provider->createTexture(desc, budgeted)); - return GrSurfaceProxy::MakeWrapped(std::move(tex), desc.fOrigin); + return GrSurfaceProxy::MakeWrapped(std::move(tex)); } // Test converting between RenderTargetProxies and TextureProxies for wrapped -- cgit v1.2.3