New API for computing optimization invariants.

src/gpu/batches/GrAAStrokeRectBatch.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrAAStrokeRectBatch.h"
 
 #include "GrBatchFlushState.h"
@@ skipping 44 matching lines @@
         GrColor fColor;
         bool fDegenerate;
     };
 
     static AAStrokeRectBatch* Create(const SkMatrix& viewMatrix, bool miterStroke) {
         return new AAStrokeRectBatch(viewMatrix, miterStroke);
     }
 
     const char* name() const override { return "AAStrokeRect"; }
 
-    void getInvariantOutputColor(GrInitInvariantOutput* out) const override {
+    void computePipelineOptimizations(GrInitInvariantOutput* color, 
+                                      GrInitInvariantOutput* coverage,
+                                      GrBatchToXPOverrides* overrides) const override {
         // When this is called on a batch, there is only one geometry bundle
-        out->setKnownFourComponents(fGeoData[0].fColor);
-    }
-
-    void getInvariantOutputCoverage(GrInitInvariantOutput* out) const override {
-        out->setUnknownSingleComponent();
+        color->setKnownFourComponents(fGeoData[0].fColor);
+        coverage->setUnknownSingleComponent();
+        overrides->fUsePLSDstRead = false;
     }
 
     SkSTArray<1, Geometry, true>* geoData() { return &fGeoData; }
 
     bool canAppend(const SkMatrix& viewMatrix, bool miterStroke) {
         return fViewMatrix.cheapEqualTo(viewMatrix) && fMiterStroke == miterStroke;
     }
 
     void append(GrColor color, const SkRect& devOutside, const SkRect& devOutsideAssist,
                 const SkRect& devInside, bool degenerate) {
@@ skipping 19 matching lines @@
 
 private:
     void updateBounds(SkRect* bounds, const Geometry& geo) {
         // If we have miterstroke then we inset devOutside and outset devOutsideAssist, so we need
         // the join for proper bounds
         *bounds = geo.fDevOutside;
         bounds->join(geo.fDevOutsideAssist);
     }
 
     void onPrepareDraws(Target*) override;
-    void initBatchTracker(const GrPipelineOptimizations&) override;
+    void initBatchTracker(const GrXPOverridesForBatch&) override;
 
     AAStrokeRectBatch(const SkMatrix& viewMatrix,bool miterStroke)
         : INHERITED(ClassID()) {
         fViewMatrix = viewMatrix;
         fMiterStroke = miterStroke;
     }
 
     static const int kMiterIndexCnt = 3 * 24;
     static const int kMiterVertexCnt = 16;
     static const int kNumMiterRectsInIndexBuffer = 256;
@@ skipping 38 matching lines @@
     };
 
     BatchTracker fBatch;
     SkSTArray<1, Geometry, true> fGeoData;
     SkMatrix fViewMatrix;
     bool fMiterStroke;
 
     typedef GrVertexBatch INHERITED;
 };
 
-void AAStrokeRectBatch::initBatchTracker(const GrPipelineOptimizations& opt) {
+void AAStrokeRectBatch::initBatchTracker(const GrXPOverridesForBatch& overrides) {
     // Handle any color overrides
-    if (!opt.readsColor()) {
+    if (!overrides.readsColor()) {
         fGeoData[0].fColor = GrColor_ILLEGAL;
     }
-    opt.getOverrideColorIfSet(&fGeoData[0].fColor);
+    overrides.getOverrideColorIfSet(&fGeoData[0].fColor);
 
     // setup batch properties
-    fBatch.fColorIgnored = !opt.readsColor();
+    fBatch.fColorIgnored = !overrides.readsColor();
     fBatch.fColor = fGeoData[0].fColor;
-    fBatch.fUsesLocalCoords = opt.readsLocalCoords();
-    fBatch.fCoverageIgnored = !opt.readsCoverage();
-    fBatch.fCanTweakAlphaForCoverage = opt.canTweakAlphaForCoverage();
+    fBatch.fUsesLocalCoords = overrides.readsLocalCoords();
+    fBatch.fCoverageIgnored = !overrides.readsCoverage();
+    fBatch.fCanTweakAlphaForCoverage = overrides.canTweakAlphaForCoverage();
 }
 
 void AAStrokeRectBatch::onPrepareDraws(Target* target) {
     bool canTweakAlphaForCoverage = this->canTweakAlphaForCoverage();
 
     SkAutoTUnref<const GrGeometryProcessor> gp(create_stroke_rect_gp(canTweakAlphaForCoverage,
                                                                      this->viewMatrix(),
                                                                      this->usesLocalCoords(),
                                                                      this->coverageIgnored()));
     if (!gp) {
@@ skipping 463 matching lines @@
     SkRect inside = outside;
     inside.inset(strokeWidth, strokeWidth);
 
     GrColor color = GrRandomColor(random);
 
     return GrAAStrokeRectBatch::Create(color, GrTest::TestMatrix(random), outside, outsideAssist,
                                        inside, miterStroke, inside.isFinite() && inside.isEmpty());
 }
 
 #endif