diff options
| author |  bsalomon <bsalomon@google.com> | 2015-02-06 07:02:37 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-02-06 07:02:37 -0800 |
| commit | 50785a3d10b53bea5beb6e18431a2449860be237 (patch) | |
| tree | 32a67ea76db96f6f94f7d1ce54ff354da5c30e95 /tests | |
| parent | 5245cb427f982dbae365a52cf19256cfbcc6870a (diff) | |
Revert of Revert of Move DstCopy on gpu into the GrXferProcessor. (patchset #1 id:1 of https://codereview.chromium.org/901663007/)
Reason for revert:
The revert didn't help the 10.9 bot. Unreverting by reverting the revert (which is basically relanding the original patch which itself was a revert of a revert). Revert.
Original issue's description:
> Revert of Move DstCopy on gpu into the GrXferProcessor. (patchset #11 id:200001 of https://codereview.chromium.org/885923002/)
>
> Reason for revert:
> Testing to see if reverting fixes 10.9 bots.
>
> Original issue's description:
> > Move DstCopy on gpu into the GrXferProcessor.
> >
> > BUG=skia:
> >
> > Committed: https://skia.googlesource.com/skia/+/74a11753604768bf461b80cabb66060e8564d82c
> >
> > Committed: https://skia.googlesource.com/skia/+/5e1378d0e075a323144ba14e0a4cbcca35eccc69
>
> TBR=joshualitt@google.com,egdaniel@google.com
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/21b2c53218ab25f4268e3992e51d916076a2a7ee
TBR=joshualitt@google.com,egdaniel@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/873723009
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/GLProgramsTest.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/GLProgramsTest.cpp b/tests/GLProgramsTest.cpp index 9b54fa7e9d..30f34587a4 100644 --- a/tests/GLProgramsTest.cpp +++ b/tests/GLProgramsTest.cpp @@ -298,7 +298,7 @@ bool GrDrawTarget::programUnitTest(int maxStages) { } 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 @@ bool GrDrawTarget::programUnitTest(int maxStages) { 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)); |