commit e7d30484ea8a5677a9403ccd23a9c0961df62ccd
author Brian Salomon <bsalomon@google.com> Wed Mar 29 12:09:15 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Mar 29 16:46:07 2017 +0000
tree 140df99fdbf67a023fa0b31223b9c5169774f29f
parent 4a24e10a0b805af6106dd8f7225c10a703696245

Remove GrPipelineOptimizations computation from GrPipeline::init and nest in GrMeshDrawOp.

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

tests/GrPorterDuffTest.cpp

diff --git a/tests/GrPorterDuffTest.cpp b/tests/GrPorterDuffTest.cpp
index 46f9f6e..0170488 100644
--- a/tests/GrPorterDuffTest.cpp
+++ b/tests/GrPorterDuffTest.cpp
@@ -1003,7 +1003,7 @@
             *coverage = GrPipelineAnalysisCoverage::kLCD;
         }
 
-        void applyPipelineOptimizations(const GrPipelineOptimizations&) override {}
+        void applyPipelineOptimizations(const PipelineOptimizations&) override {}
         bool onCombineIfPossible(GrOp*, const GrCaps&) override { return false; }
         void onPrepareDraws(Target*) const override {}
 

tests/PreFlushCallbackTest.cpp

diff --git a/tests/PreFlushCallbackTest.cpp b/tests/PreFlushCallbackTest.cpp
index e008009..7c4092c 100644
--- a/tests/PreFlushCallbackTest.cpp
+++ b/tests/PreFlushCallbackTest.cpp
@@ -70,7 +70,7 @@
         *coverage = GrPipelineAnalysisCoverage::kSingleChannel;
     }
 
-    void applyPipelineOptimizations(const GrPipelineOptimizations& optimizations) override {
+    void applyPipelineOptimizations(const PipelineOptimizations& optimizations) override {
         optimizations.getOverrideColorIfSet(&fColor);
     }
 

tests/PrimitiveProcessorTest.cpp

diff --git a/tests/PrimitiveProcessorTest.cpp b/tests/PrimitiveProcessorTest.cpp
index 0a9d002..2b4e349 100644
--- a/tests/PrimitiveProcessorTest.cpp
+++ b/tests/PrimitiveProcessorTest.cpp
@@ -46,7 +46,7 @@
         *coverage = GrPipelineAnalysisCoverage::kSingleChannel;
     }
 
-    void applyPipelineOptimizations(const GrPipelineOptimizations&) override {}
+    void applyPipelineOptimizations(const PipelineOptimizations&) override {}
     bool onCombineIfPossible(GrOp*, const GrCaps&) override { return false; }
     void onPrepareDraws(Target* target) const override {
         class GP : public GrGeometryProcessor {