commit 74a11753604768bf461b80cabb66060e8564d82c
author egdaniel <egdaniel@google.com> Tue Feb 03 15:02:43 2015 -0800
committer Commit bot <commit-bot@chromium.org> Tue Feb 03 15:02:43 2015 -0800
tree a05ea0f59d44fe6b200505a69408fbd96406ca54
parent bf015c34e4c36467dfef385893f375b68718450e

Move DstCopy on gpu into the GrXferProcessor.

BUG=skia:

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

tests/GLProgramsTest.cpp

diff --git a/tests/GLProgramsTest.cpp b/tests/GLProgramsTest.cpp
index 16d44fd..aee12d7 100644
--- a/tests/GLProgramsTest.cpp
+++ b/tests/GLProgramsTest.cpp
@@ -298,7 +298,7 @@
         } else {
             primProc = pathProc.get();
         }
-        if (!this->setupDstReadIfNecessary(&pipelineBuilder, &dstCopy, NULL)) {
+        if (!this->setupDstReadIfNecessary(pipelineBuilder, &dstCopy, NULL)) {
             SkDebugf("Couldn't setup dst read texture");
             return false;
         }
@@ -313,7 +313,7 @@
         primProc->initBatchTracker(&bt, pipeline.getInitBatchTracker());
 
         GrProgramDesc desc;
-        gpu->buildProgramDesc(&desc, *primProc, pipeline, pipeline.descInfo(), bt);
+        gpu->buildProgramDesc(&desc, *primProc, pipeline, bt);
 
         GrGpu::DrawArgs args(primProc, &pipeline, &desc, &bt);
         SkAutoTUnref<GrGLProgram> program(GrGLProgramBuilder::CreateProgram(args, gpu));