Make GrPipelineAnalysis a nested class of GrProcessorSet.

It is renamed to FragmentProcessorAnalysis since it represents the outputs of the final FPs.

It now stores the analysis results that are subsequently needed rather than exposing GrProcOptInfo.

GrProcOptInfo is now only used on color FPs (not coverage).

Miscellaneous related renamings.


Change-Id: I95c518a7a76df6dc294a9fa67c611f8f653247bc
Reviewed-on: https://skia-review.googlesource.com/8534
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/src/gpu/ops/GrDrawAtlasOp.h b/src/gpu/ops/GrDrawAtlasOp.h
index 90fe07fda2..d6a211d939 100644
--- a/src/gpu/ops/GrDrawAtlasOp.h
+++ b/src/gpu/ops/GrDrawAtlasOp.h
@@ -39,13 +39,13 @@ private:
     GrDrawAtlasOp(GrColor color, const SkMatrix& viewMatrix, int spriteCount,
                   const SkRSXform* xforms, const SkRect* rects, const SkColor* colors);
 
-    void getPipelineAnalysisInput(GrPipelineAnalysisDrawOpInput* input) const override {
+    void getFragmentProcessorAnalysisInputs(FragmentProcessorAnalysisInputs* input) const override {
         if (this->hasColors()) {
-            input->pipelineColorInput()->setToUnknown();
+            input->colorInput()->setToUnknown();
         } else {
-            input->pipelineColorInput()->setToConstant(fGeoData[0].fColor);
+            input->colorInput()->setToConstant(fGeoData[0].fColor);
         }
-        input->pipelineCoverageInput()->setToSolidCoverage();
+        input->coverageInput()->setToSolidCoverage();
     }
 
     void onPrepareDraws(Target*) const override;