diff options
| author |  Brian Salomon <bsalomon@google.com> | 2016-12-16 09:50:45 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-12-16 15:19:01 +0000 |
| commit | 99ad164886ba39f688ebabecd5fe20dd5d923ba0 (patch) | |
| tree | 67cf3194adf0c91dd60d4962b0b7835eb99c6882 /src/gpu/GrRenderTargetContext.cpp | |
| parent | a6aa590efc8201747c069f9da2285250957df01b (diff) | |
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>
Diffstat (limited to 'src/gpu/GrRenderTargetContext.cpp')
| -rw-r--r-- | src/gpu/GrRenderTargetContext.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gpu/GrRenderTargetContext.cpp b/src/gpu/GrRenderTargetContext.cpp index ee87dae13b..7b15c31c40 100644 --- a/src/gpu/GrRenderTargetContext.cpp +++ b/src/gpu/GrRenderTargetContext.cpp @@ -469,8 +469,8 @@ bool GrRenderTargetContext::drawFilledRect(const GrClip& clip, if (GrCaps::InstancedSupport::kNone != fContext->caps()->instancedSupport()) { InstancedRendering* ir = this->getOpList()->instancedRendering(); - op.reset(ir->recordRect(croppedRect, viewMatrix, paint.getColor(), aa, - fInstancedPipelineInfo, &aaType)); + op = ir->recordRect(croppedRect, viewMatrix, paint.getColor(), aa, fInstancedPipelineInfo, + &aaType); if (op) { GrPipelineBuilder pipelineBuilder(paint, aaType); if (ss) { |