diff options
| author |  joshualitt <joshualitt@chromium.org> | 2015-07-08 09:10:03 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-07-08 09:10:03 -0700 |
| commit | 85ff25e8d905502ec09d057ecc6245f487bf94ce (patch) | |
| tree | faab885cc099d13f46989ac3765742e5de96cfea /include | |
| parent | 711a245dda74d92db8508c2ec835d62ed09b4d1b (diff) | |
Thread GrShaderDataManager through Image filters
TBR=bsalomon@google.com
BUG=skia:
Review URL: https://codereview.chromium.org/1229613002
Diffstat (limited to 'include')
| -rw-r--r-- | include/core/SkImageFilter.h | 5 | ||||
| -rw-r--r-- | include/effects/SkMagnifierImageFilter.h | 8 | ||||
| -rw-r--r-- | include/effects/SkMatrixConvolutionImageFilter.h | 8 |
3 files changed, 11 insertions, 10 deletions
diff --git a/include/core/SkImageFilter.h b/include/core/SkImageFilter.h index 4125db3734..ea0bd22f1a 100644 --- a/include/core/SkImageFilter.h +++ b/include/core/SkImageFilter.h @@ -16,6 +16,7 @@ #include "SkTemplates.h" class GrFragmentProcessor; +class GrShaderDataManager; class GrTexture; class SkBaseDevice; class SkBitmap; @@ -340,8 +341,8 @@ protected: * 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; + virtual bool asFragmentProcessor(GrFragmentProcessor**, GrShaderDataManager*, GrTexture*, + const SkMatrix&, const SkIRect& bounds) const; private: friend class SkGraphics; diff --git a/include/effects/SkMagnifierImageFilter.h b/include/effects/SkMagnifierImageFilter.h index 6df95b233a..4371456de3 100644 --- a/include/effects/SkMagnifierImageFilter.h +++ b/include/effects/SkMagnifierImageFilter.h @@ -23,11 +23,11 @@ protected: SkMagnifierImageFilter(const SkRect& srcRect, SkScalar inset, SkImageFilter* input); void flatten(SkWriteBuffer&) const override; - virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&, - SkBitmap* result, SkIPoint* offset) const override; + bool onFilterImage(Proxy*, const SkBitmap& src, const Context&, + SkBitmap* result, SkIPoint* offset) const override; #if SK_SUPPORT_GPU - virtual bool asFragmentProcessor(GrFragmentProcessor**, GrTexture*, const SkMatrix&, - const SkIRect& bounds) const override; + bool asFragmentProcessor(GrFragmentProcessor**, GrShaderDataManager*, GrTexture*, + const SkMatrix&, const SkIRect& bounds) const override; #endif private: diff --git a/include/effects/SkMatrixConvolutionImageFilter.h b/include/effects/SkMatrixConvolutionImageFilter.h index 3bbfc4f09b..62c69357eb 100644 --- a/include/effects/SkMatrixConvolutionImageFilter.h +++ b/include/effects/SkMatrixConvolutionImageFilter.h @@ -77,14 +77,14 @@ protected: const CropRect* cropRect); void flatten(SkWriteBuffer&) const override; - virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&, - SkBitmap* result, SkIPoint* loc) const override; + bool onFilterImage(Proxy*, const SkBitmap& src, const Context&, + SkBitmap* result, SkIPoint* loc) const override; bool onFilterBounds(const SkIRect&, const SkMatrix&, SkIRect*) const override; #if SK_SUPPORT_GPU - virtual bool asFragmentProcessor(GrFragmentProcessor**, GrTexture*, const SkMatrix&, - const SkIRect& bounds) const override; + bool asFragmentProcessor(GrFragmentProcessor**, GrShaderDataManager*, GrTexture*, + const SkMatrix&, const SkIRect& bounds) const override; #endif private: |