diff options
| author |  Ethan Nicholas <ethannicholas@google.com> | 2018-07-12 14:02:00 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-07-19 19:00:55 +0000 |
| commit | 97ae0c89025dfd791047f5701e57d58da37c125c (patch) | |
| tree | d944775c2c88dd36d5e40fb6c1bae5c7c2376e3b /tests | |
| parent | 310f44d3d5298becdd8ab235af29789f6ed769b5 (diff) | |
Revert "Revert "added GrSkSLFP and converted DitherEffect to use it""
This reverts commit f2030783094e502fb74221077a5ee7cb41287fe4.
Bug: skia:
Change-Id: Icaaa8b3ea652a8f126bfbcc788a360493a7ebe3e
Reviewed-on: https://skia-review.googlesource.com/137391
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/PaintTest.cpp | 1 | ||||
| -rw-r--r-- | tests/SkSLErrorTest.cpp | 6 | ||||
| -rw-r--r-- | tests/SkSLJITTest.cpp | 5 |
3 files changed, 9 insertions, 3 deletions
diff --git a/tests/PaintTest.cpp b/tests/PaintTest.cpp index 2794058ceb..647f8e2f23 100644 --- a/tests/PaintTest.cpp +++ b/tests/PaintTest.cpp @@ -18,6 +18,7 @@ #include "SkUtils.h" #include "SkWriteBuffer.h" #include "Test.h" +#undef ASSERT static size_t uni_to_utf8(const SkUnichar src[], void* dst, int count) { char* u8 = (char*)dst; diff --git a/tests/SkSLErrorTest.cpp b/tests/SkSLErrorTest.cpp index 432f35bff5..b84b1f3d8c 100644 --- a/tests/SkSLErrorTest.cpp +++ b/tests/SkSLErrorTest.cpp @@ -14,7 +14,11 @@ 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(); - compiler.convertProgram(SkSL::Program::kFragment_Kind, SkSL::String(src), settings); + std::unique_ptr<SkSL::Program> program = compiler.convertProgram(SkSL::Program::kFragment_Kind, + SkSL::String(src), settings); + if (!compiler.errorCount()) { + compiler.optimize(*program); + } SkSL::String skError(error); if (compiler.errorText() != skError) { SkDebugf("SKSL ERROR:\n source: %s\n expected: %s received: %s", src, error, diff --git a/tests/SkSLJITTest.cpp b/tests/SkSLJITTest.cpp index 9f0c9a3b1b..7561e13af7 100644 --- a/tests/SkSLJITTest.cpp +++ b/tests/SkSLJITTest.cpp @@ -15,8 +15,9 @@ template<typename type> void test(skiatest::Reporter* r, const char* src, type x, type y, type result) { SkSL::Compiler compiler; SkSL::Program::Settings settings; - std::unique_ptr<SkSL::Program> program = compiler.convertProgram(SkSL::Program::kCPU_Kind, - SkSL::String(src), settings); + std::unique_ptr<SkSL::Program> program = compiler.convertProgram( + SkSL::Program::kPipelineStage_Kind, + SkSL::String(src), settings); REPORTER_ASSERT(r, program); if (program) { SkSL::JIT jit(&compiler); |