| commit | 25a880960a9a689a745a01071ecba3fe494b5940 | [log] [tgz] |
|---|---|---|
| author | Brian Salomon <bsalomon@google.com> | Thu Dec 01 09:36:50 2016 -0500 |
| committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | Thu Dec 01 15:12:53 2016 +0000 |
| tree | ebc0576bf054ed6a1ea63e2a2034cc8e19374543 | |
| parent | 7c3e7180948766321c51d165737555e78910de51 [diff] [blame] |
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>
diff --git a/src/gpu/instanced/InstancedRendering.cpp b/src/gpu/instanced/InstancedRendering.cpp index 99a749a..a46f24b 100644 --- a/src/gpu/instanced/InstancedRendering.cpp +++ b/src/gpu/instanced/InstancedRendering.cpp
@@ -382,7 +382,7 @@ fIsTracked = true; } -bool InstancedRendering::Batch::onCombineIfPossible(GrBatch* other, const GrCaps& caps) { +bool InstancedRendering::Batch::onCombineIfPossible(GrOp* other, const GrCaps& caps) { Batch* that = static_cast<Batch*>(other); SkASSERT(fInstancedRendering == that->fInstancedRendering); SkASSERT(fTailDraw);