| Index: src/gpu/GrDrawTarget.cpp
|
| diff --git a/src/gpu/GrDrawTarget.cpp b/src/gpu/GrDrawTarget.cpp
|
| index ca2d2d90052df21971b0a482d9116c33a107dbc1..21a80deb31bf29d99bb0ef9bdaed3130f2b0ae66 100644
|
| --- a/src/gpu/GrDrawTarget.cpp
|
| +++ b/src/gpu/GrDrawTarget.cpp
|
| @@ -460,13 +460,14 @@ void GrDrawTarget::copySurface(GrSurface* dst,
|
|
|
| const GrPipeline* GrDrawTarget::setupPipeline(const PipelineInfo& pipelineInfo,
|
| void* pipelineAddr) {
|
| - return SkNEW_PLACEMENT_ARGS(pipelineAddr, GrPipeline, (*pipelineInfo.fPipelineBuilder,
|
| - pipelineInfo.fColorPOI,
|
| - pipelineInfo.fCoveragePOI,
|
| - *this->caps(),
|
| - *pipelineInfo.fScissor,
|
| - &pipelineInfo.fDstTexture));
|
| + return GrPipeline::CreateAt(pipelineAddr, *pipelineInfo.fPipelineBuilder,
|
| + pipelineInfo.fColorPOI,
|
| + pipelineInfo.fCoveragePOI,
|
| + *this->caps(),
|
| + *pipelineInfo.fScissor,
|
| + &pipelineInfo.fDstTexture);
|
| }
|
| +
|
| ///////////////////////////////////////////////////////////////////////////////
|
|
|
| GrDrawTarget::PipelineInfo::PipelineInfo(const GrPipelineBuilder& pipelineBuilder,
|
|
|