From f46c5e8fdb0d832bc5ef7f4272f36286578980ec Mon Sep 17 00:00:00 2001 From: bsalomon Date: Tue, 18 Aug 2015 12:30:02 -0700 Subject: Remove Cmd in GrTargetCommands that is no longer needed with GrCopySurfaceBatch TBR=joshualitt@google.com Review URL: https://codereview.chromium.org/1292623004 --- src/gpu/GrTargetCommands.cpp | 4 ---- src/gpu/GrTargetCommands.h | 27 +++------------------------ 2 files changed, 3 insertions(+), 28 deletions(-) diff --git a/src/gpu/GrTargetCommands.cpp b/src/gpu/GrTargetCommands.cpp index befee7971c..4a64175a19 100644 --- a/src/gpu/GrTargetCommands.cpp +++ b/src/gpu/GrTargetCommands.cpp @@ -75,7 +75,3 @@ void GrTargetCommands::DrawPaths::execute(GrBatchFlushState* state) { void GrTargetCommands::DrawBatch::execute(GrBatchFlushState* state) { fBatch->draw(state); } - -void GrTargetCommands::CopySurface::execute(GrBatchFlushState* state) { - state->gpu()->copySurface(this->dst(), this->src(), fSrcRect, fDstPoint); -} diff --git a/src/gpu/GrTargetCommands.h b/src/gpu/GrTargetCommands.h index 39199f37ae..96452e125b 100644 --- a/src/gpu/GrTargetCommands.h +++ b/src/gpu/GrTargetCommands.h @@ -31,10 +31,9 @@ public: public: enum CmdType { kStencilPath_CmdType = 1, - kCopySurface_CmdType = 2, - kDrawPath_CmdType = 3, - kDrawPaths_CmdType = 4, - kDrawBatch_CmdType = 5, + kDrawPath_CmdType = 2, + kDrawPaths_CmdType = 3, + kDrawBatch_CmdType = 4, }; Cmd(CmdType type) @@ -176,26 +175,6 @@ private: GrPendingIOResource fPathRange; }; - struct CopySurface : public Cmd { - CopySurface(GrSurface* dst, GrSurface* src) - : Cmd(kCopySurface_CmdType) - , fDst(dst) - , fSrc(src) { - } - - GrSurface* dst() const { return fDst.get(); } - GrSurface* src() const { return fSrc.get(); } - - void execute(GrBatchFlushState*) override; - - SkIPoint fDstPoint; - SkIRect fSrcRect; - - private: - GrPendingIOResource fDst; - GrPendingIOResource fSrc; - }; - struct DrawBatch : public Cmd { DrawBatch(GrBatch* batch) : Cmd(kDrawBatch_CmdType) -- cgit v1.2.3