diff options
| author |  Robert Phillips <robertphillips@google.com> | 2016-12-05 13:18:47 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-12-05 13:48:53 +0000 |
| commit | 55360b11c7da3b19e0c5ae1aa5a7a457cb5e373a (patch) | |
| tree | 29d3b8999e95dbdca333a155adb630e9189ef512 | |
| parent | b048e81c5c27fe6c6134eaf9ab96594e2eee0d1d (diff) | |
Revert "Remove use of makeDeferredRenderTargetContextWithFallback"
This reverts commit 155b29224d64b5c12bf7fc789edb5c257b6281c8.
Reason for revert:
https://skia-review.googlesource.com/c/5541/ (Second part of piecemeal revert) seems to have zeroed in on the change that caused the perf regression. Let's see if the changes reverted in this CL are acceptable.
Change-Id: I477fe23d84a9c14f87a431ec2b495f617ff410be
Reviewed-on: https://skia-review.googlesource.com/5573
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Robert Phillips <robertphillips@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 9399c2115a..43751e1199 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->makeRenderTargetContextWithFallback( + sk_sp<GrRenderTargetContext> rtContext(context->makeDeferredRenderTargetContextWithFallback( 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 5657519114..e8867ead76 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->makeRenderTargetContextWithFallback( + sk_sp<GrRenderTargetContext> rtc(context->makeDeferredRenderTargetContextWithFallback( 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 61a40eafaa..8f14bf75e5 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->makeRenderTargetContextWithFallback( + sk_sp<GrRenderTargetContext> rtContext(context->makeDeferredRenderTargetContextWithFallback( SkBackingFit::kApprox, maskRect.width(), maskRect.height(), kAlpha_8_GrPixelConfig, nullptr, sampleCnt)); if (!rtContext) { |