| Index: src/gpu/batches/GrTInstanceBatch.h
|
| diff --git a/src/gpu/batches/GrTInstanceBatch.h b/src/gpu/batches/GrTInstanceBatch.h
|
| index 5f9a6c5fdbb9d8925d5c5116cf0569b0b6343c5a..9fe0339ab58d8c1fbedc480a3145feb029fa23af 100644
|
| --- a/src/gpu/batches/GrTInstanceBatch.h
|
| +++ b/src/gpu/batches/GrTInstanceBatch.h
|
| @@ -96,7 +96,7 @@ private:
|
| return;
|
| }
|
|
|
| - target->initDraw(gp, this->pipeline());
|
| + target->initDraw(gp, kTriangles_GrPrimitiveType);
|
|
|
| size_t vertexStride = gp->getVertexStride();
|
| int instanceCount = fGeoData.count();
|
| @@ -104,8 +104,7 @@ private:
|
| SkAutoTUnref<const GrIndexBuffer> indexBuffer(
|
| Impl::GetIndexBuffer(target->resourceProvider()));
|
| InstancedHelper helper;
|
| - void* vertices = helper.init(target, kTriangles_GrPrimitiveType, vertexStride,
|
| - indexBuffer, Impl::kVertsPerInstance,
|
| + void* vertices = helper.init(target, vertexStride, indexBuffer, Impl::kVertsPerInstance,
|
| Impl::kIndicesPerInstance, instanceCount);
|
| if (!vertices || !indexBuffer) {
|
| SkDebugf("Could not allocate vertices\n");
|
|
|