From bcf35f86d50b784b165de703b404998dd4299f6a Mon Sep 17 00:00:00 2001 From: Ethan Nicholas Date: Thu, 30 Mar 2017 18:42:48 +0000 Subject: Revert "skslc can now be compiled with no Skia dependencies, in preparation for" This reverts commit 7833466da45bfa1e078427c4a6db94d41c5c1535. Reason for revert: Vulkan assertion failure Original change's description: > 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 > TBR=egdaniel@google.com,benjaminwagner@google.com,ethannicholas@google.com,reviews@skia.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Change-Id: Ic64cac2395abb406116885ddd725f74a434c8c49 Reviewed-on: https://skia-review.googlesource.com/10758 Reviewed-by: Ethan Nicholas Commit-Queue: Ethan Nicholas --- tests/SkSLErrorTest.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'tests/SkSLErrorTest.cpp') 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 caps = SkSL::ShaderCapsFactory::Default(); settings.fCaps = caps.get(); std::unique_ptr 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 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); - SkSL::String ignored; + SkString ignored; REPORTER_ASSERT(r, compiler.toSPIRV(*program, &ignored)); } -- cgit v1.2.3