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 /src/effects | |
| parent | 711a245dda74d92db8508c2ec835d62ed09b4d1b (diff) | |
Thread GrShaderDataManager through Image filters
TBR=bsalomon@google.com
BUG=skia:
Review URL: https://codereview.chromium.org/1229613002
Diffstat (limited to 'src/effects')
| -rw-r--r-- | src/effects/SkAlphaThresholdFilter.cpp | 5 | ||||
| -rw-r--r-- | src/effects/SkMagnifierImageFilter.cpp | 5 | ||||
| -rw-r--r-- | src/effects/SkMatrixConvolutionImageFilter.cpp | 1 |
3 files changed, 7 insertions, 4 deletions
diff --git a/src/effects/SkAlphaThresholdFilter.cpp b/src/effects/SkAlphaThresholdFilter.cpp index 82f6ea43bb..774092c2df 100644 --- a/src/effects/SkAlphaThresholdFilter.cpp +++ b/src/effects/SkAlphaThresholdFilter.cpp @@ -28,8 +28,8 @@ protected: bool onFilterImage(Proxy*, const SkBitmap& src, const Context&, SkBitmap* result, SkIPoint* offset) const override; #if SK_SUPPORT_GPU - 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: @@ -265,6 +265,7 @@ SkAlphaThresholdFilterImpl::SkAlphaThresholdFilterImpl(const SkRegion& region, #if SK_SUPPORT_GPU bool SkAlphaThresholdFilterImpl::asFragmentProcessor(GrFragmentProcessor** fp, + GrShaderDataManager*, GrTexture* texture, const SkMatrix& in_matrix, const SkIRect&) const { diff --git a/src/effects/SkMagnifierImageFilter.cpp b/src/effects/SkMagnifierImageFilter.cpp index 542a5a9569..96d04e2786 100644 --- a/src/effects/SkMagnifierImageFilter.cpp +++ b/src/effects/SkMagnifierImageFilter.cpp @@ -276,8 +276,9 @@ SkMagnifierImageFilter::SkMagnifierImageFilter(const SkRect& srcRect, SkScalar i } #if SK_SUPPORT_GPU -bool SkMagnifierImageFilter::asFragmentProcessor(GrFragmentProcessor** fp, GrTexture* texture, - const SkMatrix&, const SkIRect&bounds) const { +bool SkMagnifierImageFilter::asFragmentProcessor(GrFragmentProcessor** fp, GrShaderDataManager*, + GrTexture* texture, const SkMatrix&, + const SkIRect&bounds) const { if (fp) { SkScalar yOffset = texture->origin() == kTopLeft_GrSurfaceOrigin ? fSrcRect.y() : texture->height() - fSrcRect.height() * texture->height() / bounds.height() diff --git a/src/effects/SkMatrixConvolutionImageFilter.cpp b/src/effects/SkMatrixConvolutionImageFilter.cpp index 4cba043e99..8855e3c6fe 100644 --- a/src/effects/SkMatrixConvolutionImageFilter.cpp +++ b/src/effects/SkMatrixConvolutionImageFilter.cpp @@ -348,6 +348,7 @@ static GrTextureDomain::Mode convert_tilemodes( } bool SkMatrixConvolutionImageFilter::asFragmentProcessor(GrFragmentProcessor** fp, + GrShaderDataManager*, GrTexture* texture, const SkMatrix&, const SkIRect& bounds) const { |