commit 7adb35559430303a25be37f21af56c0df6c62f2b
author egdaniel <egdaniel@google.com> Wed Feb 04 06:20:25 2015 -0800
committer Commit bot <commit-bot@chromium.org> Wed Feb 04 06:20:25 2015 -0800
tree 136bfed094f7bd15de972a059402c83f98891b23
parent 3e9dfdb3784c0cbfecf7589a74aa9aff7ef40abd

Revert of Revert "Move DstCopy on gpu into the GrXferProcessor." (patchset #1 id:1 of https://codereview.chromium.org/896163003/)

Reason for revert:
failed on my manual revert

Original issue's description:
> Revert "Move DstCopy on gpu into the GrXferProcessor."
>
> This reverts commit 74a11753604768bf461b80cabb66060e8564d82c.
>
> TBR=joshualitt@google.com,bsalomon@google.com
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/3e9dfdb3784c0cbfecf7589a74aa9aff7ef40abd

TBR=
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:

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

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));