Index: src/effects/SkXfermodeImageFilter.cpp |
diff --git a/src/effects/SkXfermodeImageFilter.cpp b/src/effects/SkXfermodeImageFilter.cpp |
index b1e19bbec3e207e82db9617473baa8f8e02fde5a..b1ac1c32e08ac9c20bc8eed444f350f3056080eb 100644 |
--- a/src/effects/SkXfermodeImageFilter.cpp |
+++ b/src/effects/SkXfermodeImageFilter.cpp |
@@ -176,6 +176,16 @@ |
foregroundTex = foreground->asTextureRef(context); |
} |
+ GrSurfaceDesc desc; |
+ desc.fFlags = kRenderTarget_GrSurfaceFlag; |
+ desc.fWidth = bounds.width(); |
+ desc.fHeight = bounds.height(); |
+ desc.fConfig = kSkia8888_GrPixelConfig; |
+ sk_sp<GrTexture> dst(context->textureProvider()->createApproxTexture(desc)); |
+ if (!dst) { |
+ return nullptr; |
+ } |
+ |
GrPaint paint; |
// SRGBTODO: AllowSRGBInputs? |
SkAutoTUnref<const GrFragmentProcessor> bgFP; |
@@ -226,11 +236,11 @@ |
mode.reset(new SkProcCoeffXfermode(rec, SkXfermode::kSrcOver_Mode)); |
} |
- sk_sp<const GrFragmentProcessor> xferFP(mode->getFragmentProcessorForImageFilter(bgFP)); |
+ SkAutoTUnref<const GrFragmentProcessor> xferFP(mode->getFragmentProcessorForImageFilter(bgFP)); |
// A null 'xferFP' here means kSrc_Mode was used in which case we can just proceed |
if (xferFP) { |
- paint.addColorFragmentProcessor(xferFP.get()); |
+ paint.addColorFragmentProcessor(xferFP); |
} |
} else { |
paint.addColorFragmentProcessor(bgFP); |
@@ -238,9 +248,7 @@ |
paint.setPorterDuffXPFactory(SkXfermode::kSrc_Mode); |
- sk_sp<GrDrawContext> drawContext(context->newDrawContext(GrContext::kLoose_BackingFit, |
- bounds.width(), bounds.height(), |
- kSkia8888_GrPixelConfig)); |
+ sk_sp<GrDrawContext> drawContext(context->drawContext(sk_ref_sp(dst->asRenderTarget()))); |
if (!drawContext) { |
return nullptr; |
} |
@@ -251,7 +259,7 @@ |
return SkSpecialImage::MakeFromGpu(SkIRect::MakeWH(bounds.width(), bounds.height()), |
kNeedNewImageUniqueID_SpecialImage, |
- drawContext->asTexture()); |
-} |
- |
-#endif |
+ std::move(dst)); |
+} |
+ |
+#endif |