diff options
| author | joshualitt <joshualitt@chromium.org> | 2014-10-10 09:56:55 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-10 09:56:55 -0700 |
| commit | 71856d520461ae025a0332aa0ce9735a096d9baf (patch) | |
| tree | b8cbbecf6a8ef31ffde8f7fb2be543d95587e7ad /tests/GLProgramsTest.cpp | |
| parent | 5324978a88677ac6b758324321816427814e7793 (diff) | |
Opt state takes a GP instead of a GeometryStage
BUG=skia:
Review URL: https://codereview.chromium.org/637003003
Diffstat (limited to 'tests/GLProgramsTest.cpp')
| -rw-r--r-- | tests/GLProgramsTest.cpp | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/tests/GLProgramsTest.cpp b/tests/GLProgramsTest.cpp index 5ab35b7d22..75032bdbe6 100644 --- a/tests/GLProgramsTest.cpp +++ b/tests/GLProgramsTest.cpp @@ -456,9 +456,6 @@ bool GrGpuGL::programUnitTest(int maxStages) { ds->reset(); continue; } - const GrGeometryStage* geometryProcessor = NULL; - SkSTArray<8, const GrFragmentStage*, true> colorStages; - SkSTArray<8, const GrFragmentStage*, true> coverageStages; GrGLProgramDesc desc; GrDeviceCoordTexture dstCopy; @@ -468,24 +465,14 @@ bool GrGpuGL::programUnitTest(int maxStages) { } if (!GrGLProgramDesc::Build(*ods, drawType, - ods->getSrcBlendCoeff(), - ods->getDstBlendCoeff(), this, dstCopy.texture() ? &dstCopy : NULL, - &geometryProcessor, - &colorStages, - &coverageStages, &desc)) { SkDebugf("Failed to generate GL program descriptor"); return false; } - SkAutoTUnref<GrGLProgram> program(GrGLProgramBuilder::CreateProgram(*ods, - desc, - drawType, - geometryProcessor, - colorStages.begin(), - coverageStages.begin(), - this)); + SkAutoTUnref<GrGLProgram> program( + GrGLProgramBuilder::CreateProgram(*ods, desc, drawType, this)); if (NULL == program.get()) { SkDebugf("Failed to create program!"); return false; |