| Index: src/gpu/effects/GrDashingEffect.cpp
|
| diff --git a/src/gpu/effects/GrDashingEffect.cpp b/src/gpu/effects/GrDashingEffect.cpp
|
| index 8ebb31f9fef71c427b4bfc3b9fea0cbf96bf0f4d..063bfd1352b9ae9893af4e6e98af3f9271c6a9b9 100644
|
| --- a/src/gpu/effects/GrDashingEffect.cpp
|
| +++ b/src/gpu/effects/GrDashingEffect.cpp
|
| @@ -274,17 +274,16 @@ public:
|
|
|
| void initBatchTracker(const GrPipelineInfo& init) override {
|
| // Handle any color overrides
|
| - if (init.fColorIgnored) {
|
| + if (!init.readsColor()) {
|
| fGeoData[0].fColor = GrColor_ILLEGAL;
|
| - } else if (GrColor_ILLEGAL != init.fOverrideColor) {
|
| - fGeoData[0].fColor = init.fOverrideColor;
|
| }
|
| + init.getOverrideColorIfSet(&fGeoData[0].fColor);
|
|
|
| // setup batch properties
|
| - fBatch.fColorIgnored = init.fColorIgnored;
|
| + fBatch.fColorIgnored = !init.readsColor();
|
| fBatch.fColor = fGeoData[0].fColor;
|
| - fBatch.fUsesLocalCoords = init.fUsesLocalCoords;
|
| - fBatch.fCoverageIgnored = init.fCoverageIgnored;
|
| + fBatch.fUsesLocalCoords = init.readsLocalCoords();
|
| + fBatch.fCoverageIgnored = !init.readsCoverage();
|
| }
|
|
|
| struct DashDraw {
|
|
|