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/effects | |
| 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/effects')
| -rw-r--r-- | src/effects/SkAlphaThresholdFilter.cpp | 2 | ||||
| -rw-r--r-- | src/effects/SkArithmeticImageFilter.cpp | 2 | ||||
| -rw-r--r-- | src/effects/SkBlurMaskFilter.cpp | 4 | ||||
| -rw-r--r-- | src/effects/SkDisplacementMapEffect.cpp | 2 | ||||
| -rw-r--r-- | src/effects/SkLightingImageFilter.cpp | 2 | ||||
| -rw-r--r-- | src/effects/SkMorphologyImageFilter.cpp | 4 | ||||
| -rw-r--r-- | src/effects/SkXfermodeImageFilter.cpp | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/src/effects/SkAlphaThresholdFilter.cpp b/src/effects/SkAlphaThresholdFilter.cpp index 82daa3c8eb..0e38cccd65 100644 --- a/src/effects/SkAlphaThresholdFilter.cpp +++ b/src/effects/SkAlphaThresholdFilter.cpp @@ -118,7 +118,7 @@ sk_sp<GrTextureProxy> SkAlphaThresholdFilterImpl::createMaskTexture(GrContext* c iter.next(); } - return sk_ref_sp(rtContext->asDeferredTexture()); + return rtContext->asTextureProxyRef(); } #endif diff --git a/src/effects/SkArithmeticImageFilter.cpp b/src/effects/SkArithmeticImageFilter.cpp index a9a232554f..c3847ff9c6 100644 --- a/src/effects/SkArithmeticImageFilter.cpp +++ b/src/effects/SkArithmeticImageFilter.cpp @@ -411,7 +411,7 @@ sk_sp<SkSpecialImage> ArithmeticImageFilterImpl::filterImageGPU( return SkSpecialImage::MakeDeferredFromGpu(context, SkIRect::MakeWH(bounds.width(), bounds.height()), kNeedNewImageUniqueID_SpecialImage, - sk_ref_sp(renderTargetContext->asDeferredTexture()), + renderTargetContext->asTextureProxyRef(), renderTargetContext->refColorSpace()); } #endif diff --git a/src/effects/SkBlurMaskFilter.cpp b/src/effects/SkBlurMaskFilter.cpp index 594a94e300..1da9816658 100644 --- a/src/effects/SkBlurMaskFilter.cpp +++ b/src/effects/SkBlurMaskFilter.cpp @@ -1135,7 +1135,7 @@ static sk_sp<GrTexture> find_or_create_rrect_blur_mask(GrContext* context, rtc->drawRRect(GrNoClip(), std::move(paint), GrAA::kYes, SkMatrix::I(), rrectToDraw, GrStyle::SimpleFill()); - sk_sp<GrTextureProxy> srcProxy(sk_ref_sp(rtc->asDeferredTexture())); + sk_sp<GrTextureProxy> srcProxy(rtc->asTextureProxyRef()); if (!srcProxy) { return nullptr; } @@ -1535,7 +1535,7 @@ sk_sp<GrTextureProxy> SkBlurMaskFilterImpl::filterMaskGPU(GrContext* context, SkRect::Make(clipRect)); } - return sk_ref_sp(renderTargetContext->asDeferredTexture()); + return renderTargetContext->asTextureProxyRef(); } #endif // SK_SUPPORT_GPU diff --git a/src/effects/SkDisplacementMapEffect.cpp b/src/effects/SkDisplacementMapEffect.cpp index cee47f4f3f..9693191c3b 100644 --- a/src/effects/SkDisplacementMapEffect.cpp +++ b/src/effects/SkDisplacementMapEffect.cpp @@ -374,7 +374,7 @@ sk_sp<SkSpecialImage> SkDisplacementMapEffect::onFilterImage(SkSpecialImage* sou context, SkIRect::MakeWH(bounds.width(), bounds.height()), kNeedNewImageUniqueID_SpecialImage, - sk_ref_sp(renderTargetContext->asDeferredTexture()), + renderTargetContext->asTextureProxyRef(), renderTargetContext->refColorSpace()); } #endif diff --git a/src/effects/SkLightingImageFilter.cpp b/src/effects/SkLightingImageFilter.cpp index 3a03a1701c..0a4ce2f46d 100644 --- a/src/effects/SkLightingImageFilter.cpp +++ b/src/effects/SkLightingImageFilter.cpp @@ -466,7 +466,7 @@ sk_sp<SkSpecialImage> SkLightingImageFilterInternal::filterImageGPU( context, SkIRect::MakeWH(offsetBounds.width(), offsetBounds.height()), kNeedNewImageUniqueID_SpecialImage, - sk_ref_sp(renderTargetContext->asDeferredTexture()), + renderTargetContext->asTextureProxyRef(), renderTargetContext->refColorSpace()); } #endif diff --git a/src/effects/SkMorphologyImageFilter.cpp b/src/effects/SkMorphologyImageFilter.cpp index febde203d5..75e019bd94 100644 --- a/src/effects/SkMorphologyImageFilter.cpp +++ b/src/effects/SkMorphologyImageFilter.cpp @@ -515,7 +515,7 @@ static sk_sp<SkSpecialImage> apply_morphology( : SK_ColorTRANSPARENT; dstRTContext->clear(&clearRect, clearColor, false); - srcTexture = sk_ref_sp(dstRTContext->asDeferredTexture()); + srcTexture = dstRTContext->asTextureProxyRef(); srcRect = dstRect; } if (radius.fHeight > 0) { @@ -530,7 +530,7 @@ static sk_sp<SkSpecialImage> apply_morphology( srcRect, dstRect, radius.fHeight, morphType, Gr1DKernelEffect::kY_Direction); - srcTexture = sk_ref_sp(dstRTContext->asDeferredTexture()); + srcTexture = dstRTContext->asTextureProxyRef(); } return SkSpecialImage::MakeDeferredFromGpu(context, diff --git a/src/effects/SkXfermodeImageFilter.cpp b/src/effects/SkXfermodeImageFilter.cpp index c52eebadc6..5f44919914 100644 --- a/src/effects/SkXfermodeImageFilter.cpp +++ b/src/effects/SkXfermodeImageFilter.cpp @@ -307,7 +307,7 @@ sk_sp<SkSpecialImage> SkXfermodeImageFilter_Base::filterImageGPU( return SkSpecialImage::MakeDeferredFromGpu(context, SkIRect::MakeWH(bounds.width(), bounds.height()), kNeedNewImageUniqueID_SpecialImage, - sk_ref_sp(renderTargetContext->asDeferredTexture()), + renderTargetContext->asTextureProxyRef(), renderTargetContext->refColorSpace()); } |