| Index: src/gpu/batches/GrCopySurfaceBatch.h
|
| diff --git a/src/gpu/batches/GrCopySurfaceBatch.h b/src/gpu/batches/GrCopySurfaceBatch.h
|
| index 3926643f8aedff441e2c36aece565a267c3d9ba8..d0269b79bf8c795494f551edf39d0b21e91bcd4d 100644
|
| --- a/src/gpu/batches/GrCopySurfaceBatch.h
|
| +++ b/src/gpu/batches/GrCopySurfaceBatch.h
|
| @@ -36,7 +36,7 @@ public:
|
| GrRenderTarget* rt = fDst.get()->asRenderTarget();
|
| return rt ? rt->getUniqueID() : 0;
|
| }
|
| - GrRenderTarget* renderTarget() const override { return fDst.get()->asRenderTarget(); }
|
| + GrRenderTarget* renderTarget() const override { return nullptr; }
|
|
|
| SkString dumpInfo() const override {
|
| SkString string;
|
| @@ -63,8 +63,13 @@ private:
|
|
|
| void onPrepare(GrBatchFlushState*) override {}
|
|
|
| - void onDraw(GrBatchFlushState* state) override {
|
| - state->gpu()->copySurface(fDst.get(), fSrc.get(), fSrcRect, fDstPoint);
|
| + void onDraw(GrBatchFlushState* state, GrGpuCommandBuffer* buffer) override {
|
| + if (!buffer) {
|
| + state->gpu()->copySurface(fDst.get(), fSrc.get(), fSrcRect, fDstPoint);
|
| + } else {
|
| + // currently we are not sending copies through the GrGpuCommandBuffer
|
| + SkASSERT(false);
|
| + }
|
| }
|
|
|
| GrPendingIOResource<GrSurface, kWrite_GrIOType> fDst;
|
|
|