| Index: src/gpu/GrDrawTarget.cpp
|
| diff --git a/src/gpu/GrDrawTarget.cpp b/src/gpu/GrDrawTarget.cpp
|
| index 644161f4d98e156287ceb1feddd4dfa9ffbdb30a..e5baaa740487eda977cb2f071602c2aef0312a23 100644
|
| --- a/src/gpu/GrDrawTarget.cpp
|
| +++ b/src/gpu/GrDrawTarget.cpp
|
| @@ -43,9 +43,9 @@
|
| bool GrDrawTarget::setupDstReadIfNecessary(const GrPipelineBuilder& pipelineBuilder,
|
| const GrProcOptInfo& colorPOI,
|
| const GrProcOptInfo& coveragePOI,
|
| - GrXferProcessor::DstTexture* dstTexture,
|
| + GrDeviceCoordTexture* dstCopy,
|
| const SkRect* drawBounds) {
|
| - if (!pipelineBuilder.willXPNeedDstTexture(*this->caps(), colorPOI, coveragePOI)) {
|
| + if (!pipelineBuilder.willXPNeedDstCopy(*this->caps(), colorPOI, coveragePOI)) {
|
| return true;
|
| }
|
|
|
| @@ -55,8 +55,8 @@
|
| if (GrTexture* rtTex = rt->asTexture()) {
|
| // The render target is a texture, se we can read from it directly in the shader. The XP
|
| // will be responsible to detect this situation and request a texture barrier.
|
| - dstTexture->setTexture(rtTex);
|
| - dstTexture->setOffset(0, 0);
|
| + dstCopy->setTexture(rtTex);
|
| + dstCopy->setOffset(0, 0);
|
| return true;
|
| }
|
| }
|
| @@ -102,8 +102,8 @@
|
| }
|
| SkIPoint dstPoint = {0, 0};
|
| if (this->copySurface(copy, rt, copyRect, dstPoint)) {
|
| - dstTexture->setTexture(copy);
|
| - dstTexture->setOffset(copyRect.fLeft, copyRect.fTop);
|
| + dstCopy->setTexture(copy);
|
| + dstCopy->setOffset(copyRect.fLeft, copyRect.fTop);
|
| return true;
|
| } else {
|
| return false;
|
| @@ -497,7 +497,7 @@
|
| pipelineInfo.fCoveragePOI,
|
| *this->caps(),
|
| *pipelineInfo.fScissor,
|
| - &pipelineInfo.fDstTexture));
|
| + &pipelineInfo.fDstCopy));
|
| }
|
| ///////////////////////////////////////////////////////////////////////////////
|
|
|
| @@ -511,7 +511,7 @@
|
| fColorPOI = fPipelineBuilder->colorProcInfo(primProc);
|
| fCoveragePOI = fPipelineBuilder->coverageProcInfo(primProc);
|
| if (!target->setupDstReadIfNecessary(*fPipelineBuilder, fColorPOI, fCoveragePOI,
|
| - &fDstTexture, devBounds)) {
|
| + &fDstCopy, devBounds)) {
|
| fPipelineBuilder = NULL;
|
| }
|
| }
|
| @@ -526,7 +526,7 @@
|
| fColorPOI = fPipelineBuilder->colorProcInfo(batch);
|
| fCoveragePOI = fPipelineBuilder->coverageProcInfo(batch);
|
| if (!target->setupDstReadIfNecessary(*fPipelineBuilder, fColorPOI, fCoveragePOI,
|
| - &fDstTexture, devBounds)) {
|
| + &fDstCopy, devBounds)) {
|
| fPipelineBuilder = NULL;
|
| }
|
| }
|
|
|