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 --- tests/GrSurfaceTest.cpp | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'tests/GrSurfaceTest.cpp') diff --git a/tests/GrSurfaceTest.cpp b/tests/GrSurfaceTest.cpp index d98d0d0428..97700b1a85 100644 --- a/tests/GrSurfaceTest.cpp +++ b/tests/GrSurfaceTest.cpp @@ -27,11 +27,10 @@ DEF_GPUTEST_FOR_NULLGL_CONTEXT(GrSurface, reporter, ctxInfo) { desc.fWidth = 256; desc.fHeight = 256; desc.fSampleCnt = 0; - GrSurface* texRT1 = context->resourceProvider()->createTexture( - desc, SkBudgeted::kNo, nullptr, 0); + sk_sp texRT1 = context->resourceProvider()->createTexture(desc, SkBudgeted::kNo); - REPORTER_ASSERT(reporter, texRT1 == texRT1->asRenderTarget()); - REPORTER_ASSERT(reporter, texRT1 == texRT1->asTexture()); + REPORTER_ASSERT(reporter, texRT1.get() == texRT1->asRenderTarget()); + REPORTER_ASSERT(reporter, texRT1.get() == texRT1->asTexture()); REPORTER_ASSERT(reporter, static_cast(texRT1->asRenderTarget()) == texRT1->asTexture()); REPORTER_ASSERT(reporter, texRT1->asRenderTarget() == @@ -40,10 +39,10 @@ DEF_GPUTEST_FOR_NULLGL_CONTEXT(GrSurface, reporter, ctxInfo) { static_cast(texRT1->asTexture())); desc.fFlags = kNone_GrSurfaceFlags; - GrSurface* tex1 = context->resourceProvider()->createTexture(desc, SkBudgeted::kNo, nullptr, 0); + sk_sp tex1 = context->resourceProvider()->createTexture(desc, SkBudgeted::kNo); REPORTER_ASSERT(reporter, nullptr == tex1->asRenderTarget()); - REPORTER_ASSERT(reporter, tex1 == tex1->asTexture()); - REPORTER_ASSERT(reporter, static_cast(tex1) == tex1->asTexture()); + REPORTER_ASSERT(reporter, tex1.get() == tex1->asTexture()); + REPORTER_ASSERT(reporter, static_cast(tex1.get()) == tex1->asTexture()); GrBackendObject backendTex = context->getGpu()->createTestingOnlyBackendTexture( nullptr, 256, 256, kRGBA_8888_GrPixelConfig); @@ -66,8 +65,6 @@ DEF_GPUTEST_FOR_NULLGL_CONTEXT(GrSurface, reporter, ctxInfo) { REPORTER_ASSERT(reporter, static_cast(texRT2->asRenderTarget()) == static_cast(texRT2->asTexture())); - texRT1->unref(); - tex1->unref(); context->getGpu()->deleteTestingOnlyBackendTexture(backendTex); } -- cgit v1.2.3