Defer more renderTargetContexts in the GPU image filter paths - take 2

src/effects/SkAlphaThresholdFilter.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkAlphaThresholdFilter.h"
 
 #include "SkBitmap.h"
 #include "SkReadBuffer.h"
 #include "SkSpecialImage.h"
 #include "SkWriteBuffer.h"
 #include "SkRegion.h"
 
 #if SK_SUPPORT_GPU
 #include "GrAlphaThresholdFragmentProcessor.h"
 #include "GrContext.h"
+#include "GrFixedClip.h"
 #include "GrRenderTargetContext.h"
-#include "GrFixedClip.h"
+#include "GrTextureProxy.h"
 #endif
 
 class SK_API SkAlphaThresholdFilterImpl : public SkImageFilter {
 public:
     SkAlphaThresholdFilterImpl(const SkRegion& region, SkScalar innerThreshold,
                                SkScalar outerThreshold, sk_sp<SkImageFilter> input,
                                const CropRect* cropRect = nullptr);
 
     SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkAlphaThresholdFilterImpl)
     friend void SkAlphaThresholdFilter::InitializeFlattenables();
 
 protected:
     void flatten(SkWriteBuffer&) const override;
 
     sk_sp<SkSpecialImage> onFilterImage(SkSpecialImage* source, const Context&,
                                         SkIPoint* offset) const override;
 
 #if SK_SUPPORT_GPU
-    sk_sp<GrTexture> createMaskTexture(GrContext*, const SkMatrix&, const SkIRect& bounds) const;
+    sk_sp<GrTextureProxy> createMaskTexture(GrContext*, 
+                                            const SkMatrix&,
+                                            const SkIRect& bounds) const;
 #endif
 
 private:
     SkRegion fRegion;
     SkScalar fInnerThreshold;
     SkScalar fOuterThreshold;
     typedef SkImageFilter INHERITED;
 };
 
 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_START(SkAlphaThresholdFilter)
@@ skipping 35 matching lines @@
                                                        SkScalar outerThreshold,
                                                        sk_sp<SkImageFilter> input,
                                                        const CropRect* cropRect)
     : INHERITED(&input, 1, cropRect)
     , fRegion(region)
     , fInnerThreshold(innerThreshold)
     , fOuterThreshold(outerThreshold) {
 }
 
 #if SK_SUPPORT_GPU
-sk_sp<GrTexture> SkAlphaThresholdFilterImpl::createMaskTexture(GrContext* context,
-                                                               const SkMatrix& inMatrix,
-                                                               const SkIRect& bounds) const {
+sk_sp<GrTextureProxy> SkAlphaThresholdFilterImpl::createMaskTexture(GrContext* context,
+                                                                    const SkMatrix& inMatrix,
+                                                                    const SkIRect& bounds) const {
 
-    sk_sp<GrRenderTargetContext> renderTargetContext(context->makeRenderTargetContextWithFallback(
+    sk_sp<GrRenderTargetContext> rtContext(context->makeDeferredRenderTargetContextWithFallback(
         SkBackingFit::kApprox, bounds.width(), bounds.height(), kAlpha_8_GrPixelConfig, nullptr));
-    if (!renderTargetContext) {
+    if (!rtContext) {
         return nullptr;
     }
 
     GrPaint grPaint;
     grPaint.setPorterDuffXPFactory(SkBlendMode::kSrc);
     SkRegion::Iterator iter(fRegion);
-    renderTargetContext->clear(nullptr, 0x0, true);
+    rtContext->clear(nullptr, 0x0, true);
 
     GrFixedClip clip(SkIRect::MakeWH(bounds.width(), bounds.height()));
     while (!iter.done()) {
         SkRect rect = SkRect::Make(iter.rect());
-        renderTargetContext->drawRect(clip, grPaint, inMatrix, rect);
+        rtContext->drawRect(clip, grPaint, inMatrix, rect);
         iter.next();
     }
 
-    return renderTargetContext->asTexture();
+    return sk_ref_sp(rtContext->asDeferredTexture());
 }
 #endif
 
 void SkAlphaThresholdFilterImpl::flatten(SkWriteBuffer& buffer) const {
     this->INHERITED::flatten(buffer);
     buffer.writeScalar(fInnerThreshold);
     buffer.writeScalar(fOuterThreshold);
     buffer.writeRegion(fRegion);
 }
 
@@ skipping 22 matching lines @@
         SkASSERT(inputTexture);
 
         offset->fX = bounds.left();
         offset->fY = bounds.top();
 
         bounds.offset(-inputOffset);
 
         SkMatrix matrix(ctx.ctm());
         matrix.postTranslate(SkIntToScalar(-bounds.left()), SkIntToScalar(-bounds.top()));
 
-        sk_sp<GrTexture> maskTexture(this->createMaskTexture(context, matrix, bounds));
-        if (!maskTexture) {
+        sk_sp<GrTextureProxy> maskProxy(this->createMaskTexture(context, matrix, bounds));
+        if (!maskProxy) {
             return nullptr;
         }
 
         const OutputProperties& outProps = ctx.outputProperties();
         sk_sp<GrColorSpaceXform> colorSpaceXform = GrColorSpaceXform::Make(input->getColorSpace(),
                                                                            outProps.colorSpace());
+
+        GrTexture* maskTex = maskProxy->instantiate(context->textureProvider());
+        if (!maskTex) {
+            return nullptr;
+        }
         sk_sp<GrFragmentProcessor> fp(GrAlphaThresholdFragmentProcessor::Make(
-                                                                         inputTexture.get(),
-                                                                         std::move(colorSpaceXform),
-                                                                         maskTexture.get(),
-                                                                         fInnerThreshold,
-                                                                         fOuterThreshold,
-                                                                         bounds));
+                                            inputTexture.get(),
+                                            std::move(colorSpaceXform),
+                                            maskTex,
+                                            fInnerThreshold,
+                                            fOuterThreshold,
+                                            bounds));
         if (!fp) {
             return nullptr;
         }
 
         return DrawWithFP(context, std::move(fp), bounds, outProps);
     }
 #endif
 
     SkBitmap inputBM;
 
@@ skipping 70 matching lines @@
                                           dst);
 }
 
 #ifndef SK_IGNORE_TO_STRING
 void SkAlphaThresholdFilterImpl::toString(SkString* str) const {
     str->appendf("SkAlphaThresholdImageFilter: (");
     str->appendf("inner: %f outer: %f", fInnerThreshold, fOuterThreshold);
     str->append(")");
 }
 #endif