diff options
| author |  joshualitt <joshualitt@chromium.org> | 2014-10-10 14:11:59 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-10-10 14:11:59 -0700 |
| commit | 89c7a2ec3e9f7e1b9705214f450bb12288799da9 (patch) | |
| tree | 846fda99f953334024ec35a748bc307a3a1cb936 /tests | |
| parent | 93bee71a41701eb6cb55fe6df50f3a4081cc8a01 (diff) | |
Revert of Opt state takes a GP instead of a GeometryStage (patchset #18 id:1500001 of https://codereview.chromium.org/637003003/)
Reason for revert:
Revert because this may be causing a break in a chrome gpu test
Original issue's description:
> Opt state takes a GP instead of a GeometryStage
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/71856d520461ae025a0332aa0ce9735a096d9baf
TBR=bsalomon@google.com,egdaniel@google.com,danakj@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/647183002
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/GLProgramsTest.cpp | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/tests/GLProgramsTest.cpp b/tests/GLProgramsTest.cpp index 75032bdbe6..5ab35b7d22 100644 --- a/tests/GLProgramsTest.cpp +++ b/tests/GLProgramsTest.cpp @@ -456,6 +456,9 @@ 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; @@ -465,14 +468,24 @@ 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, this)); + SkAutoTUnref<GrGLProgram> program(GrGLProgramBuilder::CreateProgram(*ods, + desc, + drawType, + geometryProcessor, + colorStages.begin(), + coverageStages.begin(), + this)); if (NULL == program.get()) { SkDebugf("Failed to create program!"); return false; |