Move DstCoordTexture to GrXP, rename and remove the word "copy" from dstcopytexture names.
Committed: https://skia.googlesource.com/skia/+/bb106b5f6ee18f7453b63f3a95f421b60a957f39
Review URL: https://codereview.chromium.org/1132093004
diff --git a/src/gpu/GrDrawTarget.cpp b/src/gpu/GrDrawTarget.cpp
index e5baaa7..644161f 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,
- GrDeviceCoordTexture* dstCopy,
+ GrXferProcessor::DstTexture* dstTexture,
const SkRect* drawBounds) {
- if (!pipelineBuilder.willXPNeedDstCopy(*this->caps(), colorPOI, coveragePOI)) {
+ if (!pipelineBuilder.willXPNeedDstTexture(*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.
- dstCopy->setTexture(rtTex);
- dstCopy->setOffset(0, 0);
+ dstTexture->setTexture(rtTex);
+ dstTexture->setOffset(0, 0);
return true;
}
}
@@ -102,8 +102,8 @@
}
SkIPoint dstPoint = {0, 0};
if (this->copySurface(copy, rt, copyRect, dstPoint)) {
- dstCopy->setTexture(copy);
- dstCopy->setOffset(copyRect.fLeft, copyRect.fTop);
+ dstTexture->setTexture(copy);
+ dstTexture->setOffset(copyRect.fLeft, copyRect.fTop);
return true;
} else {
return false;
@@ -497,7 +497,7 @@
pipelineInfo.fCoveragePOI,
*this->caps(),
*pipelineInfo.fScissor,
- &pipelineInfo.fDstCopy));
+ &pipelineInfo.fDstTexture));
}
///////////////////////////////////////////////////////////////////////////////
@@ -511,7 +511,7 @@
fColorPOI = fPipelineBuilder->colorProcInfo(primProc);
fCoveragePOI = fPipelineBuilder->coverageProcInfo(primProc);
if (!target->setupDstReadIfNecessary(*fPipelineBuilder, fColorPOI, fCoveragePOI,
- &fDstCopy, devBounds)) {
+ &fDstTexture, devBounds)) {
fPipelineBuilder = NULL;
}
}
@@ -526,7 +526,7 @@
fColorPOI = fPipelineBuilder->colorProcInfo(batch);
fCoveragePOI = fPipelineBuilder->coverageProcInfo(batch);
if (!target->setupDstReadIfNecessary(*fPipelineBuilder, fColorPOI, fCoveragePOI,
- &fDstCopy, devBounds)) {
+ &fDstTexture, devBounds)) {
fPipelineBuilder = NULL;
}
}