diff options
author | Robert Phillips <robertphillips@google.com> | 2018-06-07 11:05:56 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-06-08 11:55:11 +0000 |
commit | 88a32efa75cbc0fc6f84bc7a0522a94166a2ab13 (patch) | |
tree | 48ccbee45d39a1a62b1d54616b78fea564456eb1 /tests/GrPipelineDynamicStateTest.cpp | |
parent | 7a45dd1daca8de90f984591cf938dd089a7795a3 (diff) |
Add a factory to any GrOp-derived class that lacked one
All GrOp-derived classes are going to have allocate their memory in a GrMemoryPool.
Change-Id: Ifa410b05eecd9b68c39dcc15dd4298d617204c13
Reviewed-on: https://skia-review.googlesource.com/132828
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'tests/GrPipelineDynamicStateTest.cpp')
-rw-r--r-- | tests/GrPipelineDynamicStateTest.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/tests/GrPipelineDynamicStateTest.cpp b/tests/GrPipelineDynamicStateTest.cpp index b6ca8f07ce..227fd7c3e0 100644 --- a/tests/GrPipelineDynamicStateTest.cpp +++ b/tests/GrPipelineDynamicStateTest.cpp @@ -105,6 +105,14 @@ class GrPipelineDynamicStateTestOp : public GrDrawOp { public: DEFINE_OP_CLASS_ID + static std::unique_ptr<GrDrawOp> Make(GrContext* context, + ScissorState scissorState, + sk_sp<const GrBuffer> vbuff) { + return std::unique_ptr<GrDrawOp>(new GrPipelineDynamicStateTestOp(scissorState, + std::move(vbuff))); + } + +private: GrPipelineDynamicStateTestOp(ScissorState scissorState, sk_sp<const GrBuffer> vbuff) : INHERITED(ClassID()) , fScissorState(scissorState) @@ -113,7 +121,6 @@ public: HasAABloat::kNo, IsZeroArea::kNo); } -private: const char* name() const override { return "GrPipelineDynamicStateTestOp"; } FixedFunctionFlags fixedFunctionFlags() const override { return FixedFunctionFlags::kNone; } RequiresDstTexture finalize(const GrCaps&, const GrAppliedClip*, @@ -143,7 +150,7 @@ private: }; DEF_GPUTEST_FOR_RENDERING_CONTEXTS(GrPipelineDynamicStateTest, reporter, ctxInfo) { - GrContext* const context = ctxInfo.grContext(); + GrContext* context = ctxInfo.grContext(); GrResourceProvider* rp = context->contextPriv().resourceProvider(); sk_sp<GrRenderTargetContext> rtc(context->contextPriv().makeDeferredRenderTargetContext( @@ -192,7 +199,7 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(GrPipelineDynamicStateTest, reporter, ctxInfo for (ScissorState scissorState : {ScissorState::kEnabled, ScissorState::kDisabled}) { rtc->clear(nullptr, 0xbaaaaaad, GrRenderTargetContext::CanClearFullscreen::kYes); rtc->priv().testingOnly_addDrawOp( - skstd::make_unique<GrPipelineDynamicStateTestOp>(scissorState, vbuff)); + GrPipelineDynamicStateTestOp::Make(context, scissorState, vbuff)); rtc->readPixels(SkImageInfo::Make(kScreenSize, kScreenSize, kRGBA_8888_SkColorType, kPremul_SkAlphaType), resultPx, 4 * kScreenSize, 0, 0, 0); |