diff options
| author |  Robert Phillips <robertphillips@google.com> | 2017-04-05 12:18:58 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-04-05 17:00:10 +0000 |
| commit | aaee31f18c0845417103d84285e365575def3c40 (patch) | |
| tree | 9d0cea264cacdf51f64919ffc8f2b2d5dc83e961 /tests/TestUtils.cpp | |
| parent | babb101291784b844a99b20b5164b271758f6d33 (diff) | |
Rm readPixels from GrSurface & move read/writeSurfacePixels to GrContextPriv (take 2)
This is in service of: https://skia-review.googlesource.com/c/11125/ (Add parallel proxyID to StencilOps & RenderTargetOpList) where I want a better choke point for texture creation to improve discard handling.
This is a reland of: https://skia-review.googlesource.com/c/11200/ (Rm readPixels from GrSurface & move read/writeSurfacePixels to GrContextPriv)
Change-Id: Icd0a90d2beb483dc24ed87c3bace9c817019e148
Reviewed-on: https://skia-review.googlesource.com/11326
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'tests/TestUtils.cpp')
| -rw-r--r-- | tests/TestUtils.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/TestUtils.cpp b/tests/TestUtils.cpp index d0349614f1..aca7509748 100644 --- a/tests/TestUtils.cpp +++ b/tests/TestUtils.cpp @@ -80,6 +80,8 @@ void test_copy_from_surface(skiatest::Reporter* reporter, GrContext* context, } copyDstDesc.fFlags = flags; + copyDstDesc.fOrigin = (kNone_GrSurfaceFlags == flags) ? kTopLeft_GrSurfaceOrigin + : kBottomLeft_GrSurfaceOrigin; sk_sp<GrSurfaceContext> dstContext(GrSurfaceProxy::TestCopy(context, copyDstDesc, proxy)); @@ -106,6 +108,8 @@ void test_copy_to_surface(skiatest::Reporter* reporter, GrResourceProvider* reso for (auto flags : { kNone_GrSurfaceFlags, kRenderTarget_GrSurfaceFlag }) { copySrcDesc.fFlags = flags; + copySrcDesc.fOrigin = (kNone_GrSurfaceFlags == flags) ? kTopLeft_GrSurfaceOrigin + : kBottomLeft_GrSurfaceOrigin; sk_sp<GrTextureProxy> src(GrSurfaceProxy::MakeDeferred(resourceProvider, copySrcDesc, |