diff options
| author |  Ethan Nicholas <ethannicholas@google.com> | 2017-03-31 13:56:23 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-31 18:49:51 +0000 |
| commit | 0df1b04db87c3d86ee0b0bd6aa2cb5b6be32cac2 (patch) | |
| tree | 12e72247e1d2f4a66d2045cc6a6a62a3505d82ab /tests/SkSLGLSLTest.cpp | |
| parent | f809fef8280e3d6ad9d95697cd234560b49962ab (diff) | |
skslc can now be compiled with no Skia dependencies, in preparation for its eventual
This reverts commit 9bd301d640ff63c280b202c7dd00bc00a3315ff4.
Bug: skia:
Change-Id: I5ad3f77ef33aa5ce2fd27fe383c9339c571663a1
Reviewed-on: https://skia-review.googlesource.com/10964
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Diffstat (limited to 'tests/SkSLGLSLTest.cpp')
| -rw-r--r-- | tests/SkSLGLSLTest.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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()); |