From aaee31f18c0845417103d84285e365575def3c40 Mon Sep 17 00:00:00 2001 From: Robert Phillips Date: Wed, 5 Apr 2017 12:18:58 -0400 Subject: 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 Commit-Queue: Robert Phillips --- include/gpu/GrProcessorUnitTest.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'include/gpu/GrProcessorUnitTest.h') diff --git a/include/gpu/GrProcessorUnitTest.h b/include/gpu/GrProcessorUnitTest.h index 912e393ca0..d6269c85bd 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, - GrTexture* const textures[2]) + sk_sp proxies[2]) : fRandom(random) , fRenderTargetContext(renderTargetContext) , fContext(context) { - fProxies[0] = GrSurfaceProxy::MakeWrapped(sk_ref_sp(textures[0])); - fProxies[1] = GrSurfaceProxy::MakeWrapped(sk_ref_sp(textures[1])); + fProxies[0] = proxies[0]; + fProxies[1] = proxies[1]; } SkRandom* fRandom; const GrRenderTargetContext* fRenderTargetContext; -- cgit v1.2.3