diff options
| author |  Robert Phillips <robertphillips@google.com> | 2017-01-30 13:27:37 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-01-30 19:05:36 +0000 |
| commit | f200a90f3e58ce20753420cadced850d7d00dca1 (patch) | |
| tree | d4618a39bdd6f74b070b236283819ae7f4770d33 /src/gpu/effects/GrConfigConversionEffect.cpp | |
| parent | efe3dedbb3493b738abdb56041b093245e4e8711 (diff) | |
Rationalize GrContext's Gr*Proxy getter naming
This CL replaces the entry points:
asDeferredSurface
asDeferredTexture
asDeferredRenderTarget
with:
GrSurfaceProxy* asSurfaceProxy
sk_sp<GrSurfaceProxy> asSurfaceProxyRef
GrTextureProxy* asTextureProxy
sk_sp<GrTextureProxy> asTextureProxyRef
GrRenderTargetProxy* asRenderTargetProxy
sk_sp<GrRenderTargetProxy> asRenderTargetProxyRef
Change-Id: I7c2b1ea3d702023ff23019815ca13c9ff6f3b32d
Reviewed-on: https://skia-review.googlesource.com/7741
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/gpu/effects/GrConfigConversionEffect.cpp')
| -rw-r--r-- | src/gpu/effects/GrConfigConversionEffect.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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<GrFragmentProcessor> upmToPM(new GrConfigConversionEffect( - context, sk_ref_sp(readRTC->asDeferredTexture()), GrSwizzle::RGBA(), + context, readRTC->asTextureProxyRef(), GrSwizzle::RGBA(), *upmToPMRule, SkMatrix::I())); sk_sp<GrFragmentProcessor> pmToUPM2(new GrConfigConversionEffect( - context, sk_ref_sp(tempRTC->asDeferredTexture()), GrSwizzle::RGBA(), + context, tempRTC->asTextureProxyRef(), GrSwizzle::RGBA(), *pmToUPMRule, SkMatrix::I())); paint1.addColorFragmentProcessor(std::move(pmToUPM1)); |