Index: src/gpu/GrAADistanceFieldPathRenderer.cpp |
diff --git a/src/gpu/GrAADistanceFieldPathRenderer.cpp b/src/gpu/GrAADistanceFieldPathRenderer.cpp |
index c11c641f57116739f241a4d21b385077393f0453..3c7648aae342ed24368c4665eb6dc470433ae03a 100755 |
--- a/src/gpu/GrAADistanceFieldPathRenderer.cpp |
+++ b/src/gpu/GrAADistanceFieldPathRenderer.cpp |
@@ -157,15 +157,16 @@ |
void initBatchTracker(const GrPipelineInfo& init) override { |
// Handle any color overrides |
- if (!init.readsColor()) { |
+ if (init.fColorIgnored) { |
fBatch.fColor = GrColor_ILLEGAL; |
- } |
- init.getOverrideColorIfSet(&fBatch.fColor); |
+ } else if (GrColor_ILLEGAL != init.fOverrideColor) { |
+ fBatch.fColor = init.fOverrideColor; |
+ } |
// setup batch properties |
- fBatch.fColorIgnored = !init.readsColor(); |
- fBatch.fUsesLocalCoords = init.readsLocalCoords(); |
- fBatch.fCoverageIgnored = !init.readsCoverage(); |
+ fBatch.fColorIgnored = init.fColorIgnored; |
+ fBatch.fUsesLocalCoords = init.fUsesLocalCoords; |
+ fBatch.fCoverageIgnored = init.fCoverageIgnored; |
} |
struct FlushInfo { |