diff options
| author |  Robert Phillips <robertphillips@google.com> | 2017-03-02 18:18:38 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-03 12:35:27 +0000 |
| commit | 2f49314227053dd5acc011e04681faee05c5e0ff (patch) | |
| tree | 2669e6d4567687bffea21da299834125124b831d /tests/ProcessorTest.cpp | |
| parent | 3b4c22d3731813d2d0f2ae0e68180b6eeacea7a2 (diff) | |
Make GrSurface::MakeDeferred return sk_sp<GrTextureProxy>
This should make upcoming changes less tedious
Change-Id: I313ae9df724f109a64cf5708a974e8bfeb963025
Reviewed-on: https://skia-review.googlesource.com/9183
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'tests/ProcessorTest.cpp')
| -rw-r--r-- | tests/ProcessorTest.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/ProcessorTest.cpp b/tests/ProcessorTest.cpp index 9d73805987..05be7bbea4 100644 --- a/tests/ProcessorTest.cpp +++ b/tests/ProcessorTest.cpp @@ -118,7 +118,7 @@ inline void testingOnly_getIORefCnts(const T* resource, int* refCnt, int* readCn *writeCnt = resource->fPendingWrites; } -void testingOnly_getIORefCnts(GrSurfaceProxy* proxy, int* refCnt, int* readCnt, int* writeCnt) { +void testingOnly_getIORefCnts(GrTextureProxy* proxy, int* refCnt, int* readCnt, int* writeCnt) { *refCnt = proxy->getBackingRefCnt_TestOnly(); *readCnt = proxy->getPendingReadCnt_TestOnly(); *writeCnt = proxy->getPendingWriteCnt_TestOnly(); @@ -138,7 +138,7 @@ DEF_GPUTEST_FOR_ALL_CONTEXTS(ProcessorRefTest, reporter, ctxInfo) { { bool texelBufferSupport = context->caps()->shaderCaps()->texelBufferSupport(); bool imageLoadStoreSupport = context->caps()->shaderCaps()->imageLoadStoreSupport(); - sk_sp<GrSurfaceProxy> proxy1(GrSurfaceProxy::MakeDeferred(context->textureProvider(), + sk_sp<GrTextureProxy> proxy1(GrSurfaceProxy::MakeDeferred(context->textureProvider(), *context->caps(), desc, SkBackingFit::kExact, SkBudgeted::kYes)); @@ -157,7 +157,7 @@ DEF_GPUTEST_FOR_ALL_CONTEXTS(ProcessorRefTest, reporter, ctxInfo) { SkTArray<sk_sp<GrTextureProxy>> proxies; SkTArray<sk_sp<GrBuffer>> buffers; SkTArray<TestFP::Image> images; - proxies.push_back(sk_ref_sp(proxy1->asTextureProxy())); + proxies.push_back(proxy1); if (texelBufferSupport) { buffers.push_back(buffer); } @@ -312,7 +312,7 @@ DEF_GPUTEST_FOR_GL_RENDERING_CONTEXTS(ProcessorOptimizationValidationTest, repor } desc.fConfig = kRGBA_8888_GrPixelConfig; - sk_sp<GrSurfaceProxy> dataProxy = GrSurfaceProxy::MakeDeferred(*context->caps(), + sk_sp<GrTextureProxy> dataProxy = GrSurfaceProxy::MakeDeferred(*context->caps(), context->textureProvider(), desc, SkBudgeted::kYes, rgbaData.get(), @@ -335,7 +335,7 @@ DEF_GPUTEST_FOR_GL_RENDERING_CONTEXTS(ProcessorOptimizationValidationTest, repor !fp->compatibleWithCoverageAsAlpha()) { continue; } - test_draw_op(context, rtc.get(), fp, sk_ref_sp(dataProxy->asTextureProxy())); + test_draw_op(context, rtc.get(), fp, dataProxy); memset(rgbaData.get(), 0x0, sizeof(GrColor) * 256 * 256); rtc->readPixels( SkImageInfo::Make(256, 256, kRGBA_8888_SkColorType, kPremul_SkAlphaType), |