aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/core
diff options
context:
space:
mode:
authorGravatar robertphillips <robertphillips@google.com>2016-04-15 08:07:27 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-04-15 08:07:27 -0700
commit938115c9f8a3453ad6f511c0a23dabb46ec5a71f (patch)
treee8ad18d97be355d469708e7159fe0ec02bea4d31 /include/core
parent534c270465a9824893d5c9d6c5bacef7726cc389 (diff)
Remove asFragmentProcessor gpu-specific ImageFilter code path
No image filter should be using this code path now. TBR=reed@google.com GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1892493002 Review URL: https://codereview.chromium.org/1892493002
Diffstat (limited to 'include/core')
-rw-r--r--include/core/SkImageFilter.h27
1 files changed, 6 insertions, 21 deletions
diff --git a/include/core/SkImageFilter.h b/include/core/SkImageFilter.h
index d90e74de77..f8f62f1d84 100644
--- a/include/core/SkImageFilter.h
+++ b/include/core/SkImageFilter.h
@@ -182,7 +182,7 @@ public:
* The default implementation returns asFragmentProcessor(NULL, NULL, SkMatrix::I(),
* SkIRect()).
*/
- virtual bool canFilterImageGPU() const;
+ virtual bool canFilterImageGPU() const { return false; }
/**
* Process this image filter on the GPU. This is most often used for
@@ -194,8 +194,11 @@ public:
* relative to the src when it is drawn. The default implementation does
* single-pass processing using asFragmentProcessor().
*/
- virtual bool filterImageGPUDeprecated(Proxy*, const SkBitmap& src, const Context&,
- SkBitmap* result, SkIPoint* offset) const;
+ virtual bool filterImageGPUDeprecated(Proxy*, const SkBitmap&, const Context&,
+ SkBitmap*, SkIPoint*) const {
+ SkASSERT(false);
+ return false;
+ }
#if SK_SUPPORT_GPU
static sk_sp<SkSpecialImage> DrawWithFP(GrContext* context,
@@ -452,24 +455,6 @@ protected:
SkIRect* bounds) const;
/**
- * Returns true if the filter can be expressed a single-pass
- * GrProcessor, used to process this filter on the GPU, or false if
- * not.
- *
- * If effect is non-NULL, a new GrProcessor instance is stored
- * in it. The caller assumes ownership of the stage, and it is up to the
- * caller to unref it.
- *
- * The effect can assume its vertexCoords space maps 1-to-1 with texels
- * in the texture. "matrix" is a transformation to apply to filter
- * parameters before they are used in the effect. Note that this function
- * will be called with (NULL, NULL, SkMatrix::I()) to query for support,
- * so returning "true" indicates support for all possible matrices.
- */
- virtual bool asFragmentProcessor(GrFragmentProcessor**, GrTexture*, const SkMatrix&,
- const SkIRect& bounds) const;
-
- /**
* Creates a modified Context for use when recursing up the image filter DAG.
* The clip bounds are adjusted to accommodate any margins that this
* filter requires by calling this node's