Index: src/gpu/GrOvalRenderer.cpp |
diff --git a/src/gpu/GrOvalRenderer.cpp b/src/gpu/GrOvalRenderer.cpp |
index 73b8f2dd7a1851dbb434e799ff6f81c722ef0fa7..856b9520a46f49bef15c8f71966775dfdc4fec8f 100644 |
--- a/src/gpu/GrOvalRenderer.cpp |
+++ b/src/gpu/GrOvalRenderer.cpp |
@@ -649,19 +649,19 @@ public: |
out->setUnknownSingleComponent(); |
} |
- void initBatchTracker(const GrPipelineInfo& init) override { |
+ void initBatchTracker(const GrPipelineOptimizations& opt) override { |
// Handle any color overrides |
- if (!init.readsColor()) { |
+ if (!opt.readsColor()) { |
fGeoData[0].fColor = GrColor_ILLEGAL; |
} |
- init.getOverrideColorIfSet(&fGeoData[0].fColor); |
+ opt.getOverrideColorIfSet(&fGeoData[0].fColor); |
// setup batch properties |
- fBatch.fColorIgnored = !init.readsColor(); |
+ fBatch.fColorIgnored = !opt.readsColor(); |
fBatch.fColor = fGeoData[0].fColor; |
fBatch.fStroke = fGeoData[0].fStroke; |
- fBatch.fUsesLocalCoords = init.readsLocalCoords(); |
- fBatch.fCoverageIgnored = !init.readsCoverage(); |
+ fBatch.fUsesLocalCoords = opt.readsLocalCoords(); |
+ fBatch.fCoverageIgnored = !opt.readsCoverage(); |
} |
void generateGeometry(GrBatchTarget* batchTarget) override { |
@@ -867,19 +867,19 @@ public: |
out->setUnknownSingleComponent(); |
} |
- void initBatchTracker(const GrPipelineInfo& init) override { |
+ void initBatchTracker(const GrPipelineOptimizations& opt) override { |
// Handle any color overrides |
- if (!init.readsCoverage()) { |
+ if (!opt.readsCoverage()) { |
fGeoData[0].fColor = GrColor_ILLEGAL; |
} |
- init.getOverrideColorIfSet(&fGeoData[0].fColor); |
+ opt.getOverrideColorIfSet(&fGeoData[0].fColor); |
// setup batch properties |
- fBatch.fColorIgnored = !init.readsColor(); |
+ fBatch.fColorIgnored = !opt.readsColor(); |
fBatch.fColor = fGeoData[0].fColor; |
fBatch.fStroke = fGeoData[0].fStroke; |
- fBatch.fUsesLocalCoords = init.readsLocalCoords(); |
- fBatch.fCoverageIgnored = !init.readsCoverage(); |
+ fBatch.fUsesLocalCoords = opt.readsLocalCoords(); |
+ fBatch.fCoverageIgnored = !opt.readsCoverage(); |
} |
void generateGeometry(GrBatchTarget* batchTarget) override { |
@@ -1134,19 +1134,19 @@ public: |
out->setUnknownSingleComponent(); |
} |
- void initBatchTracker(const GrPipelineInfo& init) override { |
+ void initBatchTracker(const GrPipelineOptimizations& opt) override { |
// Handle any color overrides |
- if (!init.readsColor()) { |
+ if (!opt.readsColor()) { |
fGeoData[0].fColor = GrColor_ILLEGAL; |
} |
- init.getOverrideColorIfSet(&fGeoData[0].fColor); |
+ opt.getOverrideColorIfSet(&fGeoData[0].fColor); |
// setup batch properties |
- fBatch.fColorIgnored = !init.readsColor(); |
+ fBatch.fColorIgnored = !opt.readsColor(); |
fBatch.fColor = fGeoData[0].fColor; |
fBatch.fMode = fGeoData[0].fMode; |
- fBatch.fUsesLocalCoords = init.readsLocalCoords(); |
- fBatch.fCoverageIgnored = !init.readsCoverage(); |
+ fBatch.fUsesLocalCoords = opt.readsLocalCoords(); |
+ fBatch.fCoverageIgnored = !opt.readsCoverage(); |
} |
void generateGeometry(GrBatchTarget* batchTarget) override { |
@@ -1485,19 +1485,19 @@ public: |
out->setUnknownSingleComponent(); |
} |
- void initBatchTracker(const GrPipelineInfo& init) override { |
+ void initBatchTracker(const GrPipelineOptimizations& opt) override { |
// Handle any color overrides |
- if (!init.readsColor()) { |
+ if (!opt.readsColor()) { |
fGeoData[0].fColor = GrColor_ILLEGAL; |
} |
- init.getOverrideColorIfSet(&fGeoData[0].fColor); |
+ opt.getOverrideColorIfSet(&fGeoData[0].fColor); |
// setup batch properties |
- fBatch.fColorIgnored = !init.readsColor(); |
+ fBatch.fColorIgnored = !opt.readsColor(); |
fBatch.fColor = fGeoData[0].fColor; |
fBatch.fStroke = fGeoData[0].fStroke; |
- fBatch.fUsesLocalCoords = init.readsLocalCoords(); |
- fBatch.fCoverageIgnored = !init.readsCoverage(); |
+ fBatch.fUsesLocalCoords = opt.readsLocalCoords(); |
+ fBatch.fCoverageIgnored = !opt.readsCoverage(); |
} |
void generateGeometry(GrBatchTarget* batchTarget) override { |
@@ -1661,19 +1661,19 @@ public: |
out->setUnknownSingleComponent(); |
} |
- void initBatchTracker(const GrPipelineInfo& init) override { |
+ void initBatchTracker(const GrPipelineOptimizations& opt) override { |
// Handle any color overrides |
- if (!init.readsColor()) { |
+ if (!opt.readsColor()) { |
fGeoData[0].fColor = GrColor_ILLEGAL; |
} |
- init.getOverrideColorIfSet(&fGeoData[0].fColor); |
+ opt.getOverrideColorIfSet(&fGeoData[0].fColor); |
// setup batch properties |
- fBatch.fColorIgnored = !init.readsColor(); |
+ fBatch.fColorIgnored = !opt.readsColor(); |
fBatch.fColor = fGeoData[0].fColor; |
fBatch.fStroke = fGeoData[0].fStroke; |
- fBatch.fUsesLocalCoords = init.readsLocalCoords(); |
- fBatch.fCoverageIgnored = !init.readsCoverage(); |
+ fBatch.fUsesLocalCoords = opt.readsLocalCoords(); |
+ fBatch.fCoverageIgnored = !opt.readsCoverage(); |
} |
void generateGeometry(GrBatchTarget* batchTarget) override { |