commit 99ad164886ba39f688ebabecd5fe20dd5d923ba0
author Brian Salomon <bsalomon@google.com> Fri Dec 16 09:50:45 2016 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Dec 16 15:19:01 2016 +0000
tree 67cf3194adf0c91dd60d4962b0b7835eb99c6882
parent a6aa590efc8201747c069f9da2285250957df01b

Rename batch->op and sk_sp in instanced rendering

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

src/gpu/instanced/GLInstancedRendering.h

diff --git a/src/gpu/instanced/GLInstancedRendering.h b/src/gpu/instanced/GLInstancedRendering.h
index c9f0d8f..c77b61d 100644
--- a/src/gpu/instanced/GLInstancedRendering.h
+++ b/src/gpu/instanced/GLInstancedRendering.h
@@ -15,7 +15,7 @@
 class GrGLCaps;
 class GrGLGpu;
 
-#define GR_GL_LOG_INSTANCED_BATCHES 0
+#define GR_GL_LOG_INSTANCED_OPS 0
 
 namespace gr_instanced {
 
@@ -33,10 +33,10 @@
 
     GrGLGpu* glGpu() const;
 
-    Batch* createBatch() override;
+    sk_sp<Op> makeOp() override;
 
     void onBeginFlush(GrResourceProvider*) override;
-    void onDraw(const GrPipeline&, const InstanceProcessor&, const Batch*) override;
+    void onDraw(const GrPipeline&, const InstanceProcessor&, const Op*) override;
     void onEndFlush() override;
     void onResetGpuResources(ResetType) override;
 
@@ -54,7 +54,7 @@
     GrGpuResource::UniqueID               fInstanceAttribsBufferUniqueId;
     int                                   fInstanceAttribsBaseInstance;
 
-    class GLBatch;
+    class GLOp;
 
     friend class ::GrGLCaps; // For CheckSupport.