From 4f6ba2e522bcc3f84c02c9b7dd834b9b5476968b Mon Sep 17 00:00:00 2001 From: Robert Phillips Date: Fri, 15 Jun 2018 15:59:38 +0000 Subject: Revert "Move op memory storage to GrContext" This reverts commit c8cee446bf9c07da8848bbd032abf26e79966ac1. Reason for revert: TSAN issues Original change's description: > Move op memory storage to GrContext > > TBR=bsalomon@google.com > Change-Id: Ifa95bf0073b9d948f2c937d10088b7734b971f90 > Reviewed-on: https://skia-review.googlesource.com/131500 > Reviewed-by: Brian Salomon > Reviewed-by: Greg Daniel > Commit-Queue: Robert Phillips TBR=egdaniel@google.com,bsalomon@google.com,robertphillips@google.com Change-Id: Ia0d2b7408314d9b67d57388315376bbea23d3780 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/135181 Reviewed-by: Robert Phillips Commit-Queue: Robert Phillips --- tests/PrimitiveProcessorTest.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'tests/PrimitiveProcessorTest.cpp') diff --git a/tests/PrimitiveProcessorTest.cpp b/tests/PrimitiveProcessorTest.cpp index 74a73a66a9..3a76e6c5e0 100644 --- a/tests/PrimitiveProcessorTest.cpp +++ b/tests/PrimitiveProcessorTest.cpp @@ -33,9 +33,7 @@ public: const char* name() const override { return "Dummy Op"; } static std::unique_ptr Make(GrContext* context, int numAttribs) { - GrOpMemoryPool* pool = context->contextPriv().opMemoryPool(); - - return pool->allocate(numAttribs); + return std::unique_ptr(new Op(numAttribs)); } FixedFunctionFlags fixedFunctionFlags() const override { -- cgit v1.2.3