From 0054311bf3b4f619a631e95d8aa1ea2d4bfd01c6 Mon Sep 17 00:00:00 2001 From: Ethan Nicholas Date: Tue, 31 Jul 2018 09:44:36 -0400 Subject: Re-re-land "added GrSkSLFP and converted DitherEffect to use it" This reverts commit 6c48e4d11ce80fa5cfef56e13b2d5847fe94a7cc. Bug: skia: Change-Id: I7ee78990fc30eec545d1856e59eb6e0573089426 Reviewed-on: https://skia-review.googlesource.com/144348 Reviewed-by: Brian Salomon Commit-Queue: Ethan Nicholas --- tests/PaintTest.cpp | 1 + tests/SkSLErrorTest.cpp | 6 +++++- tests/SkSLJITTest.cpp | 5 +++-- 3 files changed, 9 insertions(+), 3 deletions(-) (limited to 'tests') 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 caps = SkSL::ShaderCapsFactory::Default(); settings.fCaps = caps.get(); - compiler.convertProgram(SkSL::Program::kFragment_Kind, SkSL::String(src), settings); + std::unique_ptr 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 void test(skiatest::Reporter* r, const char* src, type x, type y, type result) { SkSL::Compiler compiler; SkSL::Program::Settings settings; - std::unique_ptr program = compiler.convertProgram(SkSL::Program::kCPU_Kind, - SkSL::String(src), settings); + std::unique_ptr program = compiler.convertProgram( + SkSL::Program::kPipelineStage_Kind, + SkSL::String(src), settings); REPORTER_ASSERT(r, program); if (program) { SkSL::JIT jit(&compiler); -- cgit v1.2.3