diff options
| author |  Ethan Nicholas <ethannicholas@google.com> | 2017-03-30 13:45:54 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-30 18:28:47 +0000 |
| commit | 7833466da45bfa1e078427c4a6db94d41c5c1535 (patch) | |
| tree | d3bb49ba327f0bc3cb5cafe52d992702828031b2 /tests/SkSLErrorTest.cpp | |
| parent | cdc651d29d88e87ef84d5a586879db2c16ff4579 (diff) | |
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 <ethannicholas@google.com>
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
Diffstat (limited to 'tests/SkSLErrorTest.cpp')
| -rw-r--r-- | tests/SkSLErrorTest.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
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<GrShaderCaps> caps = SkSL::ShaderCapsFactory::Default(); settings.fCaps = caps.get(); std::unique_ptr<SkSL::Program> 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<GrShaderCaps> caps = SkSL::ShaderCapsFactory::Default(); settings.fCaps = caps.get(); std::unique_ptr<SkSL::Program> 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)); } |