Force upload to VRAM in filterImage

src/core/SkImageFilter.cpp

 /*
  * Copyright 2012 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkImageFilter.h"
 #include "SkImageFilterCacheKey.h"
 
@@ skipping 233 matching lines @@
     const SkIRect srcSubset = fUsesSrcInput ? src->subset() : SkIRect::MakeWH(0, 0);
     Cache::Key key(fUniqueID, context.ctm(), context.clipBounds(), srcGenID, srcSubset);
     if (context.cache()) {
         SkSpecialImage* result = context.cache()->get(key, offset);
         if (result) {
             return sk_sp<SkSpecialImage>(SkRef(result));
         }
     }
 
     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);
         fCacheKeys.push_back(key);
     }
 
     return result;
 }
 
 bool SkImageFilter::filterImageDeprecated(Proxy* proxy, const SkBitmap& src,
@@ skipping 331 matching lines @@
                                                  SkSpecialImage* src,
                                                  const Context& ctx,
                                                  SkIPoint* offset) const {
     SkImageFilter* input = this->getInput(index);
     if (!input) {
         return sk_sp<SkSpecialImage>(SkRef(src));
     }
 
     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;
 }
 
 #if SK_SUPPORT_GPU
 
 bool SkImageFilter::filterInputGPUDeprecated(int index, SkImageFilter::Proxy* proxy,
                                              const SkBitmap& src, const Context& ctx,
                                              SkBitmap* result, SkIPoint* offset) const {
     SkImageFilter* input = this->getInput(index);
@@ skipping 203 matching lines @@
         dev = SkBitmapDevice::Create(cinfo.fInfo, surfaceProps);
     }
     return dev;
 }
 
 bool SkImageFilter::DeviceProxy::filterImage(const SkImageFilter* filter, const SkBitmap& src,
                                        const SkImageFilter::Context& ctx,
                                        SkBitmap* result, SkIPoint* offset) {
     return fDevice->filterImage(filter, src, ctx, result, offset);
 }