commit 6a44c6a7d89b748fb040d41697a337d357d7fa22
author bsalomon <bsalomon@google.com> Tue May 26 09:49:05 2015 -0700
committer Commit bot <commit-bot@chromium.org> Tue May 26 09:49:05 2015 -0700
tree b579537e83e03bf1b982a4a823ab4a63f1f6a993
parent 36ec383c579066520357605eb8726193f251187e

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

src/gpu/GrXferProcessor.cpp

diff --git a/src/gpu/GrXferProcessor.cpp b/src/gpu/GrXferProcessor.cpp
index 343a05e..e771f64 100644
--- a/src/gpu/GrXferProcessor.cpp
+++ b/src/gpu/GrXferProcessor.cpp
@@ -9,17 +9,17 @@
 #include "gl/GrGLCaps.h"
 
 GrXferProcessor::GrXferProcessor()
-    : fWillReadDstColor(false), fReadsCoverage(true), fDstCopyTextureOffset() {
+    : fWillReadDstColor(false), fReadsCoverage(true), fDstTextureOffset() {
 }
 
-GrXferProcessor::GrXferProcessor(const GrDeviceCoordTexture* dstCopy, bool willReadDstColor)
+GrXferProcessor::GrXferProcessor(const DstTexture* dstTexture, bool willReadDstColor)
     : fWillReadDstColor(willReadDstColor)
     , fReadsCoverage(true)
-    , fDstCopyTextureOffset() {
-    if (dstCopy && dstCopy->texture()) {
-        fDstCopy.reset(dstCopy->texture());
-        fDstCopyTextureOffset = dstCopy->offset();
-        this->addTextureAccess(&fDstCopy);
+    , fDstTextureOffset() {
+    if (dstTexture && dstTexture->texture()) {
+        fDstTexture.reset(dstTexture->texture());
+        fDstTextureOffset = dstTexture->offset();
+        this->addTextureAccess(&fDstTexture);
         this->setWillReadFragmentPosition();
     }
 }
@@ -43,8 +43,8 @@
 
 void GrXferProcessor::getGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const {
     uint32_t key = this->willReadDstColor() ? 0x1 : 0x0;
-    if (this->getDstCopyTexture() &&
-        kTopLeft_GrSurfaceOrigin == this->getDstCopyTexture()->origin()) {
+    if (this->getDstTexture() &&
+        kTopLeft_GrSurfaceOrigin == this->getDstTexture()->origin()) {
         key |= 0x2;
     }
     b->add32(key);
@@ -54,7 +54,7 @@
 bool GrXferProcessor::willNeedXferBarrier(const GrRenderTarget* rt,
                                           const GrCaps& caps,
                                           GrXferBarrierType* outBarrierType) const {
-    if (static_cast<const GrSurface*>(rt) == this->getDstCopyTexture()) {
+    if (static_cast<const GrSurface*>(rt) == this->getDstTexture()) {
         // Texture barriers are required when a shader reads and renders to the same texture.
         SkASSERT(rt);
         SkASSERT(caps.textureBarrierSupport());
@@ -162,25 +162,24 @@
 
 GrXferProcessor* GrXPFactory::createXferProcessor(const GrProcOptInfo& colorPOI,
                                                   const GrProcOptInfo& coveragePOI,
-                                                  const GrDeviceCoordTexture* dstCopy,
+                                                  const DstTexture* dstTexture,
                                                   const GrCaps& caps) const {
 #ifdef SK_DEBUG
     if (this->willReadDstColor(caps, colorPOI, coveragePOI)) {
         if (!caps.shaderCaps()->dstReadInShaderSupport()) {
-            SkASSERT(dstCopy && dstCopy->texture());
+            SkASSERT(dstTexture && dstTexture->texture());
         } else {
-            SkASSERT(!dstCopy || !dstCopy->texture()); 
+            SkASSERT(!dstTexture || !dstTexture->texture()); 
         }
     } else {
-        SkASSERT(!dstCopy || !dstCopy->texture()); 
+        SkASSERT(!dstTexture || !dstTexture->texture()); 
     }
 #endif
-    return this->onCreateXferProcessor(caps, colorPOI, coveragePOI, dstCopy);
+    return this->onCreateXferProcessor(caps, colorPOI, coveragePOI, dstTexture);
 }
 
-bool GrXPFactory::willNeedDstCopy(const GrCaps& caps, const GrProcOptInfo& colorPOI,
-                                  const GrProcOptInfo& coveragePOI) const {
+bool GrXPFactory::willNeedDstTexture(const GrCaps& caps, const GrProcOptInfo& colorPOI,
+                                    const GrProcOptInfo& coveragePOI) const {
     return (this->willReadDstColor(caps, colorPOI, coveragePOI) 
             && !caps.shaderCaps()->dstReadInShaderSupport());
 }
-