diff options
| author |  Robert Phillips <robertphillips@google.com> | 2017-04-04 16:50:22 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-04-05 11:55:35 +0000 |
| commit | fb0bd98a43fa11e09705837418167dd72bb4a361 (patch) | |
| tree | 67579cf4663c41d4b9ec36bbd61020aa3ccbe57f /tests/ProxyTest.cpp | |
| parent | be5387b9308ad0b92a48a1272b618b6eaa08a771 (diff) | |
Rm readPixels from GrSurface & move read/writeSurfacePixels to GrContextPriv
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.
Change-Id: If57a7de47edc0853dae7bc61337d9acdc03d63b0
Reviewed-on: https://skia-review.googlesource.com/11200
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'tests/ProxyTest.cpp')
| -rw-r--r-- | tests/ProxyTest.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/ProxyTest.cpp b/tests/ProxyTest.cpp index 648ae1d6c8..7657e28f5a 100644 --- a/tests/ProxyTest.cpp +++ b/tests/ProxyTest.cpp @@ -137,7 +137,7 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(DeferredProxyTest, reporter, ctxInfo) { if (SkBackingFit::kApprox == fit) { tex.reset(provider->createApproxTexture(desc, 0)); } else { - tex.reset(provider->createTexture(desc, budgeted)); + tex = provider->createTexture(desc, budgeted); } sk_sp<GrTextureProxy> proxy(GrSurfaceProxy::MakeDeferred( @@ -170,7 +170,7 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(DeferredProxyTest, reporter, ctxInfo) { if (SkBackingFit::kApprox == fit) { tex.reset(provider->createApproxTexture(desc, 0)); } else { - tex.reset(provider->createTexture(desc, budgeted)); + tex = provider->createTexture(desc, budgeted); } sk_sp<GrTextureProxy> proxy(GrSurfaceProxy::MakeDeferred(provider, @@ -249,7 +249,7 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(WrappedProxyTest, reporter, ctxInfo) { // Internal offscreen render target. if (renderable) { desc.fFlags = kRenderTarget_GrSurfaceFlag; - tex.reset(provider->createTexture(desc, budgeted)); + tex = provider->createTexture(desc, budgeted); sk_sp<GrRenderTarget> rt(sk_ref_sp(tex->asRenderTarget())); sk_sp<GrSurfaceProxy> sProxy(GrSurfaceProxy::MakeWrapped(rt)); @@ -264,7 +264,7 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(WrappedProxyTest, reporter, ctxInfo) { if (!tex) { SkASSERT(kNone_GrSurfaceFlags == desc.fFlags ); desc.fSampleCnt = 0; - tex.reset(provider->createTexture(desc, budgeted)); + tex = provider->createTexture(desc, budgeted); } sk_sp<GrSurfaceProxy> sProxy(GrSurfaceProxy::MakeWrapped(tex)); |