| Index: src/gpu/batches/GrNonAAStrokeRectBatch.cpp
|
| diff --git a/src/gpu/batches/GrNonAAStrokeRectBatch.cpp b/src/gpu/batches/GrNonAAStrokeRectBatch.cpp
|
| index a5de607c8192223848eda55ad672038b30a46ebc..2f80884b61f878a22cb1ad61ab337987aebe4210 100644
|
| --- a/src/gpu/batches/GrNonAAStrokeRectBatch.cpp
|
| +++ b/src/gpu/batches/GrNonAAStrokeRectBatch.cpp
|
| @@ -54,13 +54,13 @@ public:
|
|
|
| const char* name() const override { return "GrStrokeRectBatch"; }
|
|
|
| - 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->setKnownSingleComponent(0xff);
|
| + color->setKnownFourComponents(fGeoData[0].fColor);
|
| + coverage->setKnownSingleComponent(0xff);
|
| + overrides->fUsePLSDstRead = false;
|
| }
|
|
|
| void append(GrColor color, const SkMatrix& viewMatrix, const SkRect& rect,
|
| @@ -162,18 +162,18 @@ private:
|
| target->draw(vertices);
|
| }
|
|
|
| - void initBatchTracker(const GrPipelineOptimizations& opt) override {
|
| + void initBatchTracker(const GrXPOverridesForBatch& overrides) override {
|
| // 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.fUsesLocalCoords = overrides.readsLocalCoords();
|
| + fBatch.fCoverageIgnored = !overrides.readsCoverage();
|
| }
|
|
|
| NonAAStrokeRectBatch() : INHERITED(ClassID()) {}
|
|
|