diff options
author | Robert Phillips <robertphillips@google.com> | 2018-06-15 15:59:38 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-06-15 15:59:45 +0000 |
commit | 4f6ba2e522bcc3f84c02c9b7dd834b9b5476968b (patch) | |
tree | 790f98d53f60cdef293fa2788ac02ec4722c33c1 /tests/LazyProxyTest.cpp | |
parent | 0513dd8675534afdd605cea32778a4b4671b2c3d (diff) |
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 <bsalomon@google.com>
> Reviewed-by: Greg Daniel <egdaniel@google.com>
> Commit-Queue: Robert Phillips <robertphillips@google.com>
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 <robertphillips@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'tests/LazyProxyTest.cpp')
-rw-r--r-- | tests/LazyProxyTest.cpp | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/tests/LazyProxyTest.cpp b/tests/LazyProxyTest.cpp index 796e4870db..c0dcbf9647 100644 --- a/tests/LazyProxyTest.cpp +++ b/tests/LazyProxyTest.cpp @@ -59,9 +59,7 @@ public: GrProxyProvider* proxyProvider, LazyProxyTest* test, bool nullTexture) { - GrOpMemoryPool* pool = context->contextPriv().opMemoryPool(); - - return pool->allocate<Op>(proxyProvider, test, nullTexture); + return std::unique_ptr<GrDrawOp>(new Op(proxyProvider, test, nullTexture)); } void visitProxies(const VisitProxyFunc& func) const override { @@ -272,11 +270,8 @@ public: GrProxyProvider* proxyProvider, int* testExecuteValue, bool shouldFailInstantiation) { - GrOpMemoryPool* pool = context->contextPriv().opMemoryPool(); - - return pool->allocate<LazyFailedInstantiationTestOp>(proxyProvider, - testExecuteValue, - shouldFailInstantiation); + return std::unique_ptr<GrDrawOp>(new LazyFailedInstantiationTestOp( + proxyProvider, testExecuteValue, shouldFailInstantiation)); } void visitProxies(const VisitProxyFunc& func) const override { @@ -372,9 +367,7 @@ public: DEFINE_OP_CLASS_ID static std::unique_ptr<GrDrawOp> Make(GrContext* context, sk_sp<GrTextureProxy> proxy) { - GrOpMemoryPool* pool = context->contextPriv().opMemoryPool(); - - return pool->allocate<LazyUninstantiateTestOp>(std::move(proxy)); + return std::unique_ptr<GrDrawOp>(new LazyUninstantiateTestOp(std::move(proxy))); } void visitProxies(const VisitProxyFunc& func) const override { |