diff options
| author |  joshualitt <joshualitt@google.com> | 2014-12-04 06:01:45 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-12-04 06:01:45 -0800 |
| commit | f78c60c92a8c212fc462262f2ce81e584d0f02f8 (patch) | |
| tree | 33a43f1d293a54764399846c504d1506d2cbd9e0 /tests/GLProgramsTest.cpp | |
| parent | 841a6b54c11137e210aa81e8b56e1763c3571cb8 (diff) | |
Revert of move program descriptor generation to flush (patchset #7 id:120001 of https://codereview.chromium.org/777673003/)
Reason for revert:
breaking linux build
Original issue's description:
> move program descriptor generation to flush
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/829e1b80b1020b17f2078020c990e079b70c077c
TBR=egdaniel@google.com,bsalomon@google.com,joshualitt@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/776243005
Diffstat (limited to 'tests/GLProgramsTest.cpp')
| -rw-r--r-- | tests/GLProgramsTest.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/GLProgramsTest.cpp b/tests/GLProgramsTest.cpp index 7b73fdc510..aa8359d5e5 100644 --- a/tests/GLProgramsTest.cpp +++ b/tests/GLProgramsTest.cpp @@ -384,12 +384,11 @@ bool GrDrawTarget::programUnitTest(int maxStages) { // create optimized draw state, setup readDst texture if required, and build a descriptor // and program. ODS creation can fail, so we have to check - GrOptDrawState ods(ds, *gpu->caps(), scissor, &dstCopy, drawType); + GrOptDrawState ods(ds, gpu, scissor, &dstCopy, drawType); if (ods.mustSkip()) { continue; } - ods.finalize(gpu); - SkAutoTUnref<GrGLProgram> program(GrGLProgramBuilder::CreateProgram(ods, gpu)); + SkAutoTUnref<GrGLProgram> program(GrGLProgramBuilder::CreateProgram(ods, drawType, gpu)); if (NULL == program.get()) { SkDebugf("Failed to create program!"); return false; |