Index: src/gpu/GrDrawTarget.cpp |
diff --git a/src/gpu/GrDrawTarget.cpp b/src/gpu/GrDrawTarget.cpp |
index 37faacf38347af03fa4230178a9973c250350a44..60dd58693a35ccbe5a0b585e559c63d7e91beda1 100644 |
--- a/src/gpu/GrDrawTarget.cpp |
+++ b/src/gpu/GrDrawTarget.cpp |
@@ -445,14 +445,14 @@ 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)); |
+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)); |
} |
/////////////////////////////////////////////////////////////////////////////// |