| Index: src/gpu/GrDrawTarget.cpp
|
| diff --git a/src/gpu/GrDrawTarget.cpp b/src/gpu/GrDrawTarget.cpp
|
| index 37faacf38347af03fa4230178a9973c250350a44..7a6ae53b86d0a9a5ca6e370082c26ba3f837fc44 100644
|
| --- a/src/gpu/GrDrawTarget.cpp
|
| +++ b/src/gpu/GrDrawTarget.cpp
|
| @@ -445,14 +445,13 @@ void GrDrawTarget::copySurface(GrSurface* dst,
|
| this->onCopySurface(dst, src, clippedSrcRect, clippedDstPoint);
|
| }
|
|
|
| -void GrDrawTarget::setupPipeline(const PipelineInfo& pipelineInfo,
|
| - GrPipeline* pipeline) {
|
| - SkNEW_PLACEMENT_ARGS(pipeline, GrPipeline, (*pipelineInfo.fPipelineBuilder,
|
| - pipelineInfo.fColorPOI,
|
| - pipelineInfo.fCoveragePOI,
|
| - *this->caps(),
|
| - *pipelineInfo.fScissor,
|
| - &pipelineInfo.fDstTexture));
|
| +void GrDrawTarget::setupPipeline(const PipelineInfo& pipelineInfo, void* pipelineAddr) {
|
| + SkNEW_PLACEMENT_ARGS(pipelineAddr, GrPipeline, (*pipelineInfo.fPipelineBuilder,
|
| + pipelineInfo.fColorPOI,
|
| + pipelineInfo.fCoveragePOI,
|
| + *this->caps(),
|
| + *pipelineInfo.fScissor,
|
| + &pipelineInfo.fDstTexture));
|
| }
|
| ///////////////////////////////////////////////////////////////////////////////
|
|
|
|
|