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