Index: src/gpu/GrAAConvexPathRenderer.cpp |
diff --git a/src/gpu/GrAAConvexPathRenderer.cpp b/src/gpu/GrAAConvexPathRenderer.cpp |
index 58a393140affbd3c7b6d65ef66425eb2f54a8e19..52994758c019dfaeb5dea5ea7fb8450bbfd73612 100644 |
--- a/src/gpu/GrAAConvexPathRenderer.cpp |
+++ b/src/gpu/GrAAConvexPathRenderer.cpp |
@@ -761,18 +761,19 @@ |
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.fLinesOnly = SkPath::kLine_SegmentMask == fGeoData[0].fPath.getSegmentMasks(); |
- fBatch.fCanTweakAlphaForCoverage = init.canTweakAlphaForCoverage(); |
+ fBatch.fCanTweakAlphaForCoverage = init.fCanTweakAlphaForCoverage; |
} |
void generateGeometryLinesOnly(GrBatchTarget* batchTarget, const GrPipeline* pipeline) { |