diff options
| author |  joshualitt <joshualitt@chromium.org> | 2015-07-09 12:17:44 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-07-09 12:17:44 -0700 |
| commit | 4f6dc521f5082a65f42be8a333afe3bbda4ec400 (patch) | |
| tree | 815ac26cc33482473f7adc9ecd18419cc2723ffc /src/gpu | |
| parent | 1c84634454aa78fb26f23875b86a243aa4596c59 (diff) | |
Trivial cleanup of copying GrPipelineBuilder
TBR=robertphillips@google.com
BUG=skia:
Review URL: https://codereview.chromium.org/1229983003
Diffstat (limited to 'src/gpu')
| -rw-r--r-- | src/gpu/GrClipMaskManager.cpp | 9 | ||||
| -rw-r--r-- | src/gpu/GrSoftwarePathRenderer.cpp | 3 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/gpu/GrClipMaskManager.cpp b/src/gpu/GrClipMaskManager.cpp index 76cfbf6cfc..fa9c30edcc 100644 --- a/src/gpu/GrClipMaskManager.cpp +++ b/src/gpu/GrClipMaskManager.cpp @@ -842,24 +842,23 @@ bool GrClipMaskManager::createStencilClipMask(GrRenderTarget* rt, // element directly or a bounding rect of the entire clip. fClipMode = kModifyClip_StencilClipMode; for (int p = 0; p < passes; ++p) { - GrPipelineBuilder pipelineBuilderCopy(pipelineBuilder); - *pipelineBuilderCopy.stencil() = stencilSettings[p]; + *pipelineBuilder.stencil() = stencilSettings[p]; if (canDrawDirectToClip) { if (Element::kRect_Type == element->getType()) { // We need this AGP until everything is in GrBatch - fClipTarget->drawSimpleRect(&pipelineBuilderCopy, + fClipTarget->drawSimpleRect(&pipelineBuilder, GrColor_WHITE, viewMatrix, element->getRect()); } else { - pr->drawPath(fClipTarget, &pipelineBuilderCopy, GrColor_WHITE, + pr->drawPath(fClipTarget, &pipelineBuilder, GrColor_WHITE, viewMatrix, clipPath, stroke, false); } } else { // The view matrix is setup to do clip space -> stencil space translation, so // draw rect in clip space. - fClipTarget->drawSimpleRect(&pipelineBuilderCopy, + fClipTarget->drawSimpleRect(&pipelineBuilder, GrColor_WHITE, viewMatrix, SkRect::Make(clipSpaceIBounds)); diff --git a/src/gpu/GrSoftwarePathRenderer.cpp b/src/gpu/GrSoftwarePathRenderer.cpp index d9b58a83ec..3d5bc3e656 100644 --- a/src/gpu/GrSoftwarePathRenderer.cpp +++ b/src/gpu/GrSoftwarePathRenderer.cpp @@ -146,8 +146,7 @@ bool GrSoftwarePathRenderer::onDrawPath(GrDrawTarget* target, return false; } - GrPipelineBuilder copy = *pipelineBuilder; - GrSWMaskHelper::DrawToTargetWithPathMask(texture, target, ©, color, viewMatrix, + GrSWMaskHelper::DrawToTargetWithPathMask(texture, target, pipelineBuilder, color, viewMatrix, devPathBounds); if (path.isInverseFillType()) { |