commit a811b1200cc0b5e3819c89f62def23ec203d4b5a
author Brian Salomon <bsalomon@google.com> Thu Mar 30 08:21:32 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Mar 30 15:19:53 2017 +0000
tree a09fe4fd05dd1246c2e5c9b364a0f8fb498f9d56
parent 13071c5c7aa51b9e57dbe88c1fce0575780985aa

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>

src/gpu/effects/GrCustomXfermode.cpp

diff --git a/src/gpu/effects/GrCustomXfermode.cpp b/src/gpu/effects/GrCustomXfermode.cpp
index 04718d4..5ac31d8 100644
--- a/src/gpu/effects/GrCustomXfermode.cpp
+++ b/src/gpu/effects/GrCustomXfermode.cpp
@@ -52,12 +52,12 @@
 #undef EQ_OFFSET
 }
 
-static bool can_use_hw_blend_equation(GrBlendEquation equation, GrPipelineAnalysisCoverage coverage,
-                                      const GrCaps& caps) {
+static bool can_use_hw_blend_equation(GrBlendEquation equation,
+                                      GrProcessorAnalysisCoverage coverage, const GrCaps& caps) {
     if (!caps.advancedBlendEquationSupport()) {
         return false;
     }
-    if (GrPipelineAnalysisCoverage::kLCD == coverage) {
+    if (GrProcessorAnalysisCoverage::kLCD == coverage) {
         return false; // LCD coverage must be applied after the blend equation.
     }
     if (caps.canUseAdvancedBlendEquation(equation)) {
@@ -213,12 +213,12 @@
             : fMode(mode), fHWBlendEquation(hw_blend_equation(mode)) {}
 
 private:
-    GrXferProcessor* onCreateXferProcessor(const GrCaps& caps, const GrPipelineAnalysisColor&,
-                                           GrPipelineAnalysisCoverage, bool hasMixedSamples,
+    GrXferProcessor* onCreateXferProcessor(const GrCaps& caps, const GrProcessorAnalysisColor&,
+                                           GrProcessorAnalysisCoverage, bool hasMixedSamples,
                                            const DstTexture*) const override;
 
-    AnalysisProperties analysisProperties(const GrPipelineAnalysisColor&,
-                                          const GrPipelineAnalysisCoverage&,
+    AnalysisProperties analysisProperties(const GrProcessorAnalysisColor&,
+                                          const GrProcessorAnalysisCoverage&,
                                           const GrCaps&) const override;
 
     GR_DECLARE_XP_FACTORY_TEST;
@@ -233,8 +233,8 @@
 #endif
 
 GrXferProcessor* CustomXPFactory::onCreateXferProcessor(const GrCaps& caps,
-                                                        const GrPipelineAnalysisColor&,
-                                                        GrPipelineAnalysisCoverage coverage,
+                                                        const GrProcessorAnalysisColor&,
+                                                        GrProcessorAnalysisCoverage coverage,
                                                         bool hasMixedSamples,
                                                         const DstTexture* dstTexture) const {
     SkASSERT(GrCustomXfermode::IsSupportedMode(fMode));
@@ -246,7 +246,7 @@
 }
 
 GrXPFactory::AnalysisProperties CustomXPFactory::analysisProperties(
-        const GrPipelineAnalysisColor&, const GrPipelineAnalysisCoverage& coverage,
+        const GrProcessorAnalysisColor&, const GrProcessorAnalysisCoverage& coverage,
         const GrCaps& caps) const {
     /*
       The general SVG blend equation is defined in the spec as follows: