commit 7dae46a6783de5f6bc461870306eb7d648386980
author Brian Salomon <bsalomon@google.com> Wed Dec 14 16:21:37 2016 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Dec 14 22:08:58 2016 +0000
tree e70780be1a68ef514894859ef7af9d3d8cb6f341
parent 25351021a6fddd390273fbc8bbdb84a56865b561

Some more batch->op renaming

Change-Id: I5cbdc606170186d2d908d518af0e0fd1094fcf78
Reviewed-on: https://skia-review.googlesource.com/6089
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>

src/gpu/GrRenderTargetOpList.cpp

diff --git a/src/gpu/GrRenderTargetOpList.cpp b/src/gpu/GrRenderTargetOpList.cpp
index fafbd7c..2c7f6a3 100644
--- a/src/gpu/GrRenderTargetOpList.cpp
+++ b/src/gpu/GrRenderTargetOpList.cpp
@@ -27,10 +27,10 @@
 
 #include "SkStrokeRec.h"
 
-#include "batches/GrClearBatch.h"
-#include "batches/GrClearStencilClipBatch.h"
-#include "batches/GrCopySurfaceBatch.h"
-#include "batches/GrDiscardBatch.h"
+#include "batches/GrClearOp.h"
+#include "batches/GrClearStencilClipOp.h"
+#include "batches/GrCopySurfaceOp.h"
+#include "batches/GrDiscardOp.h"
 #include "batches/GrDrawOp.h"
 #include "batches/GrDrawPathBatch.h"
 #include "batches/GrRectOpFactory.h"
@@ -408,10 +408,10 @@
         fLastFullClearOp->setColor(color);
         return;
     }
-    sk_sp<GrClearBatch> op(GrClearBatch::Make(GrFixedClip::Disabled(), color, renderTarget));
+    sk_sp<GrClearOp> op(GrClearOp::Make(GrFixedClip::Disabled(), color, renderTarget));
     if (GrOp* clearOp = this->recordOp(std::move(op))) {
         // This is either the clear op we just created or another one that it combined with.
-        fLastFullClearOp = static_cast<GrClearBatch*>(clearOp);
+        fLastFullClearOp = static_cast<GrClearOp*>(clearOp);
     }
 }
 
@@ -419,7 +419,7 @@
     // Currently this just inserts a discard op. However, once in MDB this can remove all the
     // previously recorded ops and change the load op to discard.
     if (this->caps()->discardRenderTargetSupport()) {
-        this->recordOp(GrDiscardBatch::Make(renderTarget));
+        this->recordOp(GrDiscardOp::Make(renderTarget));
     }
 }
 
@@ -429,7 +429,7 @@
                                        GrSurface* src,
                                        const SkIRect& srcRect,
                                        const SkIPoint& dstPoint) {
-    sk_sp<GrOp> op = GrCopySurfaceBatch::Make(dst, src, srcRect, dstPoint);
+    sk_sp<GrOp> op = GrCopySurfaceOp::Make(dst, src, srcRect, dstPoint);
     if (!op) {
         return false;
     }
@@ -566,5 +566,5 @@
 void GrRenderTargetOpList::clearStencilClip(const GrFixedClip& clip,
                                             bool insideStencilMask,
                                             GrRenderTarget* rt) {
-    this->recordOp(GrClearStencilClipBatch::Make(clip, insideStencilMask, rt));
+    this->recordOp(GrClearStencilClipOp::Make(clip, insideStencilMask, rt));
 }