| Index: src/gpu/GrPipelineBuilder.cpp
|
| diff --git a/src/gpu/GrPipelineBuilder.cpp b/src/gpu/GrPipelineBuilder.cpp
|
| index 97e7229af27ef57823aa08d1c26ee4fe5391c2fd..1d37963e9cf3810e1ef8ab5f630d683f5857dc2e 100644
|
| --- a/src/gpu/GrPipelineBuilder.cpp
|
| +++ b/src/gpu/GrPipelineBuilder.cpp
|
| @@ -99,7 +99,7 @@ bool GrPipelineBuilder::willXPNeedDstTexture(const GrCaps& caps,
|
| this->hasMixedSamples());
|
| }
|
|
|
| -void GrPipelineBuilder::AutoRestoreFragmentProcessors::set(
|
| +void GrPipelineBuilder::AutoRestoreFragmentProcessorState::set(
|
| const GrPipelineBuilder* pipelineBuilder) {
|
| if (fPipelineBuilder) {
|
| int m = fPipelineBuilder->numColorFragmentStages() - fColorEffectCnt;
|
| @@ -114,12 +114,14 @@ void GrPipelineBuilder::AutoRestoreFragmentProcessors::set(
|
| fPipelineBuilder->fCoverageProcInfoValid = false;
|
| }
|
| SkDEBUGCODE(--fPipelineBuilder->fBlockEffectRemovalCnt;)
|
| + fPipelineBuilder->getProcessorDataManager()->restoreToSaveMarker(/*fSaveMarker*/);
|
| }
|
| fPipelineBuilder = const_cast<GrPipelineBuilder*>(pipelineBuilder);
|
| if (NULL != pipelineBuilder) {
|
| fColorEffectCnt = pipelineBuilder->numColorFragmentStages();
|
| fCoverageEffectCnt = pipelineBuilder->numCoverageFragmentStages();
|
| SkDEBUGCODE(++pipelineBuilder->fBlockEffectRemovalCnt;)
|
| + fSaveMarker = pipelineBuilder->processorDataManager()->currentSaveMarker();
|
| }
|
| }
|
|
|
|
|