Revert of Move DstCoordTexture to GrXP, rename and remove the word "copy" from dstcopytexture names. (patchset #6 id:100001 of https://codereview.chromium.org/1132093004/)

Reason for revert:
This is asserting on GTX660 bots with '!dst'. This may just be catching an existing issue.

https://build.chromium.org/p/client.skia/builders/Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Debug/builds/622/steps/dm/logs/stdio

https://build.chromium.org/p/client.skia/builders/Test-Win7-MSVC-ShuttleA-GPU-HD2000-x86-Debug-ANGLE/builds/209/steps/dm/logs/stdio

https://build.chromium.org/p/client.skia/builders/Test-Win8-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug/builds/318/steps/dm/logs/stdio

Original issue's description:
> Move DstCoordTexture to GrXP, rename and remove the word "copy" from dstcopytexture names.
>
> Committed: https://skia.googlesource.com/skia/+/bb106b5f6ee18f7453b63f3a95f421b60a957f39

TBR=egdaniel@google.com,bsalomon@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Review URL: https://codereview.chromium.org/1158453004

1 files changed, 24 insertions, 24 deletions

diff --git a/src/gpu/gl/GrGLXferProcessor.cpp b/src/gpu/gl/GrGLXferProcessor.cpp
index b707a3f632..657da41274 100644
--- a/src/gpu/gl/GrGLXferProcessor.cpp
+++ b/src/gpu/gl/GrGLXferProcessor.cpp
@@ -12,8 +12,8 @@
 #include "gl/builders/GrGLProgramBuilder.h"
 
 void GrGLXferProcessor::emitCode(const EmitArgs& args) {
-    if (args.fXP.getDstTexture()) {
-        bool topDown = kTopLeft_GrSurfaceOrigin == args.fXP.getDstTexture()->origin();
+    if (args.fXP.getDstCopyTexture()) {
+        bool topDown = kTopLeft_GrSurfaceOrigin == args.fXP.getDstCopyTexture()->origin();
 
         GrGLXPFragmentBuilder* fsBuilder = args.fPB->getFragmentShaderBuilder();
 
@@ -27,24 +27,24 @@ void GrGLXferProcessor::emitCode(const EmitArgs& args) {
 
         const char* dstColor = fsBuilder->dstColor();
 
-        const char* dstTopLeftName;
-        const char* dstCoordScaleName;
+        const char* dstCopyTopLeftName;
+        const char* dstCopyCoordScaleName;
 
-        fDstTopLeftUni = args.fPB->addUniform(GrGLProgramBuilder::kFragment_Visibility,
-                                              kVec2f_GrSLType,
-                                              kDefault_GrSLPrecision,
-                                              "DstTextureUpperLeft",
-                                              &dstTopLeftName);
-        fDstScaleUni = args.fPB->addUniform(GrGLProgramBuilder::kFragment_Visibility,
-                                            kVec2f_GrSLType,
-                                            kDefault_GrSLPrecision,
-                                            "DstTextureCoordScale",
-                                            &dstCoordScaleName);
+        fDstCopyTopLeftUni = args.fPB->addUniform(GrGLProgramBuilder::kFragment_Visibility,
+                                                   kVec2f_GrSLType,
+                                                   kDefault_GrSLPrecision,
+                                                   "DstCopyUpperLeft",
+                                                   &dstCopyTopLeftName);
+        fDstCopyScaleUni = args.fPB->addUniform(GrGLProgramBuilder::kFragment_Visibility,
+                                                kVec2f_GrSLType,
+                                                kDefault_GrSLPrecision,
+                                                "DstCopyCoordScale",
+                                                &dstCopyCoordScaleName);
         const char* fragPos = fsBuilder->fragmentPosition();
 
         fsBuilder->codeAppend("// Read color from copy of the destination.\n");
         fsBuilder->codeAppendf("vec2 _dstTexCoord = (%s.xy - %s) * %s;",
-                               fragPos, dstTopLeftName, dstCoordScaleName);
+                               fragPos, dstCopyTopLeftName, dstCopyCoordScaleName);
 
         if (!topDown) {
             fsBuilder->codeAppend("_dstTexCoord.y = 1.0 - _dstTexCoord.y;");
@@ -59,18 +59,18 @@ void GrGLXferProcessor::emitCode(const EmitArgs& args) {
 }
 
 void GrGLXferProcessor::setData(const GrGLProgramDataManager& pdm, const GrXferProcessor& xp) {
-    if (xp.getDstTexture()) {
-        if (fDstTopLeftUni.isValid()) {
-            pdm.set2f(fDstTopLeftUni, static_cast<GrGLfloat>(xp.dstTextureOffset().fX),
-                      static_cast<GrGLfloat>(xp.dstTextureOffset().fY));
-            pdm.set2f(fDstScaleUni, 1.f / xp.getDstTexture()->width(),
-                      1.f / xp.getDstTexture()->height());
+    if (xp.getDstCopyTexture()) {
+        if (fDstCopyTopLeftUni.isValid()) {
+            pdm.set2f(fDstCopyTopLeftUni, static_cast<GrGLfloat>(xp.dstCopyTextureOffset().fX),
+                      static_cast<GrGLfloat>(xp.dstCopyTextureOffset().fY));
+            pdm.set2f(fDstCopyScaleUni, 1.f / xp.getDstCopyTexture()->width(),
+                      1.f / xp.getDstCopyTexture()->height());
         } else {
-            SkASSERT(!fDstScaleUni.isValid());
+            SkASSERT(!fDstCopyScaleUni.isValid());
         }
     } else {
-        SkASSERT(!fDstTopLeftUni.isValid());
-        SkASSERT(!fDstScaleUni.isValid());
+        SkASSERT(!fDstCopyTopLeftUni.isValid());
+        SkASSERT(!fDstCopyScaleUni.isValid());
     }
     this->onSetData(pdm, xp);
 }