From 82f44319159bb98dcacdbbec7ea643dde5ed024b Mon Sep 17 00:00:00 2001 From: Brian Salomon Date: Wed, 11 Jan 2017 13:42:54 -0500 Subject: Make GrPaints move their GrProcessor ownership into GrPipelineBuilder. This makes GrPaints usable only once. In some places we must make copies in order to issue draws with the same paint state. Change-Id: Ie816e5185ce93a064111cad64c6880e1e21184c2 Reviewed-on: https://skia-review.googlesource.com/6844 Reviewed-by: Robert Phillips Commit-Queue: Brian Salomon --- tools/gpu/GrTest.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tools') diff --git a/tools/gpu/GrTest.cpp b/tools/gpu/GrTest.cpp index 95ee6b8ab2..b1c179b32a 100644 --- a/tools/gpu/GrTest.cpp +++ b/tools/gpu/GrTest.cpp @@ -241,7 +241,7 @@ int GrResourceCache::countUniqueKeysWithTag(const char* tag) const { SkDEBUGCODE(GrSingleOwner::AutoEnforce debug_SingleOwner(fRenderTargetContext->fSingleOwner);) #define RETURN_IF_ABANDONED if (fRenderTargetContext->fDrawingManager->wasAbandoned()) { return; } -void GrRenderTargetContextPriv::testingOnly_addDrawOp(const GrPaint& paint, +void GrRenderTargetContextPriv::testingOnly_addDrawOp(GrPaint&& paint, GrAAType aaType, std::unique_ptr op, @@ -253,7 +253,7 @@ void GrRenderTargetContextPriv::testingOnly_addDrawOp(const GrPaint& paint, GR_AUDIT_TRAIL_AUTO_FRAME(fRenderTargetContext->fAuditTrail, "GrRenderTargetContext::testingOnly_addDrawOp"); - GrPipelineBuilder pipelineBuilder(paint, aaType); + GrPipelineBuilder pipelineBuilder(std::move(paint), aaType); if (uss) { pipelineBuilder.setUserStencil(uss); } -- cgit v1.2.3