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 /gm | |
| 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 'gm')
| -rw-r--r-- | gm/bigrrectaaeffect.cpp | 2 | ||||
| -rw-r--r-- | gm/constcolorprocessor.cpp | 2 | ||||
| -rw-r--r-- | gm/convexpolyeffect.cpp | 4 | ||||
| -rw-r--r-- | gm/rrects.cpp | 2 | ||||
| -rw-r--r-- | gm/texturedomaineffect.cpp | 2 | ||||
| -rw-r--r-- | gm/yuvtorgbeffect.cpp | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/gm/bigrrectaaeffect.cpp b/gm/bigrrectaaeffect.cpp index f19b57ce45..cf151fb1bd 100644 --- a/gm/bigrrectaaeffect.cpp +++ b/gm/bigrrectaaeffect.cpp @@ -77,7 +77,7 @@ protected: SkAutoTUnref<GrFragmentProcessor> fp(GrRRectEffect::Create(edgeType, rrect)); SkASSERT(fp); if (fp) { - pipelineBuilder.addCoverageFragmentProcessor(fp); + pipelineBuilder.addCoverageProcessor(fp); pipelineBuilder.setRenderTarget(rt); SkRect bounds = SkRect::MakeWH(SkIntToScalar(kMaxSize), diff --git a/gm/constcolorprocessor.cpp b/gm/constcolorprocessor.cpp index 59d17068e3..30544af8f9 100644 --- a/gm/constcolorprocessor.cpp +++ b/gm/constcolorprocessor.cpp @@ -113,7 +113,7 @@ protected: GrClip clip; GrPipelineBuilder pipelineBuilder(grPaint, rt, clip); - pipelineBuilder.addColorFragmentProcessor(fp); + pipelineBuilder.addColorProcessor(fp); tt.target()->drawNonAARect(pipelineBuilder, grPaint.getColor(), diff --git a/gm/convexpolyeffect.cpp b/gm/convexpolyeffect.cpp index 77eb1524bb..30471a797d 100644 --- a/gm/convexpolyeffect.cpp +++ b/gm/convexpolyeffect.cpp @@ -191,7 +191,7 @@ protected: } GrPipelineBuilder pipelineBuilder; - pipelineBuilder.addCoverageFragmentProcessor(fp); + pipelineBuilder.addCoverageProcessor(fp); pipelineBuilder.setRenderTarget(rt); ConvexPolyTestBatch::Geometry geometry; @@ -240,7 +240,7 @@ protected: } GrPipelineBuilder pipelineBuilder; - pipelineBuilder.addCoverageFragmentProcessor(fp); + pipelineBuilder.addCoverageProcessor(fp); pipelineBuilder.setRenderTarget(rt); ConvexPolyTestBatch::Geometry geometry; diff --git a/gm/rrects.cpp b/gm/rrects.cpp index f9a21db0f2..62ad48f243 100644 --- a/gm/rrects.cpp +++ b/gm/rrects.cpp @@ -114,7 +114,7 @@ protected: SkAutoTUnref<GrFragmentProcessor> fp(GrRRectEffect::Create(edgeType, rrect)); if (fp) { - pipelineBuilder.addCoverageFragmentProcessor(fp); + pipelineBuilder.addCoverageProcessor(fp); pipelineBuilder.setRenderTarget(rt); SkRect bounds = rrect.getBounds(); diff --git a/gm/texturedomaineffect.cpp b/gm/texturedomaineffect.cpp index 1951c20681..07b71195c7 100644 --- a/gm/texturedomaineffect.cpp +++ b/gm/texturedomaineffect.cpp @@ -128,7 +128,7 @@ protected: } const SkMatrix viewMatrix = SkMatrix::MakeTrans(x, y); pipelineBuilder.setRenderTarget(rt); - pipelineBuilder.addColorFragmentProcessor(fp); + pipelineBuilder.addColorProcessor(fp); tt.target()->drawNonAARect(pipelineBuilder, GrColor_WHITE, diff --git a/gm/yuvtorgbeffect.cpp b/gm/yuvtorgbeffect.cpp index 7a4029c796..4ec86f45ee 100644 --- a/gm/yuvtorgbeffect.cpp +++ b/gm/yuvtorgbeffect.cpp @@ -123,7 +123,7 @@ protected: SkMatrix viewMatrix; viewMatrix.setTranslate(x, y); pipelineBuilder.setRenderTarget(rt); - pipelineBuilder.addColorFragmentProcessor(fp); + pipelineBuilder.addColorProcessor(fp); tt.target()->drawNonAARect(pipelineBuilder, GrColor_WHITE, viewMatrix, |