| Index: src/gpu/batches/GrDrawPathBatch.h
|
| diff --git a/src/gpu/batches/GrDrawPathBatch.h b/src/gpu/batches/GrDrawPathBatch.h
|
| index 39c729fa28662b0047f390d1d89874d0bd2a9619..b5aa38a7dcddde6ed95c0716ef1e3152f24d7202 100644
|
| --- a/src/gpu/batches/GrDrawPathBatch.h
|
| +++ b/src/gpu/batches/GrDrawPathBatch.h
|
| @@ -19,12 +19,12 @@
|
|
|
| class GrDrawPathBatchBase : public GrDrawBatch {
|
| public:
|
| - void getInvariantOutputColor(GrInitInvariantOutput* out) const override {
|
| - out->setKnownFourComponents(fColor);
|
| - }
|
| -
|
| - void getInvariantOutputCoverage(GrInitInvariantOutput* out) const override {
|
| - out->setKnownSingleComponent(0xff);
|
| + void computePipelineOptimizations(GrInitInvariantOutput* color,
|
| + GrInitInvariantOutput* coverage,
|
| + GrBatchToXPOverrides* overrides) const override {
|
| + color->setKnownFourComponents(fColor);
|
| + coverage->setKnownSingleComponent(0xff);
|
| + overrides->fUsePLSDstRead = false;
|
| }
|
|
|
| void setStencilSettings(const GrStencilSettings& stencil) { fStencilSettings = stencil; }
|
| @@ -36,20 +36,20 @@ protected:
|
| , fColor(initialColor) {}
|
|
|
| const GrStencilSettings& stencilSettings() const { return fStencilSettings; }
|
| - const GrPipelineOptimizations& opts() const { return fOpts; }
|
| + const GrXPOverridesForBatch& overrides() const { return fOverrides; }
|
| const SkMatrix& viewMatrix() const { return fViewMatrix; }
|
| GrColor color() const { return fColor; }
|
|
|
| private:
|
| - void initBatchTracker(const GrPipelineOptimizations& opts) override {
|
| - opts.getOverrideColorIfSet(&fColor);
|
| - fOpts = opts;
|
| + void initBatchTracker(const GrXPOverridesForBatch& overrides) override {
|
| + overrides.getOverrideColorIfSet(&fColor);
|
| + fOverrides = overrides;
|
| }
|
|
|
| SkMatrix fViewMatrix;
|
| GrColor fColor;
|
| GrStencilSettings fStencilSettings;
|
| - GrPipelineOptimizations fOpts;
|
| + GrXPOverridesForBatch fOverrides;
|
|
|
| typedef GrDrawBatch INHERITED;
|
| };
|
|
|