Index: src/gpu/effects/GrDashingEffect.cpp |
diff --git a/src/gpu/effects/GrDashingEffect.cpp b/src/gpu/effects/GrDashingEffect.cpp |
index c1e2011e08cab1bf5a097cbfae76a39ed04c857e..77d29cba26f99b64113dca6d1553dec7cabd65f5 100644 |
--- a/src/gpu/effects/GrDashingEffect.cpp |
+++ b/src/gpu/effects/GrDashingEffect.cpp |
@@ -269,12 +269,13 @@ public: |
const char* name() const override { return "DashBatch"; } |
- 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; } |
@@ -300,18 +301,18 @@ private: |
combinedMatrix.mapRect(&fBounds); |
} |
- 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(); |
} |
struct DashDraw { |