From 7833466da45bfa1e078427c4a6db94d41c5c1535 Mon Sep 17 00:00:00 2001 From: Ethan Nicholas Date: Thu, 30 Mar 2017 13:45:54 -0400 Subject: skslc can now be compiled with no Skia dependencies, in preparation for its eventual role in Skia's build process. Bug: skia: Change-Id: Iaa9933f4fc4a64bec60aa897c509a3513f457a78 Reviewed-on: https://skia-review.googlesource.com/10282 Commit-Queue: Ethan Nicholas Reviewed-by: Ben Wagner --- tests/SkSLErrorTest.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'tests/SkSLErrorTest.cpp') diff --git a/tests/SkSLErrorTest.cpp b/tests/SkSLErrorTest.cpp index bde5e70795..bd0c64a93b 100644 --- a/tests/SkSLErrorTest.cpp +++ b/tests/SkSLErrorTest.cpp @@ -13,17 +13,16 @@ static void test_failure(skiatest::Reporter* r, const char* src, const char* error) { SkSL::Compiler compiler; - SkDynamicMemoryWStream out; SkSL::Program::Settings settings; sk_sp caps = SkSL::ShaderCapsFactory::Default(); settings.fCaps = caps.get(); std::unique_ptr program = compiler.convertProgram(SkSL::Program::kFragment_Kind, SkString(src), settings); if (program) { - SkString ignored; + SkSL::String ignored; compiler.toSPIRV(*program, &ignored); } - SkString skError(error); + SkSL::String skError(error); if (compiler.errorText() != skError) { SkDebugf("SKSL ERROR:\n source: %s\n expected: %s received: %s", src, error, compiler.errorText().c_str()); @@ -33,14 +32,13 @@ static void test_failure(skiatest::Reporter* r, const char* src, const char* err static void test_success(skiatest::Reporter* r, const char* src) { SkSL::Compiler compiler; - SkDynamicMemoryWStream out; SkSL::Program::Settings settings; sk_sp caps = SkSL::ShaderCapsFactory::Default(); settings.fCaps = caps.get(); std::unique_ptr program = compiler.convertProgram(SkSL::Program::kFragment_Kind, SkString(src), settings); REPORTER_ASSERT(r, program); - SkString ignored; + SkSL::String ignored; REPORTER_ASSERT(r, compiler.toSPIRV(*program, &ignored)); } -- cgit v1.2.3