diff options
| author |  Ethan Nicholas <ethannicholas@google.com> | 2017-03-31 09:33:41 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-31 15:25:32 +0000 |
| commit | f3333c89bf05fc602d9bf8e1e24547668c660383 (patch) | |
| tree | 3c0855ef8829201299ce757ecaf28bfda50a2683 /tests | |
| parent | 66b09abdb184d843ece45a1d343fbe632075b323 (diff) | |
skslc can now be compiled with no Skia dependencies, in preparation for its eventual
role in Skia's build process.
This reverts commit bcf35f86d50b784b165de703b404998dd4299f6a.
BUG=skia:
Change-Id: Id0a12dfc4d804d69a3c6bf60fed37e89ee130f02
Reviewed-on: https://skia-review.googlesource.com/10802
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/SkSLErrorTest.cpp | 8 | ||||
| -rw-r--r-- | tests/SkSLGLSLTest.cpp | 4 |
2 files changed, 5 insertions, 7 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)); } diff --git a/tests/SkSLGLSLTest.cpp b/tests/SkSLGLSLTest.cpp index 53e5c6badf..efae33604b 100644 --- a/tests/SkSLGLSLTest.cpp +++ b/tests/SkSLGLSLTest.cpp @@ -15,7 +15,7 @@ static void test(skiatest::Reporter* r, const char* src, const SkSL::Program::Se const char* expected, SkSL::Program::Inputs* inputs, SkSL::Program::Kind kind = SkSL::Program::kFragment_Kind) { SkSL::Compiler compiler; - SkString output; + SkSL::String output; std::unique_ptr<SkSL::Program> program = compiler.convertProgram(kind, SkString(src), settings); if (!program) { SkDebugf("Unexpected error compiling %s\n%s", src, compiler.errorText().c_str()); @@ -24,7 +24,7 @@ static void test(skiatest::Reporter* r, const char* src, const SkSL::Program::Se *inputs = program->fInputs; REPORTER_ASSERT(r, compiler.toGLSL(*program, &output)); if (program) { - SkString skExpected(expected); + SkSL::String skExpected(expected); if (output != skExpected) { SkDebugf("GLSL MISMATCH:\nsource:\n%s\n\nexpected:\n'%s'\n\nreceived:\n'%s'", src, expected, output.c_str()); |