diff options
| author |  Robert Phillips <robertphillips@google.com> | 2016-12-02 14:56:45 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-12-02 20:42:23 +0000 |
| commit | 51d77ffdc635b3208350262a3edea8d685453583 (patch) | |
| tree | d2793f944cfd63707978eaea871b52cbddc6e4f5 | |
| parent | 3e05671ace65faf4b849275f2eefb534e336e92f (diff) | |
Second part of piecemeal revert
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: Iee9d0164f85ae33ff8dfa9b3eb01c07fd825f017
Reviewed-on: https://skia-review.googlesource.com/5541
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
| -rw-r--r-- | src/core/SkBlurImageFilter.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/core/SkBlurImageFilter.cpp b/src/core/SkBlurImageFilter.cpp index 7d51a364d5..9ec3303ddd 100644 --- a/src/core/SkBlurImageFilter.cpp +++ b/src/core/SkBlurImageFilter.cpp @@ -168,11 +168,9 @@ sk_sp<SkSpecialImage> SkBlurImageFilterImpl::onFilterImage(SkSpecialImage* sourc } // TODO: Get the colorSpace from the renderTargetContext (once it has one) - return SkSpecialImage::MakeDeferredFromGpu( - context, - SkIRect::MakeWH(dstBounds.width(), dstBounds.height()), + return SkSpecialImage::MakeFromGpu(SkIRect::MakeWH(dstBounds.width(), dstBounds.height()), kNeedNewImageUniqueID_SpecialImage, - sk_ref_sp(renderTargetContext->asDeferredTexture()), + renderTargetContext->asTexture(), sk_ref_sp(input->getColorSpace()), &source->props()); } #endif |