Index: src/gpu/batches/GrDrawVerticesBatch.cpp |
diff --git a/src/gpu/batches/GrDrawVerticesBatch.cpp b/src/gpu/batches/GrDrawVerticesBatch.cpp |
index 156e4b349e4ad8a937758db7d29be890d0479593..c76ba7d1ec2ff181504946b3ed4559c0cc327021 100644 |
--- a/src/gpu/batches/GrDrawVerticesBatch.cpp |
+++ b/src/gpu/batches/GrDrawVerticesBatch.cpp |
@@ -97,7 +97,7 @@ void GrDrawVerticesBatch::onPrepareDraws(Target* target) const { |
SkAutoTUnref<const GrGeometryProcessor> gp( |
set_vertex_attributes(hasLocalCoords, &colorOffset, &texOffset, fViewMatrix, |
fCoverageIgnored)); |
- target->initDraw(gp, this->pipeline()); |
+ target->initDraw(gp); |
size_t vertexStride = gp->getVertexStride(); |
@@ -156,15 +156,15 @@ void GrDrawVerticesBatch::onPrepareDraws(Target* target) const { |
} |
} |
- GrVertices vertices; |
+ GrMesh mesh; |
if (indices) { |
- vertices.initIndexed(this->primitiveType(), vertexBuffer, indexBuffer, firstVertex, |
- firstIndex, fVertexCount, fIndexCount); |
+ mesh.initIndexed(this->primitiveType(), vertexBuffer, indexBuffer, firstVertex, |
+ firstIndex, fVertexCount, fIndexCount); |
} else { |
- vertices.init(this->primitiveType(), vertexBuffer, firstVertex, fVertexCount); |
+ mesh.init(this->primitiveType(), vertexBuffer, firstVertex, fVertexCount); |
} |
- target->draw(vertices); |
+ target->draw(mesh); |
} |
bool GrDrawVerticesBatch::onCombineIfPossible(GrBatch* t, const GrCaps& caps) { |