diff options
| author |  Ethan Nicholas <ethannicholas@google.com> | 2017-03-31 16:04:34 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-31 16:04:41 +0000 |
| commit | 9bd301d640ff63c280b202c7dd00bc00a3315ff4 (patch) | |
| tree | 176fcfe46fb17a8c50c145196705f4ef42a950fa /tests/SkSLErrorTest.cpp | |
| parent | 92d7ccafdf896cf19764e025873d13315a76842d (diff) | |
Revert "skslc can now be compiled with no Skia dependencies, in preparation for its eventual"
This reverts commit f3333c89bf05fc602d9bf8e1e24547668c660383.
Reason for revert: breaking the bots
Original change's description:
> 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>
>
TBR=benjaminwagner@google.com,ethannicholas@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Change-Id: Ic7b50d391d25b3870acffa9764cbafc7f5c3be89
Reviewed-on: https://skia-review.googlesource.com/10962
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Diffstat (limited to 'tests/SkSLErrorTest.cpp')
| -rw-r--r-- | tests/SkSLErrorTest.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/tests/SkSLErrorTest.cpp b/tests/SkSLErrorTest.cpp index bd0c64a93b..bde5e70795 100644 --- a/tests/SkSLErrorTest.cpp +++ b/tests/SkSLErrorTest.cpp @@ -13,16 +13,17 @@ 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) { - SkSL::String ignored; + SkString ignored; compiler.toSPIRV(*program, &ignored); } - SkSL::String skError(error); + SkString skError(error); if (compiler.errorText() != skError) { SkDebugf("SKSL ERROR:\n source: %s\n expected: %s received: %s", src, error, compiler.errorText().c_str()); @@ -32,13 +33,14 @@ 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); - SkSL::String ignored; + SkString ignored; REPORTER_ASSERT(r, compiler.toSPIRV(*program, &ignored)); } |