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/gpu/effects | |
| 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/gpu/effects')
| -rw-r--r-- | src/gpu/effects/GrConfigConversionEffect.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gpu/effects/GrConfigConversionEffect.cpp b/src/gpu/effects/GrConfigConversionEffect.cpp index 2581510218..4c8813d415 100644 --- a/src/gpu/effects/GrConfigConversionEffect.cpp +++ b/src/gpu/effects/GrConfigConversionEffect.cpp @@ -232,7 +232,7 @@ void GrConfigConversionEffect::TestForPreservingPMConversions(GrContext* context (paint3.getProcessorDataManager(), tempTex, false, *pmToUPMRule, SkMatrix::I()))); - paint1.addColorFragmentProcessor(pmToUPM1); + paint1.addColorProcessor(pmToUPM1); GrDrawContext* readDrawContext = context->drawContext(); @@ -250,7 +250,7 @@ void GrConfigConversionEffect::TestForPreservingPMConversions(GrContext* context readTex->readPixels(0, 0, 256, 256, kRGBA_8888_GrPixelConfig, firstRead); - paint2.addColorFragmentProcessor(upmToPM); + paint2.addColorProcessor(upmToPM); GrDrawContext* tempDrawContext = context->drawContext(); if (!tempDrawContext) { @@ -264,7 +264,7 @@ void GrConfigConversionEffect::TestForPreservingPMConversions(GrContext* context kDstRect, kSrcRect); - paint3.addColorFragmentProcessor(pmToUPM2); + paint3.addColorProcessor(pmToUPM2); readDrawContext = context->drawContext(); if (!readDrawContext) { |