diff options
| author |  Robert Phillips <robertphillips@google.com> | 2016-12-01 12:57:20 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-12-01 18:43:49 +0000 |
| commit | 155b29224d64b5c12bf7fc789edb5c257b6281c8 (patch) | |
| tree | 47f7179d9701d27a732219422266eee52c4d0bd4 | |
| parent | 0a2782c98c45127a10d6392c539e7bce72dc5513 (diff) | |
Remove use of makeDeferredRenderTargetContextWithFallback
This is a partial revert of https://codereview.chromium.org/2514543002 (Defer more renderTargetContexts in the GPU image filter paths - take 2)
I have been unable to reproduce the performance regression in crbug.com/668179 locally so intend to revert the above CL piecemeal.
BUG=668179
Change-Id: Idf3d66d71c452f5718d7b1d8d945ca7ff46b75d8
Reviewed-on: https://skia-review.googlesource.com/5441
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
| -rw-r--r-- | src/effects/SkAlphaThresholdFilter.cpp | 2 | ||||
| -rw-r--r-- | src/effects/SkBlurMaskFilter.cpp | 2 | ||||
| -rw-r--r-- | src/gpu/GrBlurUtils.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/effects/SkAlphaThresholdFilter.cpp b/src/effects/SkAlphaThresholdFilter.cpp index 43751e1199..9399c2115a 100644 --- a/src/effects/SkAlphaThresholdFilter.cpp +++ b/src/effects/SkAlphaThresholdFilter.cpp @@ -100,7 +100,7 @@ sk_sp<GrTextureProxy> SkAlphaThresholdFilterImpl::createMaskTexture(GrContext* c const SkMatrix& inMatrix, const SkIRect& bounds) const { - sk_sp<GrRenderTargetContext> rtContext(context->makeDeferredRenderTargetContextWithFallback( + sk_sp<GrRenderTargetContext> rtContext(context->makeRenderTargetContextWithFallback( SkBackingFit::kApprox, bounds.width(), bounds.height(), kAlpha_8_GrPixelConfig, nullptr)); if (!rtContext) { return nullptr; diff --git a/src/effects/SkBlurMaskFilter.cpp b/src/effects/SkBlurMaskFilter.cpp index e8867ead76..5657519114 100644 --- a/src/effects/SkBlurMaskFilter.cpp +++ b/src/effects/SkBlurMaskFilter.cpp @@ -1122,7 +1122,7 @@ static sk_sp<GrTexture> find_or_create_rrect_blur_mask(GrContext* context, sk_sp<GrTexture> mask(context->textureProvider()->findAndRefTextureByUniqueKey(key)); if (!mask) { // TODO: this could be approx but the texture coords will need to be updated - sk_sp<GrRenderTargetContext> rtc(context->makeDeferredRenderTargetContextWithFallback( + sk_sp<GrRenderTargetContext> rtc(context->makeRenderTargetContextWithFallback( SkBackingFit::kExact, size.fWidth, size.fHeight, kAlpha_8_GrPixelConfig, nullptr)); if (!rtc) { return nullptr; diff --git a/src/gpu/GrBlurUtils.cpp b/src/gpu/GrBlurUtils.cpp index 8f14bf75e5..61a40eafaa 100644 --- a/src/gpu/GrBlurUtils.cpp +++ b/src/gpu/GrBlurUtils.cpp @@ -104,7 +104,7 @@ static sk_sp<GrTextureProxy> create_mask_GPU(GrContext* context, sampleCnt = 0; } - sk_sp<GrRenderTargetContext> rtContext(context->makeDeferredRenderTargetContextWithFallback( + sk_sp<GrRenderTargetContext> rtContext(context->makeRenderTargetContextWithFallback( SkBackingFit::kApprox, maskRect.width(), maskRect.height(), kAlpha_8_GrPixelConfig, nullptr, sampleCnt)); if (!rtContext) { |