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/core | |
| 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/core')
| -rw-r--r-- | src/core/SkImageFilter.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/core/SkImageFilter.cpp b/src/core/SkImageFilter.cpp index 394d8b20e7..1586a3fb27 100644 --- a/src/core/SkImageFilter.cpp +++ b/src/core/SkImageFilter.cpp @@ -232,7 +232,7 @@ bool SkImageFilter::onFilterImage(Proxy*, const SkBitmap&, const Context&, } bool SkImageFilter::canFilterImageGPU() const { - return this->asFragmentProcessor(NULL, NULL, SkMatrix::I(), SkIRect()); + return this->asFragmentProcessor(NULL, NULL, NULL, SkMatrix::I(), SkIRect()); } bool SkImageFilter::filterImageGPU(Proxy* proxy, const SkBitmap& src, const Context& ctx, @@ -275,9 +275,9 @@ bool SkImageFilter::filterImageGPU(Proxy* proxy, const SkBitmap& src, const Cont bounds.offset(-srcOffset); SkMatrix matrix(ctx.ctm()); matrix.postTranslate(SkIntToScalar(-bounds.left()), SkIntToScalar(-bounds.top())); - if (this->asFragmentProcessor(&fp, srcTexture, matrix, bounds)) { + GrPaint paint; + if (this->asFragmentProcessor(&fp, paint.getShaderDataManager(), srcTexture, matrix, bounds)) { SkASSERT(fp); - GrPaint paint; paint.addColorProcessor(fp)->unref(); GrDrawContext* drawContext = context->drawContext(); @@ -374,8 +374,8 @@ bool SkImageFilter::onFilterBounds(const SkIRect& src, const SkMatrix& ctm, return true; } -bool SkImageFilter::asFragmentProcessor(GrFragmentProcessor**, GrTexture*, const SkMatrix&, - const SkIRect&) const { +bool SkImageFilter::asFragmentProcessor(GrFragmentProcessor**, GrShaderDataManager*, GrTexture*, + const SkMatrix&, const SkIRect&) const { return false; } |