Rename GrPipelineInfo to GrPipelineOptimizations

TBR=joshualitt@google.com

Review URL: https://codereview.chromium.org/1274513005

14 files changed, 45 insertions, 45 deletions

diff --git a/src/gpu/batches/GrAAFillRectBatch.cpp b/src/gpu/batches/GrAAFillRectBatch.cpp
index 4ea4908d03..8a4cd908d6 100644
--- a/src/gpu/batches/GrAAFillRectBatch.cpp
+++ b/src/gpu/batches/GrAAFillRectBatch.cpp
@@ -41,19 +41,19 @@ static const GrGeometryProcessor* create_fill_rect_gp(bool tweakAlphaForCoverage
     return CreateForDeviceSpace(color, coverage, localCoords, viewMatrix);
 }
 
-void GrAAFillRectBatch::initBatchTracker(const GrPipelineInfo& init) {
+void GrAAFillRectBatch::initBatchTracker(const GrPipelineOptimizations& opt) {
     // Handle any color overrides
-    if (!init.readsColor()) {
+    if (!opt.readsColor()) {
         fGeoData[0].fColor = GrColor_ILLEGAL;
     }
-    init.getOverrideColorIfSet(&fGeoData[0].fColor);
+    opt.getOverrideColorIfSet(&fGeoData[0].fColor);
 
     // setup batch properties
-    fBatch.fColorIgnored = !init.readsColor();
+    fBatch.fColorIgnored = !opt.readsColor();
     fBatch.fColor = fGeoData[0].fColor;
-    fBatch.fUsesLocalCoords = init.readsLocalCoords();
-    fBatch.fCoverageIgnored = !init.readsCoverage();
-    fBatch.fCanTweakAlphaForCoverage = init.canTweakAlphaForCoverage();
+    fBatch.fUsesLocalCoords = opt.readsLocalCoords();
+    fBatch.fCoverageIgnored = !opt.readsCoverage();
+    fBatch.fCanTweakAlphaForCoverage = opt.canTweakAlphaForCoverage();
 }
 
 void GrAAFillRectBatch::generateGeometry(GrBatchTarget* batchTarget) {
diff --git a/src/gpu/batches/GrAAFillRectBatch.h b/src/gpu/batches/GrAAFillRectBatch.h
index c852eb1002..fdce84cbc7 100644
--- a/src/gpu/batches/GrAAFillRectBatch.h
+++ b/src/gpu/batches/GrAAFillRectBatch.h
@@ -38,7 +38,7 @@ public:
         out->setUnknownSingleComponent();
     }
 
-    void initBatchTracker(const GrPipelineInfo& init) override;
+    void initBatchTracker(const GrPipelineOptimizations&) override;
 
     void generateGeometry(GrBatchTarget* batchTarget) override;
 
diff --git a/src/gpu/batches/GrAAStrokeRectBatch.cpp b/src/gpu/batches/GrAAStrokeRectBatch.cpp
index 49329b2a94..fa88fd13df 100644
--- a/src/gpu/batches/GrAAStrokeRectBatch.cpp
+++ b/src/gpu/batches/GrAAStrokeRectBatch.cpp
@@ -43,20 +43,20 @@ static const GrGeometryProcessor* create_stroke_rect_gp(bool tweakAlphaForCovera
 }
 
 
-void GrAAStrokeRectBatch::initBatchTracker(const GrPipelineInfo& init) {
+void GrAAStrokeRectBatch::initBatchTracker(const GrPipelineOptimizations& opt) {
     // Handle any color overrides
-    if (!init.readsColor()) {
+    if (!opt.readsColor()) {
         fGeoData[0].fColor = GrColor_ILLEGAL;
     }
-    init.getOverrideColorIfSet(&fGeoData[0].fColor);
+    opt.getOverrideColorIfSet(&fGeoData[0].fColor);
 
     // setup batch properties
-    fBatch.fColorIgnored = !init.readsColor();
+    fBatch.fColorIgnored = !opt.readsColor();
     fBatch.fColor = fGeoData[0].fColor;
-    fBatch.fUsesLocalCoords = init.readsLocalCoords();
-    fBatch.fCoverageIgnored = !init.readsCoverage();
+    fBatch.fUsesLocalCoords = opt.readsLocalCoords();
+    fBatch.fCoverageIgnored = !opt.readsCoverage();
     fBatch.fMiterStroke = fGeoData[0].fMiterStroke;
-    fBatch.fCanTweakAlphaForCoverage = init.canTweakAlphaForCoverage();
+    fBatch.fCanTweakAlphaForCoverage = opt.canTweakAlphaForCoverage();
 }
 
 void GrAAStrokeRectBatch::generateGeometry(GrBatchTarget* batchTarget) {
diff --git a/src/gpu/batches/GrAAStrokeRectBatch.h b/src/gpu/batches/GrAAStrokeRectBatch.h
index 1e15711f19..b1222c9204 100644
--- a/src/gpu/batches/GrAAStrokeRectBatch.h
+++ b/src/gpu/batches/GrAAStrokeRectBatch.h
@@ -40,7 +40,7 @@ public:
         out->setUnknownSingleComponent();
     }
 
-    void initBatchTracker(const GrPipelineInfo& init) override;
+    void initBatchTracker(const GrPipelineOptimizations&) override;
 
     void generateGeometry(GrBatchTarget* batchTarget) override;
 
diff --git a/src/gpu/batches/GrBatch.h b/src/gpu/batches/GrBatch.h
index 1a35db5591..281a60e98e 100644
--- a/src/gpu/batches/GrBatch.h
+++ b/src/gpu/batches/GrBatch.h
@@ -64,7 +64,7 @@ public:
      * initBatchTracker is a hook for the some additional overrides / optimization possibilities
      * from the GrXferProcessor.
      */
-    virtual void initBatchTracker(const GrPipelineInfo& init) = 0;
+    virtual void initBatchTracker(const GrPipelineOptimizations&) = 0;
 
     bool combineIfPossible(GrBatch* that) {
         if (this->classID() != that->classID()) {
diff --git a/src/gpu/batches/GrDrawAtlasBatch.cpp b/src/gpu/batches/GrDrawAtlasBatch.cpp
index 3a71fcbc1b..c1f244362c 100644
--- a/src/gpu/batches/GrDrawAtlasBatch.cpp
+++ b/src/gpu/batches/GrDrawAtlasBatch.cpp
@@ -9,19 +9,19 @@
 #include "GrBatchTest.h"
 #include "SkRandom.h"
 
-void GrDrawAtlasBatch::initBatchTracker(const GrPipelineInfo& init) {
+void GrDrawAtlasBatch::initBatchTracker(const GrPipelineOptimizations& opt) {
     // Handle any color overrides
-    if (!init.readsColor()) {
+    if (!opt.readsColor()) {
         fGeoData[0].fColor = GrColor_ILLEGAL;
     }
-    init.getOverrideColorIfSet(&fGeoData[0].fColor);
+    opt.getOverrideColorIfSet(&fGeoData[0].fColor);
     
     // setup batch properties
-    fColorIgnored = !init.readsColor();
+    fColorIgnored = !opt.readsColor();
     fColor = fGeoData[0].fColor;
     // We'd like to assert this, but we can't because of GLPrograms test
     //SkASSERT(init.readsLocalCoords());
-    fCoverageIgnored = !init.readsCoverage();
+    fCoverageIgnored = !opt.readsCoverage();
 }
 
 static const GrGeometryProcessor* set_vertex_attributes(bool hasLocalCoords,
diff --git a/src/gpu/batches/GrDrawAtlasBatch.h b/src/gpu/batches/GrDrawAtlasBatch.h
index 3a47b718cf..6db0c94a4d 100644
--- a/src/gpu/batches/GrDrawAtlasBatch.h
+++ b/src/gpu/batches/GrDrawAtlasBatch.h
@@ -44,7 +44,7 @@ public:
         out->setKnownSingleComponent(0xff);
     }
     
-    void initBatchTracker(const GrPipelineInfo& init) override;
+    void initBatchTracker(const GrPipelineOptimizations&) override;
     void generateGeometry(GrBatchTarget* batchTarget) override;
     
     SkSTArray<1, Geometry, true>* geoData() { return &fGeoData; }
diff --git a/src/gpu/batches/GrDrawVerticesBatch.cpp b/src/gpu/batches/GrDrawVerticesBatch.cpp
index d302c64949..397bb2b8f1 100644
--- a/src/gpu/batches/GrDrawVerticesBatch.cpp
+++ b/src/gpu/batches/GrDrawVerticesBatch.cpp
@@ -93,18 +93,18 @@ void GrDrawVerticesBatch::getInvariantOutputCoverage(GrInitInvariantOutput* out)
     out->setKnownSingleComponent(0xff);
 }
 
-void GrDrawVerticesBatch::initBatchTracker(const GrPipelineInfo& init) {
+void GrDrawVerticesBatch::initBatchTracker(const GrPipelineOptimizations& opt) {
     // Handle any color overrides
-    if (!init.readsColor()) {
+    if (!opt.readsColor()) {
         fGeoData[0].fColor = GrColor_ILLEGAL;
     }
-    init.getOverrideColorIfSet(&fGeoData[0].fColor);
+    opt.getOverrideColorIfSet(&fGeoData[0].fColor);
 
     // setup batch properties
-    fBatch.fColorIgnored = !init.readsColor();
+    fBatch.fColorIgnored = !opt.readsColor();
     fBatch.fColor = fGeoData[0].fColor;
-    fBatch.fUsesLocalCoords = init.readsLocalCoords();
-    fBatch.fCoverageIgnored = !init.readsCoverage();
+    fBatch.fUsesLocalCoords = opt.readsLocalCoords();
+    fBatch.fCoverageIgnored = !opt.readsCoverage();
 }
 
 void GrDrawVerticesBatch::generateGeometry(GrBatchTarget* batchTarget) {
diff --git a/src/gpu/batches/GrDrawVerticesBatch.h b/src/gpu/batches/GrDrawVerticesBatch.h
index 6441162253..a59518a8fe 100644
--- a/src/gpu/batches/GrDrawVerticesBatch.h
+++ b/src/gpu/batches/GrDrawVerticesBatch.h
@@ -45,7 +45,7 @@ public:
 
     void getInvariantOutputCoverage(GrInitInvariantOutput* out) const override;
 
-    void initBatchTracker(const GrPipelineInfo& init) override;
+    void initBatchTracker(const GrPipelineOptimizations&) override;
 
     void generateGeometry(GrBatchTarget* batchTarget) override;
 
diff --git a/src/gpu/batches/GrRectBatch.cpp b/src/gpu/batches/GrRectBatch.cpp
index 0995156b4e..1cfa093613 100644
--- a/src/gpu/batches/GrRectBatch.cpp
+++ b/src/gpu/batches/GrRectBatch.cpp
@@ -11,7 +11,7 @@
 #include "GrDefaultGeoProcFactory.h"
 #include "GrPrimitiveProcessor.h"
 
-void GrRectBatch::initBatchTracker(const GrPipelineInfo& init) {
+void GrRectBatch::initBatchTracker(const GrPipelineOptimizations& init) {
     // Handle any color overrides
     if (!init.readsColor()) {
         fGeoData[0].fColor = GrColor_ILLEGAL;
diff --git a/src/gpu/batches/GrRectBatch.h b/src/gpu/batches/GrRectBatch.h
index b8c57424c7..aa227d46ff 100644
--- a/src/gpu/batches/GrRectBatch.h
+++ b/src/gpu/batches/GrRectBatch.h
@@ -42,7 +42,7 @@ public:
         out->setKnownSingleComponent(0xff);
     }
 
-    void initBatchTracker(const GrPipelineInfo& init) override;
+    void initBatchTracker(const GrPipelineOptimizations&) override;
 
     void generateGeometry(GrBatchTarget* batchTarget) override;
 
diff --git a/src/gpu/batches/GrStrokeRectBatch.cpp b/src/gpu/batches/GrStrokeRectBatch.cpp
index c850fb7d9a..9c31149a5b 100644
--- a/src/gpu/batches/GrStrokeRectBatch.cpp
+++ b/src/gpu/batches/GrStrokeRectBatch.cpp
@@ -28,18 +28,18 @@ GrStrokeRectBatch::GrStrokeRectBatch(const Geometry& geometry, bool snapToPixelC
     }
 }
 
-void GrStrokeRectBatch::initBatchTracker(const GrPipelineInfo& init) {
+void GrStrokeRectBatch::initBatchTracker(const GrPipelineOptimizations& opt) {
     // Handle any color overrides
-    if (!init.readsColor()) {
+    if (!opt.readsColor()) {
         fGeoData[0].fColor = GrColor_ILLEGAL;
     }
-    init.getOverrideColorIfSet(&fGeoData[0].fColor);
+    opt.getOverrideColorIfSet(&fGeoData[0].fColor);
 
     // setup batch properties
-    fBatch.fColorIgnored = !init.readsColor();
+    fBatch.fColorIgnored = !opt.readsColor();
     fBatch.fColor = fGeoData[0].fColor;
-    fBatch.fUsesLocalCoords = init.readsLocalCoords();
-    fBatch.fCoverageIgnored = !init.readsCoverage();
+    fBatch.fUsesLocalCoords = opt.readsLocalCoords();
+    fBatch.fCoverageIgnored = !opt.readsCoverage();
 }
 
 /*  create a triangle strip that strokes the specified rect. There are 8
diff --git a/src/gpu/batches/GrStrokeRectBatch.h b/src/gpu/batches/GrStrokeRectBatch.h
index cfd9949442..3a20d9bfcb 100644
--- a/src/gpu/batches/GrStrokeRectBatch.h
+++ b/src/gpu/batches/GrStrokeRectBatch.h
@@ -36,7 +36,7 @@ public:
         out->setKnownSingleComponent(0xff);
     }
 
-    void initBatchTracker(const GrPipelineInfo& init) override;
+    void initBatchTracker(const GrPipelineOptimizations&) override;
 
     void generateGeometry(GrBatchTarget* batchTarget) override;
 
diff --git a/src/gpu/batches/GrTestBatch.h b/src/gpu/batches/GrTestBatch.h
index c5758bb8d2..55cc5c25a5 100644
--- a/src/gpu/batches/GrTestBatch.h
+++ b/src/gpu/batches/GrTestBatch.h
@@ -33,18 +33,18 @@ public:
         out->setUnknownSingleComponent();
     }
 
-    void initBatchTracker(const GrPipelineInfo& init) override {
+    void initBatchTracker(const GrPipelineOptimizations& opt) override {
         // Handle any color overrides
-        if (!init.readsColor()) {
+        if (!opt.readsColor()) {
             this->geoData(0)->fColor = GrColor_ILLEGAL;
         }
-        init.getOverrideColorIfSet(&this->geoData(0)->fColor);
+        opt.getOverrideColorIfSet(&this->geoData(0)->fColor);
 
         // setup batch properties
-        fBatch.fColorIgnored = !init.readsColor();
+        fBatch.fColorIgnored = !opt.readsColor();
         fBatch.fColor = this->geoData(0)->fColor;
-        fBatch.fUsesLocalCoords = init.readsLocalCoords();
-        fBatch.fCoverageIgnored = !init.readsCoverage();
+        fBatch.fUsesLocalCoords = opt.readsLocalCoords();
+        fBatch.fCoverageIgnored = !opt.readsCoverage();
     }
 
     void generateGeometry(GrBatchTarget* batchTarget) override {