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/ProxyConversionTest.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/ProxyConversionTest.cpp')
| -rw-r--r-- | tests/ProxyConversionTest.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/tests/ProxyConversionTest.cpp b/tests/ProxyConversionTest.cpp index 4504a65b4f..468ddd9cd8 100644 --- a/tests/ProxyConversionTest.cpp +++ b/tests/ProxyConversionTest.cpp @@ -128,12 +128,12 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(DefferredProxyConversionTest, reporter, ctxIn desc.fConfig = kRGBA_8888_GrPixelConfig; { - sk_sp<GrSurfaceProxy> sProxy(GrSurfaceProxy::MakeDeferred(texProvider, caps, desc, - SkBackingFit::kApprox, - SkBudgeted::kYes)); + sk_sp<GrTextureProxy> proxy(GrSurfaceProxy::MakeDeferred(texProvider, caps, desc, + SkBackingFit::kApprox, + SkBudgeted::kYes)); // Both RenderTarget and Texture - GrRenderTargetProxy* rtProxy = sProxy->asRenderTargetProxy(); + GrRenderTargetProxy* rtProxy = proxy->asRenderTargetProxy(); REPORTER_ASSERT(reporter, rtProxy); GrTextureProxy* tProxy = rtProxy->asTextureProxy(); REPORTER_ASSERT(reporter, tProxy); @@ -142,12 +142,12 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(DefferredProxyConversionTest, reporter, ctxIn } { - sk_sp<GrSurfaceProxy> sProxy(GrSurfaceProxy::MakeDeferred(texProvider, caps, desc, - SkBackingFit::kApprox, - SkBudgeted::kYes)); + sk_sp<GrTextureProxy> proxy(GrSurfaceProxy::MakeDeferred(texProvider, caps, desc, + SkBackingFit::kApprox, + SkBudgeted::kYes)); // Both RenderTarget and Texture - but via GrTextureProxy - GrTextureProxy* tProxy = sProxy->asTextureProxy(); + GrTextureProxy* tProxy = proxy->asTextureProxy(); REPORTER_ASSERT(reporter, tProxy); GrRenderTargetProxy* rtProxy = tProxy->asRenderTargetProxy(); REPORTER_ASSERT(reporter, rtProxy); @@ -158,12 +158,12 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(DefferredProxyConversionTest, reporter, ctxIn { desc.fFlags = kNone_GrSurfaceFlags; // force no-RT - sk_sp<GrSurfaceProxy> sProxy(GrSurfaceProxy::MakeDeferred(texProvider, caps, desc, - SkBackingFit::kApprox, - SkBudgeted::kYes)); + sk_sp<GrTextureProxy> proxy(GrSurfaceProxy::MakeDeferred(texProvider, caps, desc, + SkBackingFit::kApprox, + SkBudgeted::kYes)); // Texture-only - GrTextureProxy* tProxy = sProxy->asTextureProxy(); + GrTextureProxy* tProxy = proxy->asTextureProxy(); REPORTER_ASSERT(reporter, tProxy); REPORTER_ASSERT(reporter, tProxy->asTextureProxy() == tProxy); REPORTER_ASSERT(reporter, !tProxy->asRenderTargetProxy()); |