diff options
| author | joshualitt <joshualitt@chromium.org> | 2014-12-04 08:59:10 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-12-04 08:59:10 -0800 |
| commit | dafa4d09cbe66943b2414bdeaa0f6ef7f900dc4a (patch) | |
| tree | 3c8b0d36d6182e56e8556167593e0aa13fbf70de /tests/GLProgramsTest.cpp | |
| parent | 051e56df8f14fae68f0e990f78b85494c2ce4a6b (diff) | |
move program descriptor generation to flush
BUG=skia:
Committed: https://skia.googlesource.com/skia/+/829e1b80b1020b17f2078020c990e079b70c077c
Review URL: https://codereview.chromium.org/777673003
Diffstat (limited to 'tests/GLProgramsTest.cpp')
| -rw-r--r-- | tests/GLProgramsTest.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/GLProgramsTest.cpp b/tests/GLProgramsTest.cpp index aa8359d5e5..7b73fdc510 100644 --- a/tests/GLProgramsTest.cpp +++ b/tests/GLProgramsTest.cpp @@ -384,11 +384,12 @@ 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, scissor, &dstCopy, drawType); + GrOptDrawState ods(ds, *gpu->caps(), scissor, &dstCopy, drawType); if (ods.mustSkip()) { continue; } - SkAutoTUnref<GrGLProgram> program(GrGLProgramBuilder::CreateProgram(ods, drawType, gpu)); + ods.finalize(gpu); + SkAutoTUnref<GrGLProgram> program(GrGLProgramBuilder::CreateProgram(ods, gpu)); if (NULL == program.get()) { SkDebugf("Failed to create program!"); return false; |