aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu/batches/GrAAFillRectBatch.cpp
diff options
context:
space:
mode:
authorGravatar Brian Salomon <bsalomon@google.com>2016-12-01 09:36:50 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2016-12-01 15:12:53 +0000
commit25a880960a9a689a745a01071ecba3fe494b5940 (patch)
treeebc0576bf054ed6a1ea63e2a2034cc8e19374543 /src/gpu/batches/GrAAFillRectBatch.cpp
parent7c3e7180948766321c51d165737555e78910de51 (diff)
Rename GrBatch to GrOp
Change-Id: I27b6324f8040899fafeda23ca524bc54a4dbf090 Reviewed-on: https://skia-review.googlesource.com/5392 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
Diffstat (limited to 'src/gpu/batches/GrAAFillRectBatch.cpp')
-rw-r--r--src/gpu/batches/GrAAFillRectBatch.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gpu/batches/GrAAFillRectBatch.cpp b/src/gpu/batches/GrAAFillRectBatch.cpp
index 46a5d50955..c8804daacf 100644
--- a/src/gpu/batches/GrAAFillRectBatch.cpp
+++ b/src/gpu/batches/GrAAFillRectBatch.cpp
@@ -159,7 +159,7 @@ static void generate_aa_fill_rect_geometry(intptr_t verts,
}
class AAFillRectBatch : public GrVertexBatch {
public:
- DEFINE_BATCH_CLASS_ID
+ DEFINE_OP_CLASS_ID
AAFillRectBatch(GrColor color,
const SkMatrix& viewMatrix,
@@ -266,7 +266,7 @@ private:
helper.recordDraw(target, gp.get());
}
- bool onCombineIfPossible(GrBatch* t, const GrCaps& caps) override {
+ bool onCombineIfPossible(GrOp* t, const GrCaps& caps) override {
AAFillRectBatch* that = t->cast<AAFillRectBatch>();
if (!GrPipeline::CanCombine(*this->pipeline(), this->bounds(), *that->pipeline(),
that->bounds(), caps)) {