diff options
| author |  Kevin Lubick <kjlubick@google.com> | 2018-06-19 12:04:18 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-06-19 12:23:21 +0000 |
| commit | f2030783094e502fb74221077a5ee7cb41287fe4 (patch) | |
| tree | 7716875c2aaf120f213bb916300bf9482d260d0c /tests/SkSLErrorTest.cpp | |
| parent | fb3beb0591aed9fd6bf349eb5d08e0e485bcff08 (diff) | |
Revert "added GrSkSLFP and converted DitherEffect to use it"
This reverts commit dfbfc738a9edfff7a9804253175e380c230f3d21.
Reason for revert: Seems to be breaking DDL/ASAN bots
Original change's description:
> added GrSkSLFP and converted DitherEffect to use it
>
> Bug: skia:
> Change-Id: I84b71165eab1712355f3c7669cee2d33d259f3df
> Reviewed-on: https://skia-review.googlesource.com/124504
> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
> Reviewed-by: Brian Salomon <bsalomon@google.com>
TBR=bsalomon@google.com,ethannicholas@google.com
Change-Id: Ic4c3978aaba0391f2f8bb1316a456e3821a3a2f2
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/135700
Commit-Queue: Kevin Lubick <kjlubick@google.com>
Reviewed-by: Kevin Lubick <kjlubick@google.com>
Diffstat (limited to 'tests/SkSLErrorTest.cpp')
| -rw-r--r-- | tests/SkSLErrorTest.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/tests/SkSLErrorTest.cpp b/tests/SkSLErrorTest.cpp index b84b1f3d8c..432f35bff5 100644 --- a/tests/SkSLErrorTest.cpp +++ b/tests/SkSLErrorTest.cpp @@ -14,11 +14,7 @@ static void test_failure(skiatest::Reporter* r, const char* src, const char* err SkSL::Program::Settings settings; sk_sp<GrShaderCaps> caps = SkSL::ShaderCapsFactory::Default(); settings.fCaps = caps.get(); - std::unique_ptr<SkSL::Program> program = compiler.convertProgram(SkSL::Program::kFragment_Kind, - SkSL::String(src), settings); - if (!compiler.errorCount()) { - compiler.optimize(*program); - } + compiler.convertProgram(SkSL::Program::kFragment_Kind, SkSL::String(src), settings); SkSL::String skError(error); if (compiler.errorText() != skError) { SkDebugf("SKSL ERROR:\n source: %s\n expected: %s received: %s", src, error, |