diff options
| author |  Brian Salomon <bsalomon@google.com> | 2017-04-03 10:38:00 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-04-03 15:13:48 +0000 |
| commit | d3ccb0a37f0e62c84fdcd6a77b7b15476b04db7a (patch) | |
| tree | a050c5624e60eee8193f4aa015269ad3bf14e329 /tools | |
| parent | dffe9827b18444d1426859d9035f9f0087201f44 (diff) | |
Move pipeline handling out of GrMeshDrawOp.
The monolithic GrPipeline is moved to a subclass GrLegacyDrawMeshOp.
The pipeline used to record a GrMesh draw in a GrMeshDrawOp must now be passed rather than implicitly using the op's pipeline.
Change-Id: I50d77e4dcc8d91a523fa7566ce43a9a291174706
Reviewed-on: https://skia-review.googlesource.com/11002
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/gpu/GrTest.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tools/gpu/GrTest.cpp b/tools/gpu/GrTest.cpp index 28c1738a0d..005595d2eb 100644 --- a/tools/gpu/GrTest.cpp +++ b/tools/gpu/GrTest.cpp @@ -228,18 +228,18 @@ int GrResourceCache::countUniqueKeysWithTag(const char* tag) const { #define ASSERT_SINGLE_OWNER \ SkDEBUGCODE(GrSingleOwner::AutoEnforce debug_SingleOwner(fRenderTargetContext->fSingleOwner);) -uint32_t GrRenderTargetContextPriv::testingOnly_addMeshDrawOp(GrPaint&& paint, - GrAAType aaType, - std::unique_ptr<GrMeshDrawOp> op, - const GrUserStencilSettings* uss, - bool snapToCenters) { +uint32_t GrRenderTargetContextPriv::testingOnly_addLegacyMeshDrawOp( + GrPaint&& paint, + GrAAType aaType, + std::unique_ptr<GrLegacyMeshDrawOp> op, + const GrUserStencilSettings* uss, + bool snapToCenters) { ASSERT_SINGLE_OWNER 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_addMeshDrawOp"); GrPipelineBuilder pipelineBuilder(std::move(paint), aaType); if (uss) { @@ -247,7 +247,7 @@ uint32_t GrRenderTargetContextPriv::testingOnly_addMeshDrawOp(GrPaint&& paint, } pipelineBuilder.setSnapVerticesToPixelCenters(snapToCenters); - return fRenderTargetContext->addMeshDrawOp(pipelineBuilder, GrNoClip(), std::move(op)); + return fRenderTargetContext->addLegacyMeshDrawOp(pipelineBuilder, GrNoClip(), std::move(op)); } #undef ASSERT_SINGLE_OWNER |