From d9d84858bf0efa6fccd093aeafc29dd5f0b0356c Mon Sep 17 00:00:00 2001 From: Robert Phillips Date: Fri, 9 Jun 2017 10:48:29 -0400 Subject: 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 Commit-Queue: Robert Phillips --- include/core/SkMaskFilter.h | 2 +- include/private/GrTextureProxy.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'include') 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; -- cgit v1.2.3