| Index: src/gpu/GrTessellatingPathRenderer.cpp
|
| diff --git a/src/gpu/GrTessellatingPathRenderer.cpp b/src/gpu/GrTessellatingPathRenderer.cpp
|
| index a41a88eed6bb84f6856e6fae9f9d06aea3274241..de5dcab8ab9c2ca683d72c9eb6b4fb028be28950 100644
|
| --- a/src/gpu/GrTessellatingPathRenderer.cpp
|
| +++ b/src/gpu/GrTessellatingPathRenderer.cpp
|
| @@ -1375,11 +1375,10 @@ public:
|
|
|
| void initBatchTracker(const GrPipelineInfo& init) override {
|
| // Handle any color overrides
|
| - if (init.fColorIgnored) {
|
| + if (!init.readsColor()) {
|
| fColor = GrColor_ILLEGAL;
|
| - } else if (GrColor_ILLEGAL != init.fOverrideColor) {
|
| - fColor = init.fOverrideColor;
|
| }
|
| + init.getOverrideColorIfSet(&fColor);
|
| fPipelineInfo = init;
|
| }
|
|
|
| @@ -1412,8 +1411,8 @@ public:
|
| LOG("got %d pts, %d contours\n", maxPts, contourCnt);
|
| uint32_t flags = GrDefaultGeoProcFactory::kPosition_GPType;
|
| SkAutoTUnref<const GrGeometryProcessor> gp(
|
| - GrDefaultGeoProcFactory::Create(flags, fColor, fPipelineInfo.fUsesLocalCoords,
|
| - fPipelineInfo.fCoverageIgnored, fViewMatrix,
|
| + GrDefaultGeoProcFactory::Create(flags, fColor, fPipelineInfo.readsLocalCoords(),
|
| + !fPipelineInfo.readsCoverage(), fViewMatrix,
|
| SkMatrix::I()));
|
| batchTarget->initDraw(gp, pipeline);
|
|
|
|
|