diff options
| author |  Robert Phillips <robertphillips@google.com> | 2017-06-09 10:48:29 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-06-09 17:29:09 +0000 |
| commit | d9d84858bf0efa6fccd093aeafc29dd5f0b0356c (patch) | |
| tree | 95e1e1a9f8dc8ae942509e0d833bdefa263b94bf /include | |
| parent | a6aaa30359ea17f6bd61242695c788dc3707764f (diff) | |
Retract GrTexture.h a bit
This began as cleaning up SkSpecialImage.h & spiraled out of control from there.
Change-Id: I9a570ecd2a7af9ee724ebfebe4e9185748f38bbc
Reviewed-on: https://skia-review.googlesource.com/19290
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/core/SkMaskFilter.h | 2 | ||||
| -rw-r--r-- | include/private/GrTextureProxy.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/core/SkMaskFilter.h b/include/core/SkMaskFilter.h index 5cd5535904..1714d17bca 100644 --- a/include/core/SkMaskFilter.h +++ b/include/core/SkMaskFilter.h @@ -78,7 +78,7 @@ public: * If effect is non-NULL, a new GrProcessor instance is stored in it. The caller assumes * ownership of the effect and must unref it. */ - virtual bool asFragmentProcessor(GrFragmentProcessor**, GrTexture*, const SkMatrix& ctm) const; + virtual bool asFragmentProcessor(GrFragmentProcessor**) const { return false; } /** * If asFragmentProcessor() fails the filter may be implemented on the GPU by a subclass diff --git a/include/private/GrTextureProxy.h b/include/private/GrTextureProxy.h index dcc3afcdb1..2736e61c12 100644 --- a/include/private/GrTextureProxy.h +++ b/include/private/GrTextureProxy.h @@ -8,8 +8,8 @@ #ifndef GrTextureProxy_DEFINED #define GrTextureProxy_DEFINED +#include "GrSamplerParams.h" #include "GrSurfaceProxy.h" -#include "GrTexture.h" class GrCaps; class GrResourceProvider; |