diff options
| author |  Brian Salomon <bsalomon@google.com> | 2017-05-08 10:43:33 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-05-10 14:48:47 +0000 |
| commit | ac70f84e7f4fc9ddd344753b92cdf4be540d32bf (patch) | |
| tree | 4b813dd3d6fae01afe6727a6897faf4c31fb240c /tools | |
| parent | 0418a888d31689f5358b6b90fd09287aeba368db (diff) | |
Move all non-AA fill rect ops off of GrLegacyMeshDrawOp.
This adds perspective to GrNewNonAAFillRectOp, renames it to GrNonAAFillRectOp, and deletes the previous version of that namespace.
Change-Id: I20f35bf019f9c9105e6ec83dda11328451138109
Reviewed-on: https://skia-review.googlesource.com/15634
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/gpu/GrTest.cpp | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/tools/gpu/GrTest.cpp b/tools/gpu/GrTest.cpp index cd21e83ab1..73ceab435c 100644 --- a/tools/gpu/GrTest.cpp +++ b/tools/gpu/GrTest.cpp @@ -254,8 +254,9 @@ uint32_t GrRenderTargetContextPriv::testingOnly_addLegacyMeshDrawOp( if (fRenderTargetContext->drawingManager()->wasAbandoned()) { return SK_InvalidUniqueID; } - SkDEBUGCODE(fRenderTargetContext->validate();) GR_AUDIT_TRAIL_AUTO_FRAME( - fRenderTargetContext->fAuditTrail, "GrRenderTargetContext::testingOnly_addMeshDrawOp"); + SkDEBUGCODE(fRenderTargetContext->validate()); + GR_AUDIT_TRAIL_AUTO_FRAME(fRenderTargetContext->fAuditTrail, + "GrRenderTargetContext::testingOnly_addLegacyMeshDrawOp"); GrPipelineBuilder pipelineBuilder(std::move(paint), aaType); if (uss) { @@ -267,6 +268,17 @@ uint32_t GrRenderTargetContextPriv::testingOnly_addLegacyMeshDrawOp( std::move(op)); } +uint32_t GrRenderTargetContextPriv::testingOnly_addDrawOp(std::unique_ptr<GrDrawOp> op) { + ASSERT_SINGLE_OWNER + if (fRenderTargetContext->drawingManager()->wasAbandoned()) { + return SK_InvalidUniqueID; + } + SkDEBUGCODE(fRenderTargetContext->validate()); + GR_AUDIT_TRAIL_AUTO_FRAME(fRenderTargetContext->fAuditTrail, + "GrRenderTargetContext::testingOnly_addDrawOp"); + return fRenderTargetContext->addDrawOp(GrNoClip(), std::move(op)); +} + #undef ASSERT_SINGLE_OWNER /////////////////////////////////////////////////////////////////////////////// |