| Index: src/gpu/GrDrawTarget.cpp
|
| diff --git a/src/gpu/GrDrawTarget.cpp b/src/gpu/GrDrawTarget.cpp
|
| index 94f7293ef93cbce3e7a9d1e8520e5a7612784874..7ddcf1cacb8ec2268d18d888108af0ac3cda470f 100644
|
| --- a/src/gpu/GrDrawTarget.cpp
|
| +++ b/src/gpu/GrDrawTarget.cpp
|
| @@ -33,8 +33,6 @@
|
| #include "batches/GrRectBatchFactory.h"
|
| #include "batches/GrStencilPathBatch.h"
|
|
|
| -#include "instanced/InstancedRendering.h"
|
| -
|
| ////////////////////////////////////////////////////////////////////////////////
|
|
|
| // Experimentally we have found that most batching occurs within the first 10 comparisons.
|
| @@ -47,8 +45,7 @@
|
| , fResourceProvider(resourceProvider)
|
| , fAuditTrail(auditTrail)
|
| , fFlags(0)
|
| - , fRenderTarget(rt)
|
| - , fInstancedRendering(fGpu->createInstancedRenderingIfSupported()) {
|
| + , fRenderTarget(rt) {
|
| // TODO: Stop extracting the context (currently needed by GrClipMaskManager)
|
| fContext = fGpu->getContext();
|
|
|
| @@ -204,10 +201,6 @@
|
| fBatches[i]->prepare(flushState);
|
| }
|
| }
|
| -
|
| - if (fInstancedRendering) {
|
| - fInstancedRendering->beginFlush(flushState->resourceProvider());
|
| - }
|
| }
|
|
|
| void GrDrawTarget::drawBatches(GrBatchFlushState* flushState) {
|
| @@ -265,9 +258,6 @@
|
|
|
| void GrDrawTarget::reset() {
|
| fBatches.reset();
|
| - if (fInstancedRendering) {
|
| - fInstancedRendering->endFlush();
|
| - }
|
| }
|
|
|
| void GrDrawTarget::drawBatch(const GrPipelineBuilder& pipelineBuilder,
|
|
|