From f200a90f3e58ce20753420cadced850d7d00dca1 Mon Sep 17 00:00:00 2001 From: Robert Phillips Date: Mon, 30 Jan 2017 13:27:37 -0500 Subject: Rationalize GrContext's Gr*Proxy getter naming This CL replaces the entry points: asDeferredSurface asDeferredTexture asDeferredRenderTarget with: GrSurfaceProxy* asSurfaceProxy sk_sp asSurfaceProxyRef GrTextureProxy* asTextureProxy sk_sp asTextureProxyRef GrRenderTargetProxy* asRenderTargetProxy sk_sp asRenderTargetProxyRef Change-Id: I7c2b1ea3d702023ff23019815ca13c9ff6f3b32d Reviewed-on: https://skia-review.googlesource.com/7741 Commit-Queue: Robert Phillips Reviewed-by: Brian Salomon --- src/gpu/effects/GrConfigConversionEffect.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/gpu/effects/GrConfigConversionEffect.cpp') diff --git a/src/gpu/effects/GrConfigConversionEffect.cpp b/src/gpu/effects/GrConfigConversionEffect.cpp index 74cf2ca44f..d9b408a6bb 100644 --- a/src/gpu/effects/GrConfigConversionEffect.cpp +++ b/src/gpu/effects/GrConfigConversionEffect.cpp @@ -254,10 +254,10 @@ void GrConfigConversionEffect::TestForPreservingPMConversions(GrContext* context context, sk_ref_sp(dataProxy->asTextureProxy()), GrSwizzle::RGBA(), *pmToUPMRule, SkMatrix::I())); sk_sp upmToPM(new GrConfigConversionEffect( - context, sk_ref_sp(readRTC->asDeferredTexture()), GrSwizzle::RGBA(), + context, readRTC->asTextureProxyRef(), GrSwizzle::RGBA(), *upmToPMRule, SkMatrix::I())); sk_sp pmToUPM2(new GrConfigConversionEffect( - context, sk_ref_sp(tempRTC->asDeferredTexture()), GrSwizzle::RGBA(), + context, tempRTC->asTextureProxyRef(), GrSwizzle::RGBA(), *pmToUPMRule, SkMatrix::I())); paint1.addColorFragmentProcessor(std::move(pmToUPM1)); -- cgit v1.2.3