From 6c48e4d11ce80fa5cfef56e13b2d5847fe94a7cc Mon Sep 17 00:00:00 2001 From: Ethan Nicholas Date: Thu, 19 Jul 2018 20:10:37 +0000 Subject: Reland "Revert "added GrSkSLFP and converted DitherEffect to use it"" This reverts commit 97ae0c89025dfd791047f5701e57d58da37c125c. Reason for revert: Breaking ANGLE. Original change's description: > 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 > Reviewed-by: Brian Salomon TBR=bsalomon@google.com,robertphillips@google.com,ethannicholas@google.com Change-Id: I65d6d2707fceab0a99121c528d1b848d23e34bfa No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia: Reviewed-on: https://skia-review.googlesource.com/142588 Reviewed-by: Ethan Nicholas Commit-Queue: Ethan Nicholas --- tests/SkSLJITTest.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'tests/SkSLJITTest.cpp') diff --git a/tests/SkSLJITTest.cpp b/tests/SkSLJITTest.cpp index 7561e13af7..9f0c9a3b1b 100644 --- a/tests/SkSLJITTest.cpp +++ b/tests/SkSLJITTest.cpp @@ -15,9 +15,8 @@ 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::kPipelineStage_Kind, - SkSL::String(src), settings); + std::unique_ptr program = compiler.convertProgram(SkSL::Program::kCPU_Kind, + SkSL::String(src), settings); REPORTER_ASSERT(r, program); if (program) { SkSL::JIT jit(&compiler); -- cgit v1.2.3