Index: src/gpu/batches/GrDrawAtlasBatch.cpp |
diff --git a/src/gpu/batches/GrDrawAtlasBatch.cpp b/src/gpu/batches/GrDrawAtlasBatch.cpp |
index 5ecdc1fb032a619b50ec5433428dbd225cc18961..3ee8f88e89455aef111fb53ea86d82fffdea1523 100644 |
--- a/src/gpu/batches/GrDrawAtlasBatch.cpp |
+++ b/src/gpu/batches/GrDrawAtlasBatch.cpp |
@@ -12,13 +12,13 @@ |
#include "SkRandom.h" |
#include "SkRSXform.h" |
-void GrDrawAtlasBatch::initBatchTracker(const GrPipelineOptimizations& opt) { |
+void GrDrawAtlasBatch::initBatchTracker(const GrXPOverridesForBatch& overrides) { |
SkASSERT(fGeoData.count() == 1); |
// Handle any color overrides |
- if (!opt.readsColor()) { |
+ if (!overrides.readsColor()) { |
fGeoData[0].fColor = GrColor_ILLEGAL; |
} |
- if (opt.getOverrideColorIfSet(&fGeoData[0].fColor) && fHasColors) { |
+ if (overrides.getOverrideColorIfSet(&fGeoData[0].fColor) && fHasColors) { |
size_t vertexStride = sizeof(SkPoint) + sizeof(SkPoint) + |
(this->hasColors() ? sizeof(GrColor) : 0); |
uint8_t* currVertex = fGeoData[0].fVerts.begin(); |
@@ -29,11 +29,11 @@ void GrDrawAtlasBatch::initBatchTracker(const GrPipelineOptimizations& opt) { |
} |
// setup batch properties |
- fColorIgnored = !opt.readsColor(); |
+ fColorIgnored = !overrides.readsColor(); |
fColor = fGeoData[0].fColor; |
// We'd like to assert this, but we can't because of GLPrograms test |
//SkASSERT(init.readsLocalCoords()); |
- fCoverageIgnored = !opt.readsCoverage(); |
+ fCoverageIgnored = !overrides.readsCoverage(); |
} |
static const GrGeometryProcessor* set_vertex_attributes(bool hasColors, |