| Index: src/gpu/GrAAHairLinePathRenderer.cpp
|
| diff --git a/src/gpu/GrAAHairLinePathRenderer.cpp b/src/gpu/GrAAHairLinePathRenderer.cpp
|
| index 14770b85317e48b71f2c7c56c162cf656f5aa8b9..da60a6cabd4a8e8f068c2560ff14e4ced5044146 100644
|
| --- a/src/gpu/GrAAHairLinePathRenderer.cpp
|
| +++ b/src/gpu/GrAAHairLinePathRenderer.cpp
|
| @@ -700,16 +700,17 @@
|
|
|
| void initBatchTracker(const GrPipelineInfo& init) override {
|
| // Handle any color overrides
|
| - if (!init.readsColor()) {
|
| + if (init.fColorIgnored) {
|
| fGeoData[0].fColor = GrColor_ILLEGAL;
|
| - }
|
| - init.getOverrideColorIfSet(&fGeoData[0].fColor);
|
| + } else if (GrColor_ILLEGAL != init.fOverrideColor) {
|
| + fGeoData[0].fColor = init.fOverrideColor;
|
| + }
|
|
|
| // setup batch properties
|
| - fBatch.fColorIgnored = !init.readsColor();
|
| + fBatch.fColorIgnored = init.fColorIgnored;
|
| fBatch.fColor = fGeoData[0].fColor;
|
| - fBatch.fUsesLocalCoords = init.readsLocalCoords();
|
| - fBatch.fCoverageIgnored = !init.readsCoverage();
|
| + fBatch.fUsesLocalCoords = init.fUsesLocalCoords;
|
| + fBatch.fCoverageIgnored = init.fCoverageIgnored;
|
| fBatch.fCoverage = fGeoData[0].fCoverage;
|
| }
|
|
|
|
|