diff options
Diffstat (limited to 'tests/CopySurfaceTest.cpp')
| -rw-r--r-- | tests/CopySurfaceTest.cpp | 36 |
1 files changed, 12 insertions, 24 deletions
diff --git a/tests/CopySurfaceTest.cpp b/tests/CopySurfaceTest.cpp index 68113e7ecc..053b456f57 100644 --- a/tests/CopySurfaceTest.cpp +++ b/tests/CopySurfaceTest.cpp @@ -10,9 +10,6 @@ #if SK_SUPPORT_GPU #include "GrContext.h" -#include "GrContextPriv.h" -#include "GrSurfaceContext.h" -#include "GrSurfaceProxy.h" #include "GrTexture.h" #include "GrTextureProvider.h" @@ -71,29 +68,22 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(CopySurface, reporter, ctxInfo) { dstDesc.fOrigin = dOrigin; dstDesc.fFlags = dFlags; - sk_sp<GrSurfaceProxy> src(GrSurfaceProxy::MakeDeferred( - *context->caps(), - context->textureProvider(), - srcDesc, SkBudgeted::kNo, - srcPixels.get(), - kRowBytes)); - - sk_sp<GrSurfaceProxy> dst(GrSurfaceProxy::MakeDeferred( - *context->caps(), - context->textureProvider(), - dstDesc, SkBudgeted::kNo, - dstPixels.get(), - kRowBytes)); + sk_sp<GrTexture> src( + context->textureProvider()->createTexture(srcDesc, SkBudgeted::kNo, + srcPixels.get(), + kRowBytes)); + sk_sp<GrTexture> dst( + context->textureProvider()->createTexture(dstDesc, SkBudgeted::kNo, + dstPixels.get(), + kRowBytes)); if (!src || !dst) { ERRORF(reporter, "Could not create surfaces for copy surface test."); continue; } - sk_sp<GrSurfaceContext> sContext = - context->contextPriv().makeTestSurfaceContext(dst); - - bool result = sContext->copy(src.get(), srcRect, dstPoint); + bool result + = context->copySurface(dst.get(), src.get(), srcRect, dstPoint); bool expectedResult = true; SkIPoint dstOffset = { dstPoint.fX - srcRect.fLeft, @@ -130,11 +120,9 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(CopySurface, reporter, ctxInfo) { continue; } - GrSurface* dstSurf = dst->instantiate(context->textureProvider()); - sk_memset32(read.get(), 0, kW * kH); - if (!dstSurf->readPixels(0, 0, kW, kH, baseDesc.fConfig, read.get(), - kRowBytes)) { + if (!dst->readPixels(0, 0, kW, kH, baseDesc.fConfig, read.get(), + kRowBytes)) { ERRORF(reporter, "Error calling readPixels"); continue; } |