| Index: src/gpu/batches/GrAALinearizingConvexPathRenderer.cpp
|
| diff --git a/src/gpu/batches/GrAALinearizingConvexPathRenderer.cpp b/src/gpu/batches/GrAALinearizingConvexPathRenderer.cpp
|
| index 659f9d4adf62599cea8cd8c0cc3a901a7fa562d5..295bcb1f0ce9e6c7807b93df4f8afba623b5364e 100644
|
| --- a/src/gpu/batches/GrAALinearizingConvexPathRenderer.cpp
|
| +++ b/src/gpu/batches/GrAALinearizingConvexPathRenderer.cpp
|
| @@ -135,29 +135,30 @@ public:
|
|
|
| const char* name() const override { return "AAConvexBatch"; }
|
|
|
| - 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;
|
| }
|
|
|
| private:
|
| - 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();
|
| fBatch.fLinesOnly = SkPath::kLine_SegmentMask == fGeoData[0].fPath.getSegmentMasks();
|
| - fBatch.fCanTweakAlphaForCoverage = opt.canTweakAlphaForCoverage();
|
| + fBatch.fCanTweakAlphaForCoverage = overrides.canTweakAlphaForCoverage();
|
| }
|
|
|
| void draw(GrVertexBatch::Target* target, const GrPipeline* pipeline, int vertexCount,
|
|
|