Index: src/gpu/GrOvalRenderer.cpp |
diff --git a/src/gpu/GrOvalRenderer.cpp b/src/gpu/GrOvalRenderer.cpp |
index d1b8a6b1fb42e122057a36fc2271e052b2f6cbf9..20fe1986cb26ce7a803adef03f4a5aee7ac4f271 100644 |
--- a/src/gpu/GrOvalRenderer.cpp |
+++ b/src/gpu/GrOvalRenderer.cpp |
@@ -607,7 +607,7 @@ private: |
// Setup geometry processor |
SkAutoTUnref<GrGeometryProcessor> gp(new CircleGeometryProcessor(fStroked, localMatrix)); |
- target->initDraw(gp, this->pipeline()); |
+ target->initDraw(gp, kTriangles_GrPrimitiveType); |
int instanceCount = fGeoData.count(); |
size_t vertexStride = gp->getVertexStride(); |
@@ -793,7 +793,7 @@ private: |
// Setup geometry processor |
SkAutoTUnref<GrGeometryProcessor> gp(new EllipseGeometryProcessor(fStroked, localMatrix)); |
- target->initDraw(gp, this->pipeline()); |
+ target->initDraw(gp, kTriangles_GrPrimitiveType); |
int instanceCount = fGeoData.count(); |
QuadHelper helper; |
@@ -1011,7 +1011,7 @@ private: |
SkAutoTUnref<GrGeometryProcessor> gp(new DIEllipseGeometryProcessor(this->viewMatrix(), |
this->style())); |
- target->initDraw(gp, this->pipeline()); |
+ target->initDraw(gp, kTriangles_GrPrimitiveType); |
int instanceCount = fGeoData.count(); |
size_t vertexStride = gp->getVertexStride(); |
@@ -1278,7 +1278,7 @@ private: |
// Setup geometry processor |
SkAutoTUnref<GrGeometryProcessor> gp(new CircleGeometryProcessor(fStroked, localMatrix)); |
- target->initDraw(gp, this->pipeline()); |
+ target->initDraw(gp, kTriangles_GrPrimitiveType); |
int instanceCount = fGeoData.count(); |
size_t vertexStride = gp->getVertexStride(); |
@@ -1291,7 +1291,7 @@ private: |
InstancedHelper helper; |
CircleVertex* verts = reinterpret_cast<CircleVertex*>(helper.init(target, |
- kTriangles_GrPrimitiveType, vertexStride, indexBuffer, kVertsPerRRect, |
+ vertexStride, indexBuffer, kVertsPerRRect, |
indicesPerInstance, instanceCount)); |
if (!verts || !indexBuffer) { |
SkDebugf("Could not allocate vertices\n"); |
@@ -1426,7 +1426,7 @@ private: |
// Setup geometry processor |
SkAutoTUnref<GrGeometryProcessor> gp(new EllipseGeometryProcessor(fStroked, localMatrix)); |
- target->initDraw(gp, this->pipeline()); |
+ target->initDraw(gp, kTriangles_GrPrimitiveType); |
int instanceCount = fGeoData.count(); |
size_t vertexStride = gp->getVertexStride(); |
@@ -1439,7 +1439,7 @@ private: |
InstancedHelper helper; |
EllipseVertex* verts = reinterpret_cast<EllipseVertex*>( |
- helper.init(target, kTriangles_GrPrimitiveType, vertexStride, indexBuffer, |
+ helper.init(target, vertexStride, indexBuffer, |
kVertsPerRRect, indicesPerInstance, instanceCount)); |
if (!verts || !indexBuffer) { |
SkDebugf("Could not allocate vertices\n"); |