diff options
| author |  Robert Phillips <robertphillips@google.com> | 2017-04-05 12:45:52 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-04-05 12:46:02 +0000 |
| commit | 171cc5fc87ede62712923f5a01db58059a027700 (patch) | |
| tree | 7cdad3bf4c252d43badcc9ce6442f9a2368dadb3 /include/gpu/GrProcessorUnitTest.h | |
| parent | 1cfcf2b167754cd3a9158ff6b73407c238c86269 (diff) | |
Revert "Rm readPixels from GrSurface & move read/writeSurfacePixels to GrContextPriv"
This reverts commit fb0bd98a43fa11e09705837418167dd72bb4a361.
Reason for revert: ANGLE failures
Original change's description:
> 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>
>
TBR=bsalomon@google.com,robertphillips@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: I7241070dc1f9df47181061e07adab141f9857974
Reviewed-on: https://skia-review.googlesource.com/11324
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'include/gpu/GrProcessorUnitTest.h')
| -rw-r--r-- | include/gpu/GrProcessorUnitTest.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/gpu/GrProcessorUnitTest.h b/include/gpu/GrProcessorUnitTest.h index d6269c85bd..912e393ca0 100644 --- a/include/gpu/GrProcessorUnitTest.h +++ b/include/gpu/GrProcessorUnitTest.h @@ -49,12 +49,12 @@ struct GrProcessorTestData { GrProcessorTestData(SkRandom* random, GrContext* context, const GrRenderTargetContext* renderTargetContext, - sk_sp<GrTextureProxy> proxies[2]) + GrTexture* const textures[2]) : fRandom(random) , fRenderTargetContext(renderTargetContext) , fContext(context) { - fProxies[0] = proxies[0]; - fProxies[1] = proxies[1]; + fProxies[0] = GrSurfaceProxy::MakeWrapped(sk_ref_sp(textures[0])); + fProxies[1] = GrSurfaceProxy::MakeWrapped(sk_ref_sp(textures[1])); } SkRandom* fRandom; const GrRenderTargetContext* fRenderTargetContext; |