diff options
| -rw-r--r-- | src/core/SkImageFilter.cpp | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/src/core/SkImageFilter.cpp b/src/core/SkImageFilter.cpp index 4af335ef41..6cbdf625fb 100644 --- a/src/core/SkImageFilter.cpp +++ b/src/core/SkImageFilter.cpp @@ -251,6 +251,16 @@ sk_sp<SkSpecialImage> SkImageFilter::filterImage(SkSpecialImage* src, const Cont } sk_sp<SkSpecialImage> result(this->onFilterImage(src, context, offset)); + +#if SK_SUPPORT_GPU + if (src->isTextureBacked() && result && !result->isTextureBacked()) { + // Keep the result on the GPU - this is still required for some + // image filters that don't support GPU in all cases + GrContext* context = src->getContext(); + result = result->makeTextureImage(src->internal_getProxy(), context); + } +#endif + if (result && context.cache()) { context.cache()->set(key, result.get(), *offset); SkAutoMutexAcquire mutex(fMutex); @@ -602,14 +612,7 @@ sk_sp<SkSpecialImage> SkImageFilter::filterInput(int index, sk_sp<SkSpecialImage> result(input->filterImage(src, this->mapContext(ctx), offset)); -#if SK_SUPPORT_GPU - if (src->isTextureBacked() && result && !result->isTextureBacked()) { - // Keep the result on the GPU - this is still required for some - // image filters that don't support GPU in all cases - GrContext* context = src->getContext(); - return result->makeTextureImage(src->internal_getProxy(), context); - } -#endif + SkASSERT(!result || src->isTextureBacked() == result->isTextureBacked()); return result; } |