Index: src/gpu/GrAtlasTextContext.cpp |
diff --git a/src/gpu/GrAtlasTextContext.cpp b/src/gpu/GrAtlasTextContext.cpp |
index e0d452997b267b8433a5147df5ef53099d754206..c25ddd25e2d7774733f4ff1d2cafb4d713abca65 100644 |
--- a/src/gpu/GrAtlasTextContext.cpp |
+++ b/src/gpu/GrAtlasTextContext.cpp |
@@ -1498,15 +1498,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 { |