diff options
author | Robert Phillips <robertphillips@google.com> | 2017-05-29 15:05:15 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-05-29 19:26:26 +0000 |
commit | bb581ce30f55360fd3a12e7f5aa1fe324b16d085 (patch) | |
tree | 6ca8902e7c72278a3e796c9b3c2d3de02aa620b2 /tests/GrPorterDuffTest.cpp | |
parent | 9bee2e5894bb8dd374392f238bc429e16f239583 (diff) |
Convert DstTexture to DstProxy (take 2)
The last GrTexture-based TextureSampler::reset call must be removed before the TextureSamplers can become purely GrTextureProxy-backed
Reland of: https://skia-review.googlesource.com/c/16908/ (Convert DstTexture to DstProxy)
Split out of: https://skia-review.googlesource.com/c/10484/ (Omnibus: Push instantiation of GrTextures later (post TextureSampler))
Change-Id: I3a497b6a950fad899f23882c0a9552894ef640f8
Reviewed-on: https://skia-review.googlesource.com/17205
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'tests/GrPorterDuffTest.cpp')
-rw-r--r-- | tests/GrPorterDuffTest.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/tests/GrPorterDuffTest.cpp b/tests/GrPorterDuffTest.cpp index 90c9b50ce2..bf325981b4 100644 --- a/tests/GrPorterDuffTest.cpp +++ b/tests/GrPorterDuffTest.cpp @@ -1068,11 +1068,12 @@ DEF_GPUTEST(PorterDuffNoDualSourceBlending, reporter, /*factory*/) { kRGBA_8888_GrPixelConfig, backendTexHandle); - GrXferProcessor::DstTexture fakeDstTexture; - fakeDstTexture.setTexture( - ctx->resourceProvider()->wrapBackendTexture(backendTex, kTopLeft_GrSurfaceOrigin, - kNone_GrBackendTextureFlag, 0, - kBorrow_GrWrapOwnership)); + GrXferProcessor::DstProxy fakeDstProxy; + { + sk_sp<GrTextureProxy> proxy = GrSurfaceProxy::MakeWrappedBackend(ctx, backendTex, + kTopLeft_GrSurfaceOrigin); + fakeDstProxy.setProxy(std::move(proxy)); + } static const GrProcessorAnalysisColor colorInputs[] = { GrProcessorAnalysisColor::Opaque::kNo, GrProcessorAnalysisColor::Opaque::kYes, |