diff options
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, 3 insertions, 9 deletions
diff --git a/tests/PaintTest.cpp b/tests/PaintTest.cpp index 647f8e2f23..2794058ceb 100644 --- a/tests/PaintTest.cpp +++ b/tests/PaintTest.cpp @@ -18,7 +18,6 @@ #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 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, 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<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::kPipelineStage_Kind, - SkSL::String(src), settings); + std::unique_ptr<SkSL::Program> program = compiler.convertProgram(SkSL::Program::kCPU_Kind, + SkSL::String(src), settings); REPORTER_ASSERT(r, program); if (program) { SkSL::JIT jit(&compiler); |