From c994a93b327235182c6d29a782c409b2c58476ae Mon Sep 17 00:00:00 2001 From: Robert Phillips Date: Tue, 19 Jun 2018 13:09:54 -0400 Subject: Move op memory storage to GrContext (take 2) TBR=bsalomon@google.com Change-Id: I4a448694d4114d83cd3a720cfc8bd37de51733d1 Reviewed-on: https://skia-review.googlesource.com/135707 Reviewed-by: Greg Daniel Reviewed-by: Brian Salomon Commit-Queue: Robert Phillips --- src/gpu/ccpr/GrCCPerFlushResources.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'src/gpu/ccpr/GrCCPerFlushResources.cpp') diff --git a/src/gpu/ccpr/GrCCPerFlushResources.cpp b/src/gpu/ccpr/GrCCPerFlushResources.cpp index 84f905cbc6..a1cecb3f88 100644 --- a/src/gpu/ccpr/GrCCPerFlushResources.cpp +++ b/src/gpu/ccpr/GrCCPerFlushResources.cpp @@ -53,8 +53,10 @@ public: sk_sp resources, sk_sp copyProxy, int baseInstance, int endInstance, const SkISize& drawBounds) { - return std::unique_ptr(new CopyAtlasOp(std::move(resources), std::move(copyProxy), - baseInstance, endInstance, drawBounds)); + GrOpMemoryPool* pool = context->contextPriv().opMemoryPool(); + + return pool->allocate(std::move(resources), std::move(copyProxy), + baseInstance, endInstance, drawBounds); } const char* name() const override { return "CopyAtlasOp (CCPR)"; } @@ -96,8 +98,9 @@ public: static std::unique_ptr Make(GrContext* context, sk_sp resources, CoverageCountBatchID batchID, const SkISize& drawBounds) { - return std::unique_ptr(new RenderAtlasOp(std::move(resources), batchID, - drawBounds)); + GrOpMemoryPool* pool = context->contextPriv().opMemoryPool(); + + return pool->allocate(std::move(resources), batchID, drawBounds); } // GrDrawOp interface. -- cgit v1.2.3