diff options
| author |  rmistry <rmistry@google.com> | 2015-08-26 06:48:27 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-08-26 06:48:27 -0700 |
| commit | 4bf69f7bbc073c1dc257f93f8c5b2a530123cb3c (patch) | |
| tree | d6c670d7230600b174d6f08799a7ad1f4b9c002e /src/effects/SkMorphologyImageFilter.cpp | |
| parent | 8cce8f139e4b91783722f11ccb6ac9bbdf8327e7 (diff) | |
Revert of Remove GrStagedProcessor, remove the word Stage as it applies to FPs (patchset #6 id:90001 of https://codereview.chromium.org/1307223004/ )
Reason for revert:
Causes bot failures:
https://uberchromegw.corp.google.com/i/client.skia/builders/Test-Mac10.9-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug/builds/1639
https://uberchromegw.corp.google.com/i/client.skia/builders/Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Debug/builds/1702
https://uberchromegw.corp.google.com/i/client.skia.android/builders/Test-Android-GCC-NexusPlayer-GPU-PowerVR-x86-Debug/builds/1223
Original issue's description:
> Remove GrStagedProcessor, remove the word Stage as it applies to FPs
>
> Committed: https://skia.googlesource.com/skia/+/24243446cdf7b7e4e132c2a0c387c7723777e0c7
TBR=joshualitt@google.com,egdaniel@google.com,bsalomon@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/1306803003
Diffstat (limited to 'src/effects/SkMorphologyImageFilter.cpp')
| -rw-r--r-- | src/effects/SkMorphologyImageFilter.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/effects/SkMorphologyImageFilter.cpp b/src/effects/SkMorphologyImageFilter.cpp index f1a7d09b8b..01e978e846 100644 --- a/src/effects/SkMorphologyImageFilter.cpp +++ b/src/effects/SkMorphologyImageFilter.cpp @@ -471,12 +471,12 @@ void apply_morphology_rect(GrDrawContext* drawContext, float bounds[2], Gr1DKernelEffect::Direction direction) { GrPaint paint; - paint.addColorFragmentProcessor(GrMorphologyEffect::Create(paint.getProcessorDataManager(), - texture, - direction, - radius, - morphType, - bounds))->unref(); + paint.addColorProcessor(GrMorphologyEffect::Create(paint.getProcessorDataManager(), + texture, + direction, + radius, + morphType, + bounds))->unref(); drawContext->drawNonAARectToRect(rt, clip, paint, SkMatrix::I(), SkRect::Make(dstRect), SkRect::Make(srcRect)); } @@ -491,11 +491,11 @@ void apply_morphology_rect_no_bounds(GrDrawContext* drawContext, GrMorphologyEffect::MorphologyType morphType, Gr1DKernelEffect::Direction direction) { GrPaint paint; - paint.addColorFragmentProcessor(GrMorphologyEffect::Create(paint.getProcessorDataManager(), - texture, - direction, - radius, - morphType))->unref(); + paint.addColorProcessor(GrMorphologyEffect::Create(paint.getProcessorDataManager(), + texture, + direction, + radius, + morphType))->unref(); drawContext->drawNonAARectToRect(rt, clip, paint, SkMatrix::I(), SkRect::Make(dstRect), SkRect::Make(srcRect)); } |