diff options
author | 2017-03-30 08:21:32 -0400 | |
---|---|---|
committer | 2017-03-30 15:19:53 +0000 | |
commit | a811b1200cc0b5e3819c89f62def23ec203d4b5a (patch) | |
tree | a09fe4fd05dd1246c2e5c9b364a0f8fb498f9d56 /src/gpu/instanced/InstancedRendering.cpp | |
parent | 13071c5c7aa51b9e57dbe88c1fce0575780985aa (diff) |
Renames of processor analysis-related classes and method.
GrProcesserSet::FragmentProcessorAnalysis->GrProcessorSet::Analysis
GrPipelineAnalysisColor->GrProcessorAnalysisColor
GrPipelineAnalysisCoverage->GrProcessorAnalysisCoverage
GrMeshDrawOp::getFragmentProcessorAnalysisInputs->GrMeshDrawOp::getProcessorAnalysisInputs
Change-Id: I28ad19dfab5f4ac1788c4eacdec5e1af2a701dd0
Reviewed-on: https://skia-review.googlesource.com/10747
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/gpu/instanced/InstancedRendering.cpp')
-rw-r--r-- | src/gpu/instanced/InstancedRendering.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/gpu/instanced/InstancedRendering.cpp b/src/gpu/instanced/InstancedRendering.cpp index f6ea6285d0..ad61eb6dfd 100644 --- a/src/gpu/instanced/InstancedRendering.cpp +++ b/src/gpu/instanced/InstancedRendering.cpp @@ -331,13 +331,13 @@ void InstancedRendering::Op::appendParamsTexel(SkScalar x, SkScalar y, SkScalar } bool InstancedRendering::Op::xpRequiresDstTexture(const GrCaps& caps, const GrAppliedClip* clip) { - GrProcessorSet::FragmentProcessorAnalysis analysis; - GrPipelineAnalysisCoverage coverageInput; + GrProcessorSet::Analysis analysis; + GrProcessorAnalysisCoverage coverageInput; if (GrAAType::kCoverage == fInfo.aaType() || (GrAAType::kNone == fInfo.aaType() && !fInfo.isSimpleRects() && fInfo.fCannotDiscard)) { - coverageInput = GrPipelineAnalysisCoverage::kSingleChannel; + coverageInput = GrProcessorAnalysisCoverage::kSingleChannel; } else { - coverageInput = GrPipelineAnalysisCoverage::kNone; + coverageInput = GrProcessorAnalysisCoverage::kNone; } fProcessors.analyzeAndEliminateFragmentProcessors(&analysis, this->getSingleInstance().fColor, coverageInput, clip, caps); @@ -407,7 +407,7 @@ bool InstancedRendering::Op::onCombineIfPossible(GrOp* other, const GrCaps& caps this->joinBounds(*that); fInfo = combinedInfo; fPixelLoad += that->fPixelLoad; - fAnalysisColor = GrPipelineAnalysisColor::Combine(fAnalysisColor, that->fAnalysisColor); + fAnalysisColor = GrProcessorAnalysisColor::Combine(fAnalysisColor, that->fAnalysisColor); // Adopt the other op's draws. fNumDraws += that->fNumDraws; fNumChangesInGeometry += that->fNumChangesInGeometry; @@ -465,13 +465,13 @@ void InstancedRendering::Op::onExecute(GrOpFlushState* state) { state->gpu()->handleDirtyContext(); const GrAppliedClip* clip = state->drawOpArgs().fAppliedClip; - GrPipelineAnalysisCoverage coverage; + GrProcessorAnalysisCoverage coverage; if (GrAAType::kCoverage == fInfo.aaType() || (clip && clip->clipCoverageFragmentProcessor()) || (GrAAType::kNone == fInfo.aaType() && !fInfo.isSimpleRects() && fInfo.fCannotDiscard)) { - coverage = GrPipelineAnalysisCoverage::kSingleChannel; + coverage = GrProcessorAnalysisCoverage::kSingleChannel; } else { - coverage = GrPipelineAnalysisCoverage::kNone; + coverage = GrProcessorAnalysisCoverage::kNone; } GrPipeline pipeline; |