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, 9 deletions

diff --git a/src/gpu/GrPipelineBuilder.h b/src/gpu/GrPipelineBuilder.h
index 4e4861a5c1..294f409b96 100644
--- a/src/gpu/GrPipelineBuilder.h
+++ b/src/gpu/GrPipelineBuilder.h
@@ -18,7 +18,6 @@
 class GrCaps;
 class GrDrawOp;
 class GrPaint;
-struct GrPipelineAnalysis;
 class GrTexture;
 
 class GrPipelineBuilder : private SkNoncopyable {
@@ -62,9 +61,7 @@ public:
         return fProcessors.coverageFragmentProcessor(idx);
     }
 
-    void analyzeFragmentProcessors(GrPipelineAnalysis* analysis) const {
-        fProcessors.analyzeFragmentProcessors(analysis);
-    }
+    const GrProcessorSet& processors() const { return fProcessors; }
 
     /// @}
 
@@ -75,11 +72,9 @@ public:
     /**
      * Checks whether the xp will need destination in a texture to correctly blend.
      */
-    bool willXPNeedDstTexture(const GrCaps& caps, const GrPipelineAnalysis& analysis) const {
-        if (fProcessors.xpFactory()) {
-            return fProcessors.xpFactory()->willNeedDstTexture(caps, analysis);
-        }
-        return GrPorterDuffXPFactory::SrcOverWillNeedDstTexture(caps, analysis);
+    bool willXPNeedDstTexture(const GrCaps& caps,
+                              const GrProcessorSet::FragmentProcessorAnalysis& analysis) const {
+        return GrXPFactory::WillNeedDstTexture(fProcessors.xpFactory(), caps, analysis);
     }
 
     /// @}