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