From c375704a20a811b9b8d294533f166bed44b7618d Mon Sep 17 00:00:00 2001 From: Robert Phillips Date: Wed, 17 May 2017 13:00:14 +0000 Subject: Revert "Convert DstTexture to DstProxy" This reverts commit 87f7f1c3ce519115141b40f1d8faede437c8f357. Reason for revert: grumble, grumble Original change's description: > Convert DstTexture to DstProxy > > The last GrTexture-based TextureSampler::reset call must be removed before the TextureSamplers can become purely GrTextureProxy-backed > > Split out of: https://skia-review.googlesource.com/c/10484/ (Omnibus: Push instantiation of GrTextures later (post TextureSampler)) > > Change-Id: Ic1435177d8b5d9bd3fc38b4903c9baae8205cfb0 > Reviewed-on: https://skia-review.googlesource.com/16908 > Reviewed-by: Greg Daniel > Commit-Queue: Robert Phillips > TBR=egdaniel@google.com,robertphillips@google.com NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Change-Id: I9af52bb222bd2d8cc696250a9efb62afb80edba1 Reviewed-on: https://skia-review.googlesource.com/17203 Reviewed-by: Robert Phillips Commit-Queue: Robert Phillips --- tests/GrPorterDuffTest.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'tests/GrPorterDuffTest.cpp') diff --git a/tests/GrPorterDuffTest.cpp b/tests/GrPorterDuffTest.cpp index e43347e641..780573d34f 100644 --- a/tests/GrPorterDuffTest.cpp +++ b/tests/GrPorterDuffTest.cpp @@ -1044,12 +1044,11 @@ DEF_GPUTEST(PorterDuffNoDualSourceBlending, reporter, /*factory*/) { kRGBA_8888_GrPixelConfig, backendTexHandle); - GrXferProcessor::DstProxy fakeDstProxy; - { - sk_sp proxy = GrSurfaceProxy::MakeWrappedBackend(ctx, backendTex, - kTopLeft_GrSurfaceOrigin); - fakeDstProxy.setProxy(std::move(proxy)); - } + GrXferProcessor::DstTexture fakeDstTexture; + fakeDstTexture.setTexture( + ctx->resourceProvider()->wrapBackendTexture(backendTex, kTopLeft_GrSurfaceOrigin, + kNone_GrBackendTextureFlag, 0, + kBorrow_GrWrapOwnership)); static const GrProcessorAnalysisColor colorInputs[] = { GrProcessorAnalysisColor::Opaque::kNo, GrProcessorAnalysisColor::Opaque::kYes, -- cgit v1.2.3